From 6ed4c1bbfd6aef030bdf05e4487f5212a825974f Mon Sep 17 00:00:00 2001 From: tpfz Date: Wed, 22 Oct 2025 22:59:04 +0800 Subject: [PATCH 01/42] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loop/evaluation/domain/evaluator.thrift | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index 27bd8726d..6c3c0f1e9 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -6,6 +6,7 @@ include "../../llm/domain/runtime.thrift" enum EvaluatorType { Prompt = 1 Code = 2 + Builtin = 3 } typedef string LanguageType(ts.enum="true") @@ -34,6 +35,49 @@ enum EvaluatorRunStatus { // 运行状态, 异步下状态流转, 同步下只 Fail = 2 } +// 类型筛选枚举 - 针对外部用户的分类 +enum EvaluatorCategory { + LLM = 1 + Code = 2 +} + +// 黑白盒枚举 +enum EvaluatorBoxType { + BlackBox = 1 // 黑盒：不关注内部实现，只看输入输出 + WhiteBox = 2 // 白盒：可访问内部状态和实现细节 +} + +// 评估对象枚举 +enum EvaluationTargetType { + Text = 1 + Image = 2 + Video = 3 + Audio = 4 + Code = 5 + Multimodal = 6 + Agent = 7 +} + +// 评估目标枚举 +enum EvaluationObjectiveType { + TaskCompletion = 1 + ContentQuality = 2 + InteractionExperience = 3 + ToolInvocation = 4 + TrajectoryQuality = 5 + KnowledgeManagementAndMemory = 6 + FormatValidation = 7 +} + +// 业务场景枚举 +enum BusinessScenarioType { + SecurityRiskControl = 1 + AICoding = 2 + CustomerServiceAssistant = 3 + AgentGeneralEvaluation = 4 + AIGC = 5 +} + struct Tool { 1: ToolType type (go.tag ='mapstructure:"type"') 2: optional Function function (go.tag ='mapstructure:"function"') @@ -72,6 +116,7 @@ struct EvaluatorVersion { struct EvaluatorContent { 1: optional bool receive_chat_history (go.tag = 'mapstructure:"receive_chat_history"') 2: optional list input_schemas (go.tag = 'mapstructure:"input_schemas"') + 3: optional list output_schemas (go.tag = 'mapstructure:"output_schemas"') // 101-200 Evaluator类型 101: optional PromptEvaluator prompt_evaluator (go.tag ='mapstructure:"prompt_evaluator"') @@ -88,6 +133,15 @@ struct Evaluator { 7: optional common.BaseInfo base_info 11: optional EvaluatorVersion current_version 12: optional string latest_version + + // Tag筛选相关字段 + 21: optional EvaluatorCategory category (go.tag = 'json:"category"') // 类型筛选 - 针对外部用户 + 22: optional list target_types (go.tag = 'json:"target_types"') // 评估对象 + 23: optional list objective_types (go.tag = 'json:"objective_types"') // 评估目标 + 24: optional list business_scenarios (go.tag = 'json:"business_scenarios"') // 业务场景 + 25: optional EvaluatorBoxType box_type (go.tag = 'json:"box_type"') // 黑白盒类型 + 26: optional string benchmark (go.tag = 'json:"benchmark"') + 27: optional string vendor (go.tag = 'json:"vendor"') } struct Correction { From ac33e474543e967ac35812673d34a706e2f5914e Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 28 Oct 2025 16:57:58 +0800 Subject: [PATCH 02/42] feat: [Coda] [evaluation] evaluator ecosystem enhancements (LogID: 20251028165449010091110134177A0E5) Co-Authored-By: Coda --- .../coze/loop/apis/evaluator_service.go | 146 + .../router/coze/loop/apis/coze.loop.apis.go | 7 + .../api/router/coze/loop/apis/middleware.go | 45 + .../coze/loop/apis/evaluatorservice/client.go | 42 + .../apis/evaluatorservice/evaluatorservice.go | 252 + .../loop/evaluation/domain/common/common.go | 71 +- .../domain/common/common_validator.go | 5 + .../loop/evaluation/domain/common/k-common.go | 55 + .../evaluation/domain/evaluator/evaluator.go | 2409 ++- .../domain/evaluator/evaluator_validator.go | 27 + .../domain/evaluator/k-evaluator.go | 1703 +++ .../coze.loop.evaluation.evaluator.go | 12741 +++++++++++++--- ...oze.loop.evaluation.evaluator_validator.go | 194 + .../evaluator/evaluatorservice/client.go | 42 + .../evaluatorservice/evaluatorservice.go | 252 + .../k-coze.loop.evaluation.evaluator.go | 6943 ++++++++- .../evaluation/evaluatorservice/client.go | 42 + .../evaluatorservice/evaluatorservice.go | 252 + .../loevaluator/local_evaluatorservice.go | 161 + .../convertor/evaluator/evaluator.go | 54 +- .../convertor/evaluator/evaluator_tag.go | 128 + .../convertor/evaluator/evaluator_tag_test.go | 196 + .../convertor/evaluator/evaluator_template.go | 249 + .../convertor/evaluator/evaluator_test.go | 147 + .../evaluation/application/evaluator_app.go | 427 +- .../application/evaluator_app_test.go | 32 + .../modules/evaluation/application/wire.go | 4 + .../evaluation/application/wire_gen.go | 15 +- backend/modules/evaluation/consts/common.go | 6 + .../evaluation/domain/entity/evaluator.go | 5 + .../evaluation/domain/entity/evaluator_tag.go | 156 + .../domain/entity/evaluator_tag_test.go | 170 + .../domain/entity/evaluator_template.go | 44 + .../modules/evaluation/domain/entity/param.go | 112 +- .../evaluation/domain/repo/evaluator.go | 23 + .../domain/repo/evaluator_template.go | 45 + .../domain/repo/mocks/evaluator_mock.go | 169 +- .../repo/mocks/evaluator_record_mock.go | 38 +- .../repo/mocks/evaluator_template_mock.go | 117 + .../domain/repo/mocks/ratelimiter_mock.go | 14 +- .../evaluation/domain/service/evaluator.go | 11 +- .../domain/service/evaluator_impl.go | 114 +- .../domain/service/evaluator_impl_test.go | 245 +- .../domain/service/evaluator_template.go | 31 + .../domain/service/evaluator_template_impl.go | 324 + .../service/evaluator_template_impl_test.go | 501 + .../service/mocks/evaluator_service_mock.go | 37 +- .../mocks/evaluator_template_service_mock.go | 117 + .../infra/repo/evaluator/evaluator_impl.go | 412 +- .../repo/evaluator/evaluator_impl_test.go | 464 +- .../repo/evaluator/evaluator_template_impl.go | 178 + .../evaluator/evaluator_template_impl_test.go | 808 + .../evaluator/list_builtin_evaluator_test.go | 134 + .../evaluator/mysql/convertor/evaluator.go | 15 +- .../mysql/convertor/evaluator_tag.go | 1 + .../mysql/convertor/evaluator_template.go | 178 + .../infra/repo/evaluator/mysql/evaluator.go | 30 + .../repo/evaluator/mysql/evaluator_tag.go | 290 + .../mysql/evaluator_tag_filter_test.go | 411 + .../evaluator/mysql/evaluator_template.go | 211 + .../repo/evaluator/mysql/evaluator_version.go | 1 + .../mysql/gorm_gen/model/evaluator.gen.go | 3 + .../mysql/gorm_gen/model/evaluator_tag.gen.go | 32 + .../gorm_gen/model/evaluator_template.gen.go | 39 + .../gorm_gen/model/evaluator_version.gen.go | 1 + .../mysql/gorm_gen/query/evaluator.gen.go | 14 +- .../mysql/gorm_gen/query/evaluator_tag.gen.go | 368 + .../gorm_gen/query/evaluator_template.gen.go | 396 + .../gorm_gen/query/evaluator_version.gen.go | 6 +- .../evaluator/mysql/gorm_gen/query/gen.go | 42 +- .../evaluator/mysql/mocks/evaluator_mock.go | 115 +- .../mysql/mocks/evaluator_record_mock.go | 46 +- .../mysql/mocks/evaluator_tag_mock.go | 123 + .../mysql/mocks/evaluator_template_mock.go | 143 + .../mysql/mocks/evaluator_version_mock.go | 96 +- .../modules/evaluation/pkg/conf/evaluator.go | 58 + .../pkg/conf/evaluator_template_space_test.go | 70 + .../pkg/conf/mocks/evaluator_configer.go | 14 + backend/script/gorm_gen/generate.go | 18 +- .../coze.loop.evaluation.evaluator.thrift | 135 + .../coze/loop/evaluation/domain/common.thrift | 1 + .../loop/evaluation/domain/evaluator.thrift | 127 +- .../mysql-init/init-sql/evaluator.sql | 3 + .../mysql-init/init-sql/evaluator_tag.sql | 15 + .../init-sql/evaluator_template.sql | 20 + .../mysql-init/init-sql/evaluator_version.sql | 1 + 86 files changed, 30613 insertions(+), 3326 deletions(-) create mode 100644 backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go create mode 100644 backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go create mode 100644 backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go create mode 100644 backend/modules/evaluation/domain/entity/evaluator_tag.go create mode 100644 backend/modules/evaluation/domain/entity/evaluator_tag_test.go create mode 100644 backend/modules/evaluation/domain/entity/evaluator_template.go create mode 100644 backend/modules/evaluation/domain/repo/evaluator_template.go create mode 100644 backend/modules/evaluation/domain/repo/mocks/evaluator_template_mock.go create mode 100644 backend/modules/evaluation/domain/service/evaluator_template.go create mode 100644 backend/modules/evaluation/domain/service/evaluator_template_impl.go create mode 100644 backend/modules/evaluation/domain/service/evaluator_template_impl_test.go create mode 100644 backend/modules/evaluation/domain/service/mocks/evaluator_template_service_mock.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_tag.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_template.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_tag.gen.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_template.gen.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_tag.gen.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_template.gen.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_template_mock.go create mode 100644 backend/modules/evaluation/pkg/conf/evaluator_template_space_test.go create mode 100644 release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_tag.sql create mode 100644 release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_template.sql diff --git a/backend/api/handler/coze/loop/apis/evaluator_service.go b/backend/api/handler/coze/loop/apis/evaluator_service.go index e66b4dd87..4346e3d6c 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service.go @@ -9,8 +9,10 @@ import ( "context" "github.com/cloudwego/hertz/pkg/app" + "github.com/cloudwego/hertz/pkg/protocol/consts" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/apis/evaluatorservice" + evaluator "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" ) var localEvaluatorSvc evaluatorservice.Client @@ -152,3 +154,147 @@ func ValidateEvaluator(ctx context.Context, c *app.RequestContext) { func BatchDebugEvaluator(ctx context.Context, c *app.RequestContext) { invokeAndRender(ctx, c, localEvaluatorSvc.BatchDebugEvaluator) } + +// ListTemplatesV2 . +// @router /api/evaluation/v1/evaluators/list_template_v2 [POST] +func ListTemplatesV2(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.ListTemplatesV2Request + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.ListTemplatesV2Response) + + c.JSON(consts.StatusOK, resp) +} + +// GetTemplateInfoV2 . +// @router /api/evaluation/v1/evaluators/get_template_info_v2 [POST] +func GetTemplateInfoV2(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.GetTemplateInfoV2Request + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.GetTemplateInfoV2Response) + + c.JSON(consts.StatusOK, resp) +} + +// GetLatestEvaluatorVersion . +// @router /api/evaluation/v1/evaluators/:evaluator_id/latest_version [POST] +func GetLatestEvaluatorVersion(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.GetLatestEvaluatorVersionRequest + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.GetLatestEvaluatorVersionResponse) + + c.JSON(consts.StatusOK, resp) +} + +// DebugBuiltinEvaluator . +// @router /api/evaluation/v1/evaluators/debug_builtin [POST] +func DebugBuiltinEvaluator(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.DebugBuiltinEvaluatorRequest + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.DebugBuiltinEvaluatorResponse) + + c.JSON(consts.StatusOK, resp) +} + +// PublishBuiltinEvaluator . +// @router /api/evaluation/v1/evaluators/publish_builtin [POST] +func PublishBuiltinEvaluator(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.PublishBuiltinEvaluatorRequest + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.PublishBuiltinEvaluatorResponse) + + c.JSON(consts.StatusOK, resp) +} + +// CreateEvaluatorTemplate . +// @router /api/evaluation/v1/evaluators/create_template [POST] +func CreateEvaluatorTemplate(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.CreateEvaluatorTemplateRequest + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.CreateEvaluatorTemplateResponse) + + c.JSON(consts.StatusOK, resp) +} + +// UpdateEvaluatorTemplate . +// @router /api/evaluation/v1/evaluators/update_template [POST] +func UpdateEvaluatorTemplate(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.UpdateEvaluatorTemplateRequest + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.UpdateEvaluatorTemplateResponse) + + c.JSON(consts.StatusOK, resp) +} + +// DeleteEvaluatorTemplate . +// @router /api/evaluation/v1/evaluators/delete_template [POST] +func DeleteEvaluatorTemplate(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.DeleteEvaluatorTemplateRequest + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.DeleteEvaluatorTemplateResponse) + + c.JSON(consts.StatusOK, resp) +} + +// ListEvaluatorTags . +// @router /api/evaluation/v1/evaluators/list_tags [POST] +func ListEvaluatorTags(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.ListEvaluatorTagsRequest + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.ListEvaluatorTagsResponse) + + c.JSON(consts.StatusOK, resp) +} diff --git a/backend/api/router/coze/loop/apis/coze.loop.apis.go b/backend/api/router/coze/loop/apis/coze.loop.apis.go index 9bcd25735..84754c0ad 100644 --- a/backend/api/router/coze/loop/apis/coze.loop.apis.go +++ b/backend/api/router/coze/loop/apis/coze.loop.apis.go @@ -144,8 +144,11 @@ func Register(r *server.Hertz, handler *apis.APIHandler) { _evaluators := _v11.Group("/evaluators", _evaluatorsMw(handler)...) _evaluators.POST("/batch_debug", append(_batchdebugevaluatorMw(handler), apis.BatchDebugEvaluator)...) _evaluators.POST("/check_name", append(_checkevaluatornameMw(handler), apis.CheckEvaluatorName)...) + _evaluators.POST("/create_template", append(_createevaluatortemplateMw(handler), apis.CreateEvaluatorTemplate)...) _evaluators.POST("/debug", append(_debugevaluatorMw(handler), apis.DebugEvaluator)...) + _evaluators.POST("/debug_builtin", append(_debugbuiltinevaluatorMw(handler), apis.DebugBuiltinEvaluator)...) _evaluators.POST("/default_prompt_evaluator_tools", append(_getdefaultpromptevaluatortoolsMw(handler), apis.GetDefaultPromptEvaluatorTools)...) + _evaluators.POST("/delete_template", append(_deleteevaluatortemplateMw(handler), apis.DeleteEvaluatorTemplate)...) _evaluators.DELETE("/:evaluator_id", append(_evaluator_idMw(handler), apis.DeleteEvaluator)...) _evaluator_id := _evaluators.Group("/:evaluator_id", _evaluator_idMw(handler)...) _evaluator_id.POST("/submit_version", append(_submitevaluatorversionMw(handler), apis.SubmitEvaluatorVersion)...) @@ -157,7 +160,11 @@ func Register(r *server.Hertz, handler *apis.APIHandler) { _evaluator_id0 := _evaluators.Group("/:evaluator_id", _evaluator_id0Mw(handler)...) _evaluator_id0.PATCH("/update_draft", append(_updateevaluatordraftMw(handler), apis.UpdateEvaluatorDraft)...) _evaluators.POST("/get_template_info", append(_gettemplateinfoMw(handler), apis.GetTemplateInfo)...) + _evaluators.POST("/list_tags", append(_listevaluatortagsMw(handler), apis.ListEvaluatorTags)...) _evaluators.POST("/list_template", append(_listtemplatesMw(handler), apis.ListTemplates)...) + _evaluators.POST("/list_template_v2", append(_listtemplatesv2Mw(handler), apis.ListTemplatesV2)...) + _evaluators.POST("/publish_builtin", append(_publishbuiltinevaluatorMw(handler), apis.PublishBuiltinEvaluator)...) + _evaluators.POST("/update_template", append(_updateevaluatortemplateMw(handler), apis.UpdateEvaluatorTemplate)...) _evaluators.POST("/validate", append(_validateevaluatorMw(handler), apis.ValidateEvaluator)...) { _eval_target_records := _v11.Group("/eval_target_records", _eval_target_recordsMw(handler)...) diff --git a/backend/api/router/coze/loop/apis/middleware.go b/backend/api/router/coze/loop/apis/middleware.go index 280dc31d6..4d95073ff 100644 --- a/backend/api/router/coze/loop/apis/middleware.go +++ b/backend/api/router/coze/loop/apis/middleware.go @@ -1423,3 +1423,48 @@ func _annotations0Mw(handler *apis.APIHandler) []app.HandlerFunc { // your code... return nil } + +func _debugbuiltinevaluatorMw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} + +func _getlatestevaluatorversionMw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} + +func _gettemplateinfov2Mw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} + +func _listtemplatesv2Mw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} + +func _publishbuiltinevaluatorMw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} + +func _createevaluatortemplateMw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} + +func _deleteevaluatortemplateMw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} + +func _updateevaluatortemplateMw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} + +func _listevaluatortagsMw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} diff --git a/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go b/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go index 4aa1803c0..61edcc981 100644 --- a/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go +++ b/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go @@ -33,6 +33,13 @@ type Client interface { GetEvaluatorRecord(ctx context.Context, req *evaluator.GetEvaluatorRecordRequest, callOptions ...callopt.Option) (r *evaluator.GetEvaluatorRecordResponse, err error) BatchGetEvaluatorRecords(ctx context.Context, req *evaluator.BatchGetEvaluatorRecordsRequest, callOptions ...callopt.Option) (r *evaluator.BatchGetEvaluatorRecordsResponse, err error) ValidateEvaluator(ctx context.Context, request *evaluator.ValidateEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.ValidateEvaluatorResponse, err error) + ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (r *evaluator.ListTemplatesV2Response, err error) + CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) + UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) + DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) + DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) + PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) + ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) } // NewClient creates a client for the service defined in IDL. @@ -173,3 +180,38 @@ func (p *kEvaluatorServiceClient) ValidateEvaluator(ctx context.Context, request ctx = client.NewCtxWithCallOptions(ctx, callOptions) return p.kClient.ValidateEvaluator(ctx, request) } + +func (p *kEvaluatorServiceClient) ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (r *evaluator.ListTemplatesV2Response, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.ListTemplatesV2(ctx, request) +} + +func (p *kEvaluatorServiceClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.CreateEvaluatorTemplate(ctx, request) +} + +func (p *kEvaluatorServiceClient) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.UpdateEvaluatorTemplate(ctx, request) +} + +func (p *kEvaluatorServiceClient) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.DeleteEvaluatorTemplate(ctx, request) +} + +func (p *kEvaluatorServiceClient) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.DebugBuiltinEvaluator(ctx, req) +} + +func (p *kEvaluatorServiceClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.PublishBuiltinEvaluator(ctx, req) +} + +func (p *kEvaluatorServiceClient) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.ListEvaluatorTags(ctx, req) +} diff --git a/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go b/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go index 9be4f6aab..3df6130cb 100644 --- a/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go +++ b/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go @@ -168,6 +168,55 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), + "ListTemplatesV2": kitex.NewMethodInfo( + listTemplatesV2Handler, + newEvaluatorServiceListTemplatesV2Args, + newEvaluatorServiceListTemplatesV2Result, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "CreateEvaluatorTemplate": kitex.NewMethodInfo( + createEvaluatorTemplateHandler, + newEvaluatorServiceCreateEvaluatorTemplateArgs, + newEvaluatorServiceCreateEvaluatorTemplateResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "UpdateEvaluatorTemplate": kitex.NewMethodInfo( + updateEvaluatorTemplateHandler, + newEvaluatorServiceUpdateEvaluatorTemplateArgs, + newEvaluatorServiceUpdateEvaluatorTemplateResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "DeleteEvaluatorTemplate": kitex.NewMethodInfo( + deleteEvaluatorTemplateHandler, + newEvaluatorServiceDeleteEvaluatorTemplateArgs, + newEvaluatorServiceDeleteEvaluatorTemplateResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "DebugBuiltinEvaluator": kitex.NewMethodInfo( + debugBuiltinEvaluatorHandler, + newEvaluatorServiceDebugBuiltinEvaluatorArgs, + newEvaluatorServiceDebugBuiltinEvaluatorResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "PublishBuiltinEvaluator": kitex.NewMethodInfo( + publishBuiltinEvaluatorHandler, + newEvaluatorServicePublishBuiltinEvaluatorArgs, + newEvaluatorServicePublishBuiltinEvaluatorResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "ListEvaluatorTags": kitex.NewMethodInfo( + listEvaluatorTagsHandler, + newEvaluatorServiceListEvaluatorTagsArgs, + newEvaluatorServiceListEvaluatorTagsResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), } var ( @@ -619,6 +668,139 @@ func newEvaluatorServiceValidateEvaluatorResult() interface{} { return evaluator.NewEvaluatorServiceValidateEvaluatorResult() } +func listTemplatesV2Handler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceListTemplatesV2Args) + realResult := result.(*evaluator.EvaluatorServiceListTemplatesV2Result) + success, err := handler.(evaluator.EvaluatorService).ListTemplatesV2(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceListTemplatesV2Args() interface{} { + return evaluator.NewEvaluatorServiceListTemplatesV2Args() +} + +func newEvaluatorServiceListTemplatesV2Result() interface{} { + return evaluator.NewEvaluatorServiceListTemplatesV2Result() +} + +func createEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs) + realResult := result.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateResult) + success, err := handler.(evaluator.EvaluatorService).CreateEvaluatorTemplate(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceCreateEvaluatorTemplateArgs() interface{} { + return evaluator.NewEvaluatorServiceCreateEvaluatorTemplateArgs() +} + +func newEvaluatorServiceCreateEvaluatorTemplateResult() interface{} { + return evaluator.NewEvaluatorServiceCreateEvaluatorTemplateResult() +} + +func updateEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceUpdateEvaluatorTemplateArgs) + realResult := result.(*evaluator.EvaluatorServiceUpdateEvaluatorTemplateResult) + success, err := handler.(evaluator.EvaluatorService).UpdateEvaluatorTemplate(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceUpdateEvaluatorTemplateArgs() interface{} { + return evaluator.NewEvaluatorServiceUpdateEvaluatorTemplateArgs() +} + +func newEvaluatorServiceUpdateEvaluatorTemplateResult() interface{} { + return evaluator.NewEvaluatorServiceUpdateEvaluatorTemplateResult() +} + +func deleteEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceDeleteEvaluatorTemplateArgs) + realResult := result.(*evaluator.EvaluatorServiceDeleteEvaluatorTemplateResult) + success, err := handler.(evaluator.EvaluatorService).DeleteEvaluatorTemplate(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceDeleteEvaluatorTemplateArgs() interface{} { + return evaluator.NewEvaluatorServiceDeleteEvaluatorTemplateArgs() +} + +func newEvaluatorServiceDeleteEvaluatorTemplateResult() interface{} { + return evaluator.NewEvaluatorServiceDeleteEvaluatorTemplateResult() +} + +func debugBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceDebugBuiltinEvaluatorArgs) + realResult := result.(*evaluator.EvaluatorServiceDebugBuiltinEvaluatorResult) + success, err := handler.(evaluator.EvaluatorService).DebugBuiltinEvaluator(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceDebugBuiltinEvaluatorArgs() interface{} { + return evaluator.NewEvaluatorServiceDebugBuiltinEvaluatorArgs() +} + +func newEvaluatorServiceDebugBuiltinEvaluatorResult() interface{} { + return evaluator.NewEvaluatorServiceDebugBuiltinEvaluatorResult() +} + +func publishBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs) + realResult := result.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorResult) + success, err := handler.(evaluator.EvaluatorService).PublishBuiltinEvaluator(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServicePublishBuiltinEvaluatorArgs() interface{} { + return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorArgs() +} + +func newEvaluatorServicePublishBuiltinEvaluatorResult() interface{} { + return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorResult() +} + +func listEvaluatorTagsHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceListEvaluatorTagsArgs) + realResult := result.(*evaluator.EvaluatorServiceListEvaluatorTagsResult) + success, err := handler.(evaluator.EvaluatorService).ListEvaluatorTags(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceListEvaluatorTagsArgs() interface{} { + return evaluator.NewEvaluatorServiceListEvaluatorTagsArgs() +} + +func newEvaluatorServiceListEvaluatorTagsResult() interface{} { + return evaluator.NewEvaluatorServiceListEvaluatorTagsResult() +} + type kClient struct { c client.Client sc client.Streaming @@ -850,3 +1032,73 @@ func (p *kClient) ValidateEvaluator(ctx context.Context, request *evaluator.Vali } return _result.GetSuccess(), nil } + +func (p *kClient) ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request) (r *evaluator.ListTemplatesV2Response, err error) { + var _args evaluator.EvaluatorServiceListTemplatesV2Args + _args.Request = request + var _result evaluator.EvaluatorServiceListTemplatesV2Result + if err = p.c.Call(ctx, "ListTemplatesV2", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { + var _args evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs + _args.Request = request + var _result evaluator.EvaluatorServiceCreateEvaluatorTemplateResult + if err = p.c.Call(ctx, "CreateEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) { + var _args evaluator.EvaluatorServiceUpdateEvaluatorTemplateArgs + _args.Request = request + var _result evaluator.EvaluatorServiceUpdateEvaluatorTemplateResult + if err = p.c.Call(ctx, "UpdateEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) { + var _args evaluator.EvaluatorServiceDeleteEvaluatorTemplateArgs + _args.Request = request + var _result evaluator.EvaluatorServiceDeleteEvaluatorTemplateResult + if err = p.c.Call(ctx, "DeleteEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) { + var _args evaluator.EvaluatorServiceDebugBuiltinEvaluatorArgs + _args.Req = req + var _result evaluator.EvaluatorServiceDebugBuiltinEvaluatorResult + if err = p.c.Call(ctx, "DebugBuiltinEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { + var _args evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs + _args.Req = req + var _result evaluator.EvaluatorServicePublishBuiltinEvaluatorResult + if err = p.c.Call(ctx, "PublishBuiltinEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest) (r *evaluator.ListEvaluatorTagsResponse, err error) { + var _args evaluator.EvaluatorServiceListEvaluatorTagsArgs + _args.Req = req + var _result evaluator.EvaluatorServiceListEvaluatorTagsResult + if err = p.c.Call(ctx, "ListEvaluatorTags", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/common/common.go b/backend/kitex_gen/coze/loop/evaluation/domain/common/common.go index 9e314c779..5a3551379 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/common/common.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/common/common.go @@ -2220,7 +2220,8 @@ type ArgsSchema struct { Key *string `thrift:"key,1,optional" frugal:"1,optional,string" mapstructure:"key" form:"key" json:"key,omitempty" query:"key"` SupportContentTypes []ContentType `thrift:"support_content_types,2,optional" frugal:"2,optional,list" mapstructure:"support_content_types" form:"support_content_types" json:"support_content_types,omitempty" query:"support_content_types"` // 序列化后的jsonSchema字符串，例如："{\"type\": \"object\", \"properties\": {\"name\": {\"type\": \"string\"}, \"age\": {\"type\": \"integer\"}, \"isStudent\": {\"type\": \"boolean\"}}, \"required\": [\"name\", \"age\", \"isStudent\"]}" - JSONSchema *string `thrift:"json_schema,3,optional" frugal:"3,optional,string" mapstructure:"json_schema" form:"json_schema" json:"json_schema,omitempty" query:"json_schema"` + JSONSchema *string `thrift:"json_schema,3,optional" frugal:"3,optional,string" mapstructure:"json_schema" form:"json_schema" json:"json_schema,omitempty" query:"json_schema"` + DefaultValue *Content `thrift:"default_value,4,optional" frugal:"4,optional,Content" mapstructure:"default_value" form:"default_value" json:"default_value,omitempty" query:"default_value"` } func NewArgsSchema() *ArgsSchema { @@ -2265,6 +2266,18 @@ func (p *ArgsSchema) GetJSONSchema() (v string) { } return *p.JSONSchema } + +var ArgsSchema_DefaultValue_DEFAULT *Content + +func (p *ArgsSchema) GetDefaultValue() (v *Content) { + if p == nil { + return + } + if !p.IsSetDefaultValue() { + return ArgsSchema_DefaultValue_DEFAULT + } + return p.DefaultValue +} func (p *ArgsSchema) SetKey(val *string) { p.Key = val } @@ -2274,11 +2287,15 @@ func (p *ArgsSchema) SetSupportContentTypes(val []ContentType) { func (p *ArgsSchema) SetJSONSchema(val *string) { p.JSONSchema = val } +func (p *ArgsSchema) SetDefaultValue(val *Content) { + p.DefaultValue = val +} var fieldIDToName_ArgsSchema = map[int16]string{ 1: "key", 2: "support_content_types", 3: "json_schema", + 4: "default_value", } func (p *ArgsSchema) IsSetKey() bool { @@ -2293,6 +2310,10 @@ func (p *ArgsSchema) IsSetJSONSchema() bool { return p.JSONSchema != nil } +func (p *ArgsSchema) IsSetDefaultValue() bool { + return p.DefaultValue != nil +} + func (p *ArgsSchema) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -2335,6 +2356,14 @@ func (p *ArgsSchema) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 4: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField4(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } default: if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError @@ -2409,6 +2438,14 @@ func (p *ArgsSchema) ReadField3(iprot thrift.TProtocol) error { p.JSONSchema = _field return nil } +func (p *ArgsSchema) ReadField4(iprot thrift.TProtocol) error { + _field := NewContent() + if err := _field.Read(iprot); err != nil { + return err + } + p.DefaultValue = _field + return nil +} func (p *ArgsSchema) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 @@ -2428,6 +2465,10 @@ func (p *ArgsSchema) Write(oprot thrift.TProtocol) (err error) { fieldId = 3 goto WriteFieldError } + if err = p.writeField4(oprot); err != nil { + fieldId = 4 + goto WriteFieldError + } } if err = oprot.WriteFieldStop(); err != nil { goto WriteFieldStopError @@ -2508,6 +2549,24 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) } +func (p *ArgsSchema) writeField4(oprot thrift.TProtocol) (err error) { + if p.IsSetDefaultValue() { + if err = oprot.WriteFieldBegin("default_value", thrift.STRUCT, 4); err != nil { + goto WriteFieldBeginError + } + if err := p.DefaultValue.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) +} func (p *ArgsSchema) String() string { if p == nil { @@ -2532,6 +2591,9 @@ func (p *ArgsSchema) DeepEqual(ano *ArgsSchema) bool { if !p.Field3DeepEqual(ano.JSONSchema) { return false } + if !p.Field4DeepEqual(ano.DefaultValue) { + return false + } return true } @@ -2572,6 +2634,13 @@ func (p *ArgsSchema) Field3DeepEqual(src *string) bool { } return true } +func (p *ArgsSchema) Field4DeepEqual(src *Content) bool { + + if !p.DefaultValue.DeepEqual(src) { + return false + } + return true +} type UserInfo struct { // 姓名 diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/common/common_validator.go b/backend/kitex_gen/coze/loop/evaluation/domain/common/common_validator.go index 997ddaa08..01106bb19 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/common/common_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/common/common_validator.go @@ -60,6 +60,11 @@ func (p *Message) IsValid() error { return nil } func (p *ArgsSchema) IsValid() error { + if p.DefaultValue != nil { + if err := p.DefaultValue.IsValid(); err != nil { + return fmt.Errorf("field DefaultValue not valid, %w", err) + } + } return nil } func (p *UserInfo) IsValid() error { diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/common/k-common.go b/backend/kitex_gen/coze/loop/evaluation/domain/common/k-common.go index 9b959e3ea..04dcc0082 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/common/k-common.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/common/k-common.go @@ -1621,6 +1621,20 @@ func (p *ArgsSchema) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 4: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField4(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 + } + } default: l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -1691,6 +1705,18 @@ func (p *ArgsSchema) FastReadField3(buf []byte) (int, error) { return offset, nil } +func (p *ArgsSchema) FastReadField4(buf []byte) (int, error) { + offset := 0 + _field := NewContent() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.DefaultValue = _field + return offset, nil +} + func (p *ArgsSchema) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } @@ -1701,6 +1727,7 @@ func (p *ArgsSchema) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) offset += p.fastWriteField3(buf[offset:], w) + offset += p.fastWriteField4(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) return offset @@ -1712,6 +1739,7 @@ func (p *ArgsSchema) BLength() int { l += p.field1Length() l += p.field2Length() l += p.field3Length() + l += p.field4Length() } l += thrift.Binary.FieldStopLength() return l @@ -1751,6 +1779,15 @@ func (p *ArgsSchema) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { return offset } +func (p *ArgsSchema) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetDefaultValue() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 4) + offset += p.DefaultValue.FastWriteNocopy(buf[offset:], w) + } + return offset +} + func (p *ArgsSchema) field1Length() int { l := 0 if p.IsSetKey() { @@ -1782,6 +1819,15 @@ func (p *ArgsSchema) field3Length() int { return l } +func (p *ArgsSchema) field4Length() int { + l := 0 + if p.IsSetDefaultValue() { + l += thrift.Binary.FieldBeginLength() + l += p.DefaultValue.BLength() + } + return l +} + func (p *ArgsSchema) DeepCopy(s interface{}) error { src, ok := s.(*ArgsSchema) if !ok { @@ -1813,6 +1859,15 @@ func (p *ArgsSchema) DeepCopy(s interface{}) error { p.JSONSchema = &tmp } + var _defaultValue *Content + if src.DefaultValue != nil { + _defaultValue = &Content{} + if err := _defaultValue.DeepCopy(src.DefaultValue); err != nil { + return err + } + } + p.DefaultValue = _defaultValue + return nil } diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go index 7fa6886d4..01d0bff14 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go @@ -15,13 +15,52 @@ const ( LanguageTypePython = "Python" LanguageTypeJS = "JS" + + EvaluatorTagKeyCategory = "Category" + + EvaluatorTagKeyTargetType = "TargetType" + + EvaluatorTagKeyObjective = "Objective" + + EvaluatorTagKeyBusinessScenario = "BusinessScenario" + + EvaluatorTagKeyBoxType = "BoxType" + + EvaluatorTagKeyName = "Name" + + OperationTypePublish = "Publish" + + OperationTypeRetreat = "Retreat" + + FilterLogicOpUnknown = "Unknown" + + FilterLogicOpAnd = "And" + + FilterLogicOpOr = "Or" + + EvaluatorFilterOperatorTypeUnknown = "Unknown" + + EvaluatorFilterOperatorTypeEqual = "Equal" + + EvaluatorFilterOperatorTypeNotEqual = "NotEqual" + + EvaluatorFilterOperatorTypeIn = "In" + + EvaluatorFilterOperatorTypeNotIn = "NotIn" + + EvaluatorFilterOperatorTypeLike = "Like" + + EvaluatorFilterOperatorTypeIsNull = "IsNull" + + EvaluatorFilterOperatorTypeIsNotNull = "IsNotNull" ) type EvaluatorType int64 const ( - EvaluatorType_Prompt EvaluatorType = 1 - EvaluatorType_Code EvaluatorType = 2 + EvaluatorType_Prompt EvaluatorType = 1 + EvaluatorType_Code EvaluatorType = 2 + EvaluatorType_Builtin EvaluatorType = 3 ) func (p EvaluatorType) String() string { @@ -30,6 +69,8 @@ func (p EvaluatorType) String() string { return "Prompt" case EvaluatorType_Code: return "Code" + case EvaluatorType_Builtin: + return "Builtin" } return "" } @@ -40,6 +81,8 @@ func EvaluatorTypeFromString(s string) (EvaluatorType, error) { return EvaluatorType_Prompt, nil case "Code": return EvaluatorType_Code, nil + case "Builtin": + return EvaluatorType_Builtin, nil } return EvaluatorType(0), fmt.Errorf("not a valid EvaluatorType string") } @@ -241,6 +284,18 @@ func (p *EvaluatorRunStatus) Value() (driver.Value, error) { type LanguageType = string +// Evaluator筛选字段 +type EvaluatorTagKey = string + +// 上下架操作类型枚举 +type OperationType = string + +// 筛选逻辑操作符 +type FilterLogicOp = string + +// Evaluator筛选操作符 +type EvaluatorFilterOperatorType = string + type Tool struct { Type ToolType `thrift:"type,1" frugal:"1,default,ToolType" mapstructure:"type" form:"type" json:"type" query:"type"` Function *Function `thrift:"function,2,optional" frugal:"2,optional,Function" mapstructure:"function" form:"function" json:"function,omitempty" query:"function"` @@ -795,12 +850,13 @@ func (p *Function) Field3DeepEqual(src *string) bool { } type PromptEvaluator struct { - MessageList []*common.Message `thrift:"message_list,1" frugal:"1,default,list" mapstructure:"message_list" form:"message_list" json:"message_list" query:"message_list"` - ModelConfig *common.ModelConfig `thrift:"model_config,2,optional" frugal:"2,optional,common.ModelConfig" mapstructure:"model_config" form:"model_config" json:"model_config,omitempty" query:"model_config"` - PromptSourceType *PromptSourceType `thrift:"prompt_source_type,3,optional" frugal:"3,optional,PromptSourceType" mapstructure:"prompt_source_type" form:"prompt_source_type" json:"prompt_source_type,omitempty" query:"prompt_source_type"` - PromptTemplateKey *string `thrift:"prompt_template_key,4,optional" frugal:"4,optional,string" mapstructure:"prompt_template_key" form:"prompt_template_key" json:"prompt_template_key,omitempty" query:"prompt_template_key"` - PromptTemplateName *string `thrift:"prompt_template_name,5,optional" frugal:"5,optional,string" mapstructure:"prompt_template_name" form:"prompt_template_name" json:"prompt_template_name,omitempty" query:"prompt_template_name"` - Tools []*Tool `thrift:"tools,6,optional" frugal:"6,optional,list" mapstructure:"tools" form:"tools" json:"tools,omitempty" query:"tools"` + MessageList []*common.Message `thrift:"message_list,1" frugal:"1,default,list" mapstructure:"message_list" form:"message_list" json:"message_list" query:"message_list"` + ModelConfig *common.ModelConfig `thrift:"model_config,2,optional" frugal:"2,optional,common.ModelConfig" mapstructure:"model_config" form:"model_config" json:"model_config,omitempty" query:"model_config"` + PromptSourceType *PromptSourceType `thrift:"prompt_source_type,3,optional" frugal:"3,optional,PromptSourceType" mapstructure:"prompt_source_type" form:"prompt_source_type" json:"prompt_source_type,omitempty" query:"prompt_source_type"` + // 最新版本中存evaluator_template_id + PromptTemplateKey *string `thrift:"prompt_template_key,4,optional" frugal:"4,optional,string" mapstructure:"prompt_template_key" form:"prompt_template_key" json:"prompt_template_key,omitempty" query:"prompt_template_key"` + PromptTemplateName *string `thrift:"prompt_template_name,5,optional" frugal:"5,optional,string" mapstructure:"prompt_template_name" form:"prompt_template_name" json:"prompt_template_name,omitempty" query:"prompt_template_name"` + Tools []*Tool `thrift:"tools,6,optional" frugal:"6,optional,list" mapstructure:"tools" form:"tools" json:"tools,omitempty" query:"tools"` } func NewPromptEvaluator() *PromptEvaluator { @@ -1387,7 +1443,7 @@ func (p *PromptEvaluator) Field6DeepEqual(src []*Tool) bool { type CodeEvaluator struct { LanguageType *LanguageType `thrift:"language_type,1,optional" frugal:"1,optional,string" form:"language_type" json:"language_type,omitempty" query:"language_type"` CodeContent *string `thrift:"code_content,2,optional" frugal:"2,optional,string" form:"code_content" json:"code_content,omitempty" query:"code_content"` - // code类型评估器模板中code_template_key + language_type是唯一键 + // code类型评估器模板中code_template_key + language_type是唯一键；最新版本中存evaluator_template_id CodeTemplateKey *string `thrift:"code_template_key,3,optional" frugal:"3,optional,string" form:"code_template_key" json:"code_template_key,omitempty" query:"code_template_key"` CodeTemplateName *string `thrift:"code_template_name,4,optional" frugal:"4,optional,string" form:"code_template_name" json:"code_template_name,omitempty" query:"code_template_name"` } @@ -2274,6 +2330,7 @@ func (p *EvaluatorVersion) Field6DeepEqual(src *EvaluatorContent) bool { type EvaluatorContent struct { ReceiveChatHistory *bool `thrift:"receive_chat_history,1,optional" frugal:"1,optional,bool" mapstructure:"receive_chat_history" form:"receive_chat_history" json:"receive_chat_history,omitempty" query:"receive_chat_history"` InputSchemas []*common.ArgsSchema `thrift:"input_schemas,2,optional" frugal:"2,optional,list" mapstructure:"input_schemas" form:"input_schemas" json:"input_schemas,omitempty" query:"input_schemas"` + OutputSchemas []*common.ArgsSchema `thrift:"output_schemas,3,optional" frugal:"3,optional,list" mapstructure:"output_schemas" form:"output_schemas" json:"output_schemas,omitempty" query:"output_schemas"` // 101-200 Evaluator类型 PromptEvaluator *PromptEvaluator `thrift:"prompt_evaluator,101,optional" frugal:"101,optional,PromptEvaluator" mapstructure:"prompt_evaluator" form:"prompt_evaluator" json:"prompt_evaluator,omitempty" query:"prompt_evaluator"` CodeEvaluator *CodeEvaluator `thrift:"code_evaluator,102,optional" frugal:"102,optional,CodeEvaluator" form:"code_evaluator" json:"code_evaluator,omitempty" query:"code_evaluator"` @@ -2310,6 +2367,18 @@ func (p *EvaluatorContent) GetInputSchemas() (v []*common.ArgsSchema) { return p.InputSchemas } +var EvaluatorContent_OutputSchemas_DEFAULT []*common.ArgsSchema + +func (p *EvaluatorContent) GetOutputSchemas() (v []*common.ArgsSchema) { + if p == nil { + return + } + if !p.IsSetOutputSchemas() { + return EvaluatorContent_OutputSchemas_DEFAULT + } + return p.OutputSchemas +} + var EvaluatorContent_PromptEvaluator_DEFAULT *PromptEvaluator func (p *EvaluatorContent) GetPromptEvaluator() (v *PromptEvaluator) { @@ -2339,6 +2408,9 @@ func (p *EvaluatorContent) SetReceiveChatHistory(val *bool) { func (p *EvaluatorContent) SetInputSchemas(val []*common.ArgsSchema) { p.InputSchemas = val } +func (p *EvaluatorContent) SetOutputSchemas(val []*common.ArgsSchema) { + p.OutputSchemas = val +} func (p *EvaluatorContent) SetPromptEvaluator(val *PromptEvaluator) { p.PromptEvaluator = val } @@ -2349,6 +2421,7 @@ func (p *EvaluatorContent) SetCodeEvaluator(val *CodeEvaluator) { var fieldIDToName_EvaluatorContent = map[int16]string{ 1: "receive_chat_history", 2: "input_schemas", + 3: "output_schemas", 101: "prompt_evaluator", 102: "code_evaluator", } @@ -2361,6 +2434,10 @@ func (p *EvaluatorContent) IsSetInputSchemas() bool { return p.InputSchemas != nil } +func (p *EvaluatorContent) IsSetOutputSchemas() bool { + return p.OutputSchemas != nil +} + func (p *EvaluatorContent) IsSetPromptEvaluator() bool { return p.PromptEvaluator != nil } @@ -2403,6 +2480,14 @@ func (p *EvaluatorContent) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 3: + if fieldTypeId == thrift.LIST { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } case 101: if fieldTypeId == thrift.STRUCT { if err = p.ReadField101(iprot); err != nil { @@ -2482,6 +2567,29 @@ func (p *EvaluatorContent) ReadField2(iprot thrift.TProtocol) error { p.InputSchemas = _field return nil } +func (p *EvaluatorContent) ReadField3(iprot thrift.TProtocol) error { + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _field := make([]*common.ArgsSchema, 0, size) + values := make([]common.ArgsSchema, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + + if err := _elem.Read(iprot); err != nil { + return err + } + + _field = append(_field, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + p.OutputSchemas = _field + return nil +} func (p *EvaluatorContent) ReadField101(iprot thrift.TProtocol) error { _field := NewPromptEvaluator() if err := _field.Read(iprot); err != nil { @@ -2513,6 +2621,10 @@ func (p *EvaluatorContent) Write(oprot thrift.TProtocol) (err error) { fieldId = 2 goto WriteFieldError } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } if err = p.writeField101(oprot); err != nil { fieldId = 101 goto WriteFieldError @@ -2583,6 +2695,32 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) } +func (p *EvaluatorContent) writeField3(oprot thrift.TProtocol) (err error) { + if p.IsSetOutputSchemas() { + if err = oprot.WriteFieldBegin("output_schemas", thrift.LIST, 3); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteListBegin(thrift.STRUCT, len(p.OutputSchemas)); err != nil { + return err + } + for _, v := range p.OutputSchemas { + if err := v.Write(oprot); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} func (p *EvaluatorContent) writeField101(oprot thrift.TProtocol) (err error) { if p.IsSetPromptEvaluator() { if err = oprot.WriteFieldBegin("prompt_evaluator", thrift.STRUCT, 101); err != nil { @@ -2640,6 +2778,9 @@ func (p *EvaluatorContent) DeepEqual(ano *EvaluatorContent) bool { if !p.Field2DeepEqual(ano.InputSchemas) { return false } + if !p.Field3DeepEqual(ano.OutputSchemas) { + return false + } if !p.Field101DeepEqual(ano.PromptEvaluator) { return false } @@ -2674,6 +2815,19 @@ func (p *EvaluatorContent) Field2DeepEqual(src []*common.ArgsSchema) bool { } return true } +func (p *EvaluatorContent) Field3DeepEqual(src []*common.ArgsSchema) bool { + + if len(p.OutputSchemas) != len(src) { + return false + } + for i, v := range p.OutputSchemas { + _src := src[i] + if !v.DeepEqual(_src) { + return false + } + } + return true +} func (p *EvaluatorContent) Field101DeepEqual(src *PromptEvaluator) bool { if !p.PromptEvaluator.DeepEqual(src) { @@ -2690,15 +2844,19 @@ func (p *EvaluatorContent) Field102DeepEqual(src *CodeEvaluator) bool { } type Evaluator struct { - EvaluatorID *int64 `thrift:"evaluator_id,1,optional" frugal:"1,optional,i64" json:"evaluator_id" form:"evaluator_id" query:"evaluator_id"` - WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" form:"workspace_id" query:"workspace_id"` - EvaluatorType *EvaluatorType `thrift:"evaluator_type,3,optional" frugal:"3,optional,EvaluatorType" form:"evaluator_type" json:"evaluator_type,omitempty" query:"evaluator_type"` - Name *string `thrift:"name,4,optional" frugal:"4,optional,string" form:"name" json:"name,omitempty" query:"name"` - Description *string `thrift:"description,5,optional" frugal:"5,optional,string" form:"description" json:"description,omitempty" query:"description"` - DraftSubmitted *bool `thrift:"draft_submitted,6,optional" frugal:"6,optional,bool" form:"draft_submitted" json:"draft_submitted,omitempty" query:"draft_submitted"` - BaseInfo *common.BaseInfo `thrift:"base_info,7,optional" frugal:"7,optional,common.BaseInfo" form:"base_info" json:"base_info,omitempty" query:"base_info"` - CurrentVersion *EvaluatorVersion `thrift:"current_version,11,optional" frugal:"11,optional,EvaluatorVersion" form:"current_version" json:"current_version,omitempty" query:"current_version"` - LatestVersion *string `thrift:"latest_version,12,optional" frugal:"12,optional,string" form:"latest_version" json:"latest_version,omitempty" query:"latest_version"` + EvaluatorID *int64 `thrift:"evaluator_id,1,optional" frugal:"1,optional,i64" json:"evaluator_id" form:"evaluator_id" query:"evaluator_id"` + WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" form:"workspace_id" query:"workspace_id"` + EvaluatorType *EvaluatorType `thrift:"evaluator_type,3,optional" frugal:"3,optional,EvaluatorType" form:"evaluator_type" json:"evaluator_type,omitempty" query:"evaluator_type"` + Name *string `thrift:"name,4,optional" frugal:"4,optional,string" form:"name" json:"name,omitempty" query:"name"` + Description *string `thrift:"description,5,optional" frugal:"5,optional,string" form:"description" json:"description,omitempty" query:"description"` + DraftSubmitted *bool `thrift:"draft_submitted,6,optional" frugal:"6,optional,bool" form:"draft_submitted" json:"draft_submitted,omitempty" query:"draft_submitted"` + BaseInfo *common.BaseInfo `thrift:"base_info,7,optional" frugal:"7,optional,common.BaseInfo" form:"base_info" json:"base_info,omitempty" query:"base_info"` + CurrentVersion *EvaluatorVersion `thrift:"current_version,11,optional" frugal:"11,optional,EvaluatorVersion" form:"current_version" json:"current_version,omitempty" query:"current_version"` + LatestVersion *string `thrift:"latest_version,12,optional" frugal:"12,optional,string" form:"latest_version" json:"latest_version,omitempty" query:"latest_version"` + Builtin *bool `thrift:"builtin,20,optional" frugal:"20,optional,bool" json:"builtin" form:"builtin" query:"builtin"` + Benchmark *string `thrift:"benchmark,21,optional" frugal:"21,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` + Vendor *string `thrift:"vendor,22,optional" frugal:"22,optional,string" json:"vendor" form:"vendor" query:"vendor"` + Tags map[EvaluatorTagKey][]string `thrift:"tags,23" frugal:"23,default,map>" json:"tags" form:"tags" query:"tags"` } func NewEvaluator() *Evaluator { @@ -2815,6 +2973,49 @@ func (p *Evaluator) GetLatestVersion() (v string) { } return *p.LatestVersion } + +var Evaluator_Builtin_DEFAULT bool + +func (p *Evaluator) GetBuiltin() (v bool) { + if p == nil { + return + } + if !p.IsSetBuiltin() { + return Evaluator_Builtin_DEFAULT + } + return *p.Builtin +} + +var Evaluator_Benchmark_DEFAULT string + +func (p *Evaluator) GetBenchmark() (v string) { + if p == nil { + return + } + if !p.IsSetBenchmark() { + return Evaluator_Benchmark_DEFAULT + } + return *p.Benchmark +} + +var Evaluator_Vendor_DEFAULT string + +func (p *Evaluator) GetVendor() (v string) { + if p == nil { + return + } + if !p.IsSetVendor() { + return Evaluator_Vendor_DEFAULT + } + return *p.Vendor +} + +func (p *Evaluator) GetTags() (v map[EvaluatorTagKey][]string) { + if p != nil { + return p.Tags + } + return +} func (p *Evaluator) SetEvaluatorID(val *int64) { p.EvaluatorID = val } @@ -2842,6 +3043,18 @@ func (p *Evaluator) SetCurrentVersion(val *EvaluatorVersion) { func (p *Evaluator) SetLatestVersion(val *string) { p.LatestVersion = val } +func (p *Evaluator) SetBuiltin(val *bool) { + p.Builtin = val +} +func (p *Evaluator) SetBenchmark(val *string) { + p.Benchmark = val +} +func (p *Evaluator) SetVendor(val *string) { + p.Vendor = val +} +func (p *Evaluator) SetTags(val map[EvaluatorTagKey][]string) { + p.Tags = val +} var fieldIDToName_Evaluator = map[int16]string{ 1: "evaluator_id", @@ -2853,6 +3066,10 @@ var fieldIDToName_Evaluator = map[int16]string{ 7: "base_info", 11: "current_version", 12: "latest_version", + 20: "builtin", + 21: "benchmark", + 22: "vendor", + 23: "tags", } func (p *Evaluator) IsSetEvaluatorID() bool { @@ -2891,6 +3108,18 @@ func (p *Evaluator) IsSetLatestVersion() bool { return p.LatestVersion != nil } +func (p *Evaluator) IsSetBuiltin() bool { + return p.Builtin != nil +} + +func (p *Evaluator) IsSetBenchmark() bool { + return p.Benchmark != nil +} + +func (p *Evaluator) IsSetVendor() bool { + return p.Vendor != nil +} + func (p *Evaluator) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -2981,6 +3210,38 @@ func (p *Evaluator) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 20: + if fieldTypeId == thrift.BOOL { + if err = p.ReadField20(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 21: + if fieldTypeId == thrift.STRING { + if err = p.ReadField21(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 22: + if fieldTypeId == thrift.STRING { + if err = p.ReadField22(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 23: + if fieldTypeId == thrift.MAP { + if err = p.ReadField23(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } default: if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError @@ -3104,6 +3365,80 @@ func (p *Evaluator) ReadField12(iprot thrift.TProtocol) error { p.LatestVersion = _field return nil } +func (p *Evaluator) ReadField20(iprot thrift.TProtocol) error { + + var _field *bool + if v, err := iprot.ReadBool(); err != nil { + return err + } else { + _field = &v + } + p.Builtin = _field + return nil +} +func (p *Evaluator) ReadField21(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Benchmark = _field + return nil +} +func (p *Evaluator) ReadField22(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Vendor = _field + return nil +} +func (p *Evaluator) ReadField23(iprot thrift.TProtocol) error { + _, _, size, err := iprot.ReadMapBegin() + if err != nil { + return err + } + _field := make(map[EvaluatorTagKey][]string, size) + for i := 0; i < size; i++ { + var _key EvaluatorTagKey + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _key = v + } + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _val := make([]string, 0, size) + for i := 0; i < size; i++ { + + var _elem string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _elem = v + } + + _val = append(_val, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + + _field[_key] = _val + } + if err := iprot.ReadMapEnd(); err != nil { + return err + } + p.Tags = _field + return nil +} func (p *Evaluator) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 @@ -3147,6 +3482,22 @@ func (p *Evaluator) Write(oprot thrift.TProtocol) (err error) { fieldId = 12 goto WriteFieldError } + if err = p.writeField20(oprot); err != nil { + fieldId = 20 + goto WriteFieldError + } + if err = p.writeField21(oprot); err != nil { + fieldId = 21 + goto WriteFieldError + } + if err = p.writeField22(oprot); err != nil { + fieldId = 22 + goto WriteFieldError + } + if err = p.writeField23(oprot); err != nil { + fieldId = 23 + goto WriteFieldError + } } if err = oprot.WriteFieldStop(); err != nil { goto WriteFieldStopError @@ -3327,26 +3678,115 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 12 end error: ", p), err) } - -func (p *Evaluator) String() string { - if p == nil { - return "" +func (p *Evaluator) writeField20(oprot thrift.TProtocol) (err error) { + if p.IsSetBuiltin() { + if err = oprot.WriteFieldBegin("builtin", thrift.BOOL, 20); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteBool(*p.Builtin); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } } - return fmt.Sprintf("Evaluator(%+v)", *p) - + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 20 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 20 end error: ", p), err) } - -func (p *Evaluator) DeepEqual(ano *Evaluator) bool { - if p == ano { - return true - } else if p == nil || ano == nil { - return false - } - if !p.Field1DeepEqual(ano.EvaluatorID) { - return false - } - if !p.Field2DeepEqual(ano.WorkspaceID) { - return false +func (p *Evaluator) writeField21(oprot thrift.TProtocol) (err error) { + if p.IsSetBenchmark() { + if err = oprot.WriteFieldBegin("benchmark", thrift.STRING, 21); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Benchmark); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 21 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 21 end error: ", p), err) +} +func (p *Evaluator) writeField22(oprot thrift.TProtocol) (err error) { + if p.IsSetVendor() { + if err = oprot.WriteFieldBegin("vendor", thrift.STRING, 22); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Vendor); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 22 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 22 end error: ", p), err) +} +func (p *Evaluator) writeField23(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("tags", thrift.MAP, 23); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(p.Tags)); err != nil { + return err + } + for k, v := range p.Tags { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + return err + } + for _, v := range v { + if err := oprot.WriteString(v); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + } + if err := oprot.WriteMapEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 23 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 23 end error: ", p), err) +} + +func (p *Evaluator) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("Evaluator(%+v)", *p) + +} + +func (p *Evaluator) DeepEqual(ano *Evaluator) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorID) { + return false + } + if !p.Field2DeepEqual(ano.WorkspaceID) { + return false } if !p.Field3DeepEqual(ano.EvaluatorType) { return false @@ -3369,6 +3809,18 @@ func (p *Evaluator) DeepEqual(ano *Evaluator) bool { if !p.Field12DeepEqual(ano.LatestVersion) { return false } + if !p.Field20DeepEqual(ano.Builtin) { + return false + } + if !p.Field21DeepEqual(ano.Benchmark) { + return false + } + if !p.Field22DeepEqual(ano.Vendor) { + return false + } + if !p.Field23DeepEqual(ano.Tags) { + return false + } return true } @@ -3470,6 +3922,1891 @@ func (p *Evaluator) Field12DeepEqual(src *string) bool { } return true } +func (p *Evaluator) Field20DeepEqual(src *bool) bool { + + if p.Builtin == src { + return true + } else if p.Builtin == nil || src == nil { + return false + } + if *p.Builtin != *src { + return false + } + return true +} +func (p *Evaluator) Field21DeepEqual(src *string) bool { + + if p.Benchmark == src { + return true + } else if p.Benchmark == nil || src == nil { + return false + } + if strings.Compare(*p.Benchmark, *src) != 0 { + return false + } + return true +} +func (p *Evaluator) Field22DeepEqual(src *string) bool { + + if p.Vendor == src { + return true + } else if p.Vendor == nil || src == nil { + return false + } + if strings.Compare(*p.Vendor, *src) != 0 { + return false + } + return true +} +func (p *Evaluator) Field23DeepEqual(src map[EvaluatorTagKey][]string) bool { + + if len(p.Tags) != len(src) { + return false + } + for k, v := range p.Tags { + _src := src[k] + if len(v) != len(_src) { + return false + } + for i, v := range v { + _src1 := _src[i] + if strings.Compare(v, _src1) != 0 { + return false + } + } + } + return true +} + +type EvaluatorTemplate struct { + ID *int64 `thrift:"id,1,optional" frugal:"1,optional,i64" json:"id" form:"id" query:"id"` + WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" form:"workspace_id" query:"workspace_id"` + EvaluatorType *EvaluatorType `thrift:"evaluator_type,3,optional" frugal:"3,optional,EvaluatorType" form:"evaluator_type" json:"evaluator_type,omitempty" query:"evaluator_type"` + Name *string `thrift:"name,4,optional" frugal:"4,optional,string" form:"name" json:"name,omitempty" query:"name"` + Description *string `thrift:"description,5,optional" frugal:"5,optional,string" form:"description" json:"description,omitempty" query:"description"` + // 热度 + Popularity *int64 `thrift:"popularity,6,optional" frugal:"6,optional,i64" json:"popularity" form:"popularity" query:"popularity"` + Benchmark *string `thrift:"benchmark,7,optional" frugal:"7,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` + Vendor *string `thrift:"vendor,8,optional" frugal:"8,optional,string" json:"vendor" form:"vendor" query:"vendor"` + Tags map[EvaluatorTagKey][]string `thrift:"tags,9" frugal:"9,default,map>" json:"tags" form:"tags" query:"tags"` + EvaluatorContent *EvaluatorContent `thrift:"evaluator_content,101,optional" frugal:"101,optional,EvaluatorContent" form:"evaluator_content" json:"evaluator_content,omitempty" query:"evaluator_content"` + BaseInfo *common.BaseInfo `thrift:"base_info,255,optional" frugal:"255,optional,common.BaseInfo" form:"base_info" json:"base_info,omitempty" query:"base_info"` +} + +func NewEvaluatorTemplate() *EvaluatorTemplate { + return &EvaluatorTemplate{} +} + +func (p *EvaluatorTemplate) InitDefault() { +} + +var EvaluatorTemplate_ID_DEFAULT int64 + +func (p *EvaluatorTemplate) GetID() (v int64) { + if p == nil { + return + } + if !p.IsSetID() { + return EvaluatorTemplate_ID_DEFAULT + } + return *p.ID +} + +var EvaluatorTemplate_WorkspaceID_DEFAULT int64 + +func (p *EvaluatorTemplate) GetWorkspaceID() (v int64) { + if p == nil { + return + } + if !p.IsSetWorkspaceID() { + return EvaluatorTemplate_WorkspaceID_DEFAULT + } + return *p.WorkspaceID +} + +var EvaluatorTemplate_EvaluatorType_DEFAULT EvaluatorType + +func (p *EvaluatorTemplate) GetEvaluatorType() (v EvaluatorType) { + if p == nil { + return + } + if !p.IsSetEvaluatorType() { + return EvaluatorTemplate_EvaluatorType_DEFAULT + } + return *p.EvaluatorType +} + +var EvaluatorTemplate_Name_DEFAULT string + +func (p *EvaluatorTemplate) GetName() (v string) { + if p == nil { + return + } + if !p.IsSetName() { + return EvaluatorTemplate_Name_DEFAULT + } + return *p.Name +} + +var EvaluatorTemplate_Description_DEFAULT string + +func (p *EvaluatorTemplate) GetDescription() (v string) { + if p == nil { + return + } + if !p.IsSetDescription() { + return EvaluatorTemplate_Description_DEFAULT + } + return *p.Description +} + +var EvaluatorTemplate_Popularity_DEFAULT int64 + +func (p *EvaluatorTemplate) GetPopularity() (v int64) { + if p == nil { + return + } + if !p.IsSetPopularity() { + return EvaluatorTemplate_Popularity_DEFAULT + } + return *p.Popularity +} + +var EvaluatorTemplate_Benchmark_DEFAULT string + +func (p *EvaluatorTemplate) GetBenchmark() (v string) { + if p == nil { + return + } + if !p.IsSetBenchmark() { + return EvaluatorTemplate_Benchmark_DEFAULT + } + return *p.Benchmark +} + +var EvaluatorTemplate_Vendor_DEFAULT string + +func (p *EvaluatorTemplate) GetVendor() (v string) { + if p == nil { + return + } + if !p.IsSetVendor() { + return EvaluatorTemplate_Vendor_DEFAULT + } + return *p.Vendor +} + +func (p *EvaluatorTemplate) GetTags() (v map[EvaluatorTagKey][]string) { + if p != nil { + return p.Tags + } + return +} + +var EvaluatorTemplate_EvaluatorContent_DEFAULT *EvaluatorContent + +func (p *EvaluatorTemplate) GetEvaluatorContent() (v *EvaluatorContent) { + if p == nil { + return + } + if !p.IsSetEvaluatorContent() { + return EvaluatorTemplate_EvaluatorContent_DEFAULT + } + return p.EvaluatorContent +} + +var EvaluatorTemplate_BaseInfo_DEFAULT *common.BaseInfo + +func (p *EvaluatorTemplate) GetBaseInfo() (v *common.BaseInfo) { + if p == nil { + return + } + if !p.IsSetBaseInfo() { + return EvaluatorTemplate_BaseInfo_DEFAULT + } + return p.BaseInfo +} +func (p *EvaluatorTemplate) SetID(val *int64) { + p.ID = val +} +func (p *EvaluatorTemplate) SetWorkspaceID(val *int64) { + p.WorkspaceID = val +} +func (p *EvaluatorTemplate) SetEvaluatorType(val *EvaluatorType) { + p.EvaluatorType = val +} +func (p *EvaluatorTemplate) SetName(val *string) { + p.Name = val +} +func (p *EvaluatorTemplate) SetDescription(val *string) { + p.Description = val +} +func (p *EvaluatorTemplate) SetPopularity(val *int64) { + p.Popularity = val +} +func (p *EvaluatorTemplate) SetBenchmark(val *string) { + p.Benchmark = val +} +func (p *EvaluatorTemplate) SetVendor(val *string) { + p.Vendor = val +} +func (p *EvaluatorTemplate) SetTags(val map[EvaluatorTagKey][]string) { + p.Tags = val +} +func (p *EvaluatorTemplate) SetEvaluatorContent(val *EvaluatorContent) { + p.EvaluatorContent = val +} +func (p *EvaluatorTemplate) SetBaseInfo(val *common.BaseInfo) { + p.BaseInfo = val +} + +var fieldIDToName_EvaluatorTemplate = map[int16]string{ + 1: "id", + 2: "workspace_id", + 3: "evaluator_type", + 4: "name", + 5: "description", + 6: "popularity", + 7: "benchmark", + 8: "vendor", + 9: "tags", + 101: "evaluator_content", + 255: "base_info", +} + +func (p *EvaluatorTemplate) IsSetID() bool { + return p.ID != nil +} + +func (p *EvaluatorTemplate) IsSetWorkspaceID() bool { + return p.WorkspaceID != nil +} + +func (p *EvaluatorTemplate) IsSetEvaluatorType() bool { + return p.EvaluatorType != nil +} + +func (p *EvaluatorTemplate) IsSetName() bool { + return p.Name != nil +} + +func (p *EvaluatorTemplate) IsSetDescription() bool { + return p.Description != nil +} + +func (p *EvaluatorTemplate) IsSetPopularity() bool { + return p.Popularity != nil +} + +func (p *EvaluatorTemplate) IsSetBenchmark() bool { + return p.Benchmark != nil +} + +func (p *EvaluatorTemplate) IsSetVendor() bool { + return p.Vendor != nil +} + +func (p *EvaluatorTemplate) IsSetEvaluatorContent() bool { + return p.EvaluatorContent != nil +} + +func (p *EvaluatorTemplate) IsSetBaseInfo() bool { + return p.BaseInfo != nil +} + +func (p *EvaluatorTemplate) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.I64 { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 3: + if fieldTypeId == thrift.I32 { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 4: + if fieldTypeId == thrift.STRING { + if err = p.ReadField4(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 5: + if fieldTypeId == thrift.STRING { + if err = p.ReadField5(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 6: + if fieldTypeId == thrift.I64 { + if err = p.ReadField6(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 7: + if fieldTypeId == thrift.STRING { + if err = p.ReadField7(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 8: + if fieldTypeId == thrift.STRING { + if err = p.ReadField8(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 9: + if fieldTypeId == thrift.MAP { + if err = p.ReadField9(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 101: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField101(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorTemplate[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorTemplate) ReadField1(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.ID = _field + return nil +} +func (p *EvaluatorTemplate) ReadField2(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.WorkspaceID = _field + return nil +} +func (p *EvaluatorTemplate) ReadField3(iprot thrift.TProtocol) error { + + var _field *EvaluatorType + if v, err := iprot.ReadI32(); err != nil { + return err + } else { + tmp := EvaluatorType(v) + _field = &tmp + } + p.EvaluatorType = _field + return nil +} +func (p *EvaluatorTemplate) ReadField4(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Name = _field + return nil +} +func (p *EvaluatorTemplate) ReadField5(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Description = _field + return nil +} +func (p *EvaluatorTemplate) ReadField6(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.Popularity = _field + return nil +} +func (p *EvaluatorTemplate) ReadField7(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Benchmark = _field + return nil +} +func (p *EvaluatorTemplate) ReadField8(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Vendor = _field + return nil +} +func (p *EvaluatorTemplate) ReadField9(iprot thrift.TProtocol) error { + _, _, size, err := iprot.ReadMapBegin() + if err != nil { + return err + } + _field := make(map[EvaluatorTagKey][]string, size) + for i := 0; i < size; i++ { + var _key EvaluatorTagKey + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _key = v + } + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _val := make([]string, 0, size) + for i := 0; i < size; i++ { + + var _elem string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _elem = v + } + + _val = append(_val, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + + _field[_key] = _val + } + if err := iprot.ReadMapEnd(); err != nil { + return err + } + p.Tags = _field + return nil +} +func (p *EvaluatorTemplate) ReadField101(iprot thrift.TProtocol) error { + _field := NewEvaluatorContent() + if err := _field.Read(iprot); err != nil { + return err + } + p.EvaluatorContent = _field + return nil +} +func (p *EvaluatorTemplate) ReadField255(iprot thrift.TProtocol) error { + _field := common.NewBaseInfo() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseInfo = _field + return nil +} + +func (p *EvaluatorTemplate) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("EvaluatorTemplate"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } + if err = p.writeField4(oprot); err != nil { + fieldId = 4 + goto WriteFieldError + } + if err = p.writeField5(oprot); err != nil { + fieldId = 5 + goto WriteFieldError + } + if err = p.writeField6(oprot); err != nil { + fieldId = 6 + goto WriteFieldError + } + if err = p.writeField7(oprot); err != nil { + fieldId = 7 + goto WriteFieldError + } + if err = p.writeField8(oprot); err != nil { + fieldId = 8 + goto WriteFieldError + } + if err = p.writeField9(oprot); err != nil { + fieldId = 9 + goto WriteFieldError + } + if err = p.writeField101(oprot); err != nil { + fieldId = 101 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorTemplate) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetID() { + if err = oprot.WriteFieldBegin("id", thrift.I64, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.ID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *EvaluatorTemplate) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetWorkspaceID() { + if err = oprot.WriteFieldBegin("workspace_id", thrift.I64, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.WorkspaceID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *EvaluatorTemplate) writeField3(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluatorType() { + if err = oprot.WriteFieldBegin("evaluator_type", thrift.I32, 3); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI32(int32(*p.EvaluatorType)); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} +func (p *EvaluatorTemplate) writeField4(oprot thrift.TProtocol) (err error) { + if p.IsSetName() { + if err = oprot.WriteFieldBegin("name", thrift.STRING, 4); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Name); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) +} +func (p *EvaluatorTemplate) writeField5(oprot thrift.TProtocol) (err error) { + if p.IsSetDescription() { + if err = oprot.WriteFieldBegin("description", thrift.STRING, 5); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Description); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 5 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 5 end error: ", p), err) +} +func (p *EvaluatorTemplate) writeField6(oprot thrift.TProtocol) (err error) { + if p.IsSetPopularity() { + if err = oprot.WriteFieldBegin("popularity", thrift.I64, 6); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.Popularity); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 6 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 6 end error: ", p), err) +} +func (p *EvaluatorTemplate) writeField7(oprot thrift.TProtocol) (err error) { + if p.IsSetBenchmark() { + if err = oprot.WriteFieldBegin("benchmark", thrift.STRING, 7); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Benchmark); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 7 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 7 end error: ", p), err) +} +func (p *EvaluatorTemplate) writeField8(oprot thrift.TProtocol) (err error) { + if p.IsSetVendor() { + if err = oprot.WriteFieldBegin("vendor", thrift.STRING, 8); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Vendor); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 8 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 8 end error: ", p), err) +} +func (p *EvaluatorTemplate) writeField9(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("tags", thrift.MAP, 9); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(p.Tags)); err != nil { + return err + } + for k, v := range p.Tags { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + return err + } + for _, v := range v { + if err := oprot.WriteString(v); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + } + if err := oprot.WriteMapEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 9 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 9 end error: ", p), err) +} +func (p *EvaluatorTemplate) writeField101(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluatorContent() { + if err = oprot.WriteFieldBegin("evaluator_content", thrift.STRUCT, 101); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorContent.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 101 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 101 end error: ", p), err) +} +func (p *EvaluatorTemplate) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBaseInfo() { + if err = oprot.WriteFieldBegin("base_info", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseInfo.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *EvaluatorTemplate) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorTemplate(%+v)", *p) + +} + +func (p *EvaluatorTemplate) DeepEqual(ano *EvaluatorTemplate) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.ID) { + return false + } + if !p.Field2DeepEqual(ano.WorkspaceID) { + return false + } + if !p.Field3DeepEqual(ano.EvaluatorType) { + return false + } + if !p.Field4DeepEqual(ano.Name) { + return false + } + if !p.Field5DeepEqual(ano.Description) { + return false + } + if !p.Field6DeepEqual(ano.Popularity) { + return false + } + if !p.Field7DeepEqual(ano.Benchmark) { + return false + } + if !p.Field8DeepEqual(ano.Vendor) { + return false + } + if !p.Field9DeepEqual(ano.Tags) { + return false + } + if !p.Field101DeepEqual(ano.EvaluatorContent) { + return false + } + if !p.Field255DeepEqual(ano.BaseInfo) { + return false + } + return true +} + +func (p *EvaluatorTemplate) Field1DeepEqual(src *int64) bool { + + if p.ID == src { + return true + } else if p.ID == nil || src == nil { + return false + } + if *p.ID != *src { + return false + } + return true +} +func (p *EvaluatorTemplate) Field2DeepEqual(src *int64) bool { + + if p.WorkspaceID == src { + return true + } else if p.WorkspaceID == nil || src == nil { + return false + } + if *p.WorkspaceID != *src { + return false + } + return true +} +func (p *EvaluatorTemplate) Field3DeepEqual(src *EvaluatorType) bool { + + if p.EvaluatorType == src { + return true + } else if p.EvaluatorType == nil || src == nil { + return false + } + if *p.EvaluatorType != *src { + return false + } + return true +} +func (p *EvaluatorTemplate) Field4DeepEqual(src *string) bool { + + if p.Name == src { + return true + } else if p.Name == nil || src == nil { + return false + } + if strings.Compare(*p.Name, *src) != 0 { + return false + } + return true +} +func (p *EvaluatorTemplate) Field5DeepEqual(src *string) bool { + + if p.Description == src { + return true + } else if p.Description == nil || src == nil { + return false + } + if strings.Compare(*p.Description, *src) != 0 { + return false + } + return true +} +func (p *EvaluatorTemplate) Field6DeepEqual(src *int64) bool { + + if p.Popularity == src { + return true + } else if p.Popularity == nil || src == nil { + return false + } + if *p.Popularity != *src { + return false + } + return true +} +func (p *EvaluatorTemplate) Field7DeepEqual(src *string) bool { + + if p.Benchmark == src { + return true + } else if p.Benchmark == nil || src == nil { + return false + } + if strings.Compare(*p.Benchmark, *src) != 0 { + return false + } + return true +} +func (p *EvaluatorTemplate) Field8DeepEqual(src *string) bool { + + if p.Vendor == src { + return true + } else if p.Vendor == nil || src == nil { + return false + } + if strings.Compare(*p.Vendor, *src) != 0 { + return false + } + return true +} +func (p *EvaluatorTemplate) Field9DeepEqual(src map[EvaluatorTagKey][]string) bool { + + if len(p.Tags) != len(src) { + return false + } + for k, v := range p.Tags { + _src := src[k] + if len(v) != len(_src) { + return false + } + for i, v := range v { + _src1 := _src[i] + if strings.Compare(v, _src1) != 0 { + return false + } + } + } + return true +} +func (p *EvaluatorTemplate) Field101DeepEqual(src *EvaluatorContent) bool { + + if !p.EvaluatorContent.DeepEqual(src) { + return false + } + return true +} +func (p *EvaluatorTemplate) Field255DeepEqual(src *common.BaseInfo) bool { + + if !p.BaseInfo.DeepEqual(src) { + return false + } + return true +} + +// Evaluator筛选器选项 +type EvaluatorFilterOption struct { + // 模糊搜索关键词，在所有tag中搜索 + SearchKeyword *string `thrift:"search_keyword,1,optional" frugal:"1,optional,string" form:"search_keyword" json:"search_keyword,omitempty" query:"search_keyword"` + // 筛选条件 + Filters *EvaluatorFilters `thrift:"filters,2,optional" frugal:"2,optional,EvaluatorFilters" form:"filters" json:"filters,omitempty" query:"filters"` +} + +func NewEvaluatorFilterOption() *EvaluatorFilterOption { + return &EvaluatorFilterOption{} +} + +func (p *EvaluatorFilterOption) InitDefault() { +} + +var EvaluatorFilterOption_SearchKeyword_DEFAULT string + +func (p *EvaluatorFilterOption) GetSearchKeyword() (v string) { + if p == nil { + return + } + if !p.IsSetSearchKeyword() { + return EvaluatorFilterOption_SearchKeyword_DEFAULT + } + return *p.SearchKeyword +} + +var EvaluatorFilterOption_Filters_DEFAULT *EvaluatorFilters + +func (p *EvaluatorFilterOption) GetFilters() (v *EvaluatorFilters) { + if p == nil { + return + } + if !p.IsSetFilters() { + return EvaluatorFilterOption_Filters_DEFAULT + } + return p.Filters +} +func (p *EvaluatorFilterOption) SetSearchKeyword(val *string) { + p.SearchKeyword = val +} +func (p *EvaluatorFilterOption) SetFilters(val *EvaluatorFilters) { + p.Filters = val +} + +var fieldIDToName_EvaluatorFilterOption = map[int16]string{ + 1: "search_keyword", + 2: "filters", +} + +func (p *EvaluatorFilterOption) IsSetSearchKeyword() bool { + return p.SearchKeyword != nil +} + +func (p *EvaluatorFilterOption) IsSetFilters() bool { + return p.Filters != nil +} + +func (p *EvaluatorFilterOption) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRING { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorFilterOption[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorFilterOption) ReadField1(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.SearchKeyword = _field + return nil +} +func (p *EvaluatorFilterOption) ReadField2(iprot thrift.TProtocol) error { + _field := NewEvaluatorFilters() + if err := _field.Read(iprot); err != nil { + return err + } + p.Filters = _field + return nil +} + +func (p *EvaluatorFilterOption) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("EvaluatorFilterOption"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorFilterOption) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetSearchKeyword() { + if err = oprot.WriteFieldBegin("search_keyword", thrift.STRING, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.SearchKeyword); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *EvaluatorFilterOption) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetFilters() { + if err = oprot.WriteFieldBegin("filters", thrift.STRUCT, 2); err != nil { + goto WriteFieldBeginError + } + if err := p.Filters.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} + +func (p *EvaluatorFilterOption) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorFilterOption(%+v)", *p) + +} + +func (p *EvaluatorFilterOption) DeepEqual(ano *EvaluatorFilterOption) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.SearchKeyword) { + return false + } + if !p.Field2DeepEqual(ano.Filters) { + return false + } + return true +} + +func (p *EvaluatorFilterOption) Field1DeepEqual(src *string) bool { + + if p.SearchKeyword == src { + return true + } else if p.SearchKeyword == nil || src == nil { + return false + } + if strings.Compare(*p.SearchKeyword, *src) != 0 { + return false + } + return true +} +func (p *EvaluatorFilterOption) Field2DeepEqual(src *EvaluatorFilters) bool { + + if !p.Filters.DeepEqual(src) { + return false + } + return true +} + +// Evaluator筛选条件 +type EvaluatorFilters struct { + // 筛选条件列表 + FilterConditions []*EvaluatorFilterCondition `thrift:"filter_conditions,1,optional" frugal:"1,optional,list" form:"filter_conditions" json:"filter_conditions,omitempty" query:"filter_conditions"` + // 逻辑操作符 + LogicOp *FilterLogicOp `thrift:"logic_op,2,optional" frugal:"2,optional,string" form:"logic_op" json:"logic_op,omitempty" query:"logic_op"` +} + +func NewEvaluatorFilters() *EvaluatorFilters { + return &EvaluatorFilters{} +} + +func (p *EvaluatorFilters) InitDefault() { +} + +var EvaluatorFilters_FilterConditions_DEFAULT []*EvaluatorFilterCondition + +func (p *EvaluatorFilters) GetFilterConditions() (v []*EvaluatorFilterCondition) { + if p == nil { + return + } + if !p.IsSetFilterConditions() { + return EvaluatorFilters_FilterConditions_DEFAULT + } + return p.FilterConditions +} + +var EvaluatorFilters_LogicOp_DEFAULT FilterLogicOp + +func (p *EvaluatorFilters) GetLogicOp() (v FilterLogicOp) { + if p == nil { + return + } + if !p.IsSetLogicOp() { + return EvaluatorFilters_LogicOp_DEFAULT + } + return *p.LogicOp +} +func (p *EvaluatorFilters) SetFilterConditions(val []*EvaluatorFilterCondition) { + p.FilterConditions = val +} +func (p *EvaluatorFilters) SetLogicOp(val *FilterLogicOp) { + p.LogicOp = val +} + +var fieldIDToName_EvaluatorFilters = map[int16]string{ + 1: "filter_conditions", + 2: "logic_op", +} + +func (p *EvaluatorFilters) IsSetFilterConditions() bool { + return p.FilterConditions != nil +} + +func (p *EvaluatorFilters) IsSetLogicOp() bool { + return p.LogicOp != nil +} + +func (p *EvaluatorFilters) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.LIST { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRING { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorFilters[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorFilters) ReadField1(iprot thrift.TProtocol) error { + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _field := make([]*EvaluatorFilterCondition, 0, size) + values := make([]EvaluatorFilterCondition, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + + if err := _elem.Read(iprot); err != nil { + return err + } + + _field = append(_field, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + p.FilterConditions = _field + return nil +} +func (p *EvaluatorFilters) ReadField2(iprot thrift.TProtocol) error { + + var _field *FilterLogicOp + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.LogicOp = _field + return nil +} + +func (p *EvaluatorFilters) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("EvaluatorFilters"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorFilters) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetFilterConditions() { + if err = oprot.WriteFieldBegin("filter_conditions", thrift.LIST, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteListBegin(thrift.STRUCT, len(p.FilterConditions)); err != nil { + return err + } + for _, v := range p.FilterConditions { + if err := v.Write(oprot); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *EvaluatorFilters) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetLogicOp() { + if err = oprot.WriteFieldBegin("logic_op", thrift.STRING, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.LogicOp); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} + +func (p *EvaluatorFilters) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorFilters(%+v)", *p) + +} + +func (p *EvaluatorFilters) DeepEqual(ano *EvaluatorFilters) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.FilterConditions) { + return false + } + if !p.Field2DeepEqual(ano.LogicOp) { + return false + } + return true +} + +func (p *EvaluatorFilters) Field1DeepEqual(src []*EvaluatorFilterCondition) bool { + + if len(p.FilterConditions) != len(src) { + return false + } + for i, v := range p.FilterConditions { + _src := src[i] + if !v.DeepEqual(_src) { + return false + } + } + return true +} +func (p *EvaluatorFilters) Field2DeepEqual(src *FilterLogicOp) bool { + + if p.LogicOp == src { + return true + } else if p.LogicOp == nil || src == nil { + return false + } + if strings.Compare(*p.LogicOp, *src) != 0 { + return false + } + return true +} + +// Evaluator筛选条件 +type EvaluatorFilterCondition struct { + // 筛选字段 + TagKey EvaluatorTagKey `thrift:"tag_key,1,required" frugal:"1,required,string" form:"tag_key,required" json:"tag_key,required" query:"tag_key,required"` + // 操作符 + Operator EvaluatorFilterOperatorType `thrift:"operator,2,required" frugal:"2,required,string" form:"operator,required" json:"operator,required" query:"operator,required"` + // 操作值 + Value string `thrift:"value,3,required" frugal:"3,required,string" form:"value,required" json:"value,required" query:"value,required"` +} + +func NewEvaluatorFilterCondition() *EvaluatorFilterCondition { + return &EvaluatorFilterCondition{} +} + +func (p *EvaluatorFilterCondition) InitDefault() { +} + +func (p *EvaluatorFilterCondition) GetTagKey() (v EvaluatorTagKey) { + if p != nil { + return p.TagKey + } + return +} + +func (p *EvaluatorFilterCondition) GetOperator() (v EvaluatorFilterOperatorType) { + if p != nil { + return p.Operator + } + return +} + +func (p *EvaluatorFilterCondition) GetValue() (v string) { + if p != nil { + return p.Value + } + return +} +func (p *EvaluatorFilterCondition) SetTagKey(val EvaluatorTagKey) { + p.TagKey = val +} +func (p *EvaluatorFilterCondition) SetOperator(val EvaluatorFilterOperatorType) { + p.Operator = val +} +func (p *EvaluatorFilterCondition) SetValue(val string) { + p.Value = val +} + +var fieldIDToName_EvaluatorFilterCondition = map[int16]string{ + 1: "tag_key", + 2: "operator", + 3: "value", +} + +func (p *EvaluatorFilterCondition) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetTagKey bool = false + var issetOperator bool = false + var issetValue bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRING { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetTagKey = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRING { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + issetOperator = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 3: + if fieldTypeId == thrift.STRING { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + issetValue = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetTagKey { + fieldId = 1 + goto RequiredFieldNotSetError + } + + if !issetOperator { + fieldId = 2 + goto RequiredFieldNotSetError + } + + if !issetValue { + fieldId = 3 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorFilterCondition[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_EvaluatorFilterCondition[fieldId])) +} + +func (p *EvaluatorFilterCondition) ReadField1(iprot thrift.TProtocol) error { + + var _field EvaluatorTagKey + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = v + } + p.TagKey = _field + return nil +} +func (p *EvaluatorFilterCondition) ReadField2(iprot thrift.TProtocol) error { + + var _field EvaluatorFilterOperatorType + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = v + } + p.Operator = _field + return nil +} +func (p *EvaluatorFilterCondition) ReadField3(iprot thrift.TProtocol) error { + + var _field string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = v + } + p.Value = _field + return nil +} + +func (p *EvaluatorFilterCondition) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("EvaluatorFilterCondition"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorFilterCondition) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("tag_key", thrift.STRING, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(p.TagKey); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *EvaluatorFilterCondition) writeField2(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("operator", thrift.STRING, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(p.Operator); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *EvaluatorFilterCondition) writeField3(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("value", thrift.STRING, 3); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(p.Value); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} + +func (p *EvaluatorFilterCondition) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorFilterCondition(%+v)", *p) + +} + +func (p *EvaluatorFilterCondition) DeepEqual(ano *EvaluatorFilterCondition) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.TagKey) { + return false + } + if !p.Field2DeepEqual(ano.Operator) { + return false + } + if !p.Field3DeepEqual(ano.Value) { + return false + } + return true +} + +func (p *EvaluatorFilterCondition) Field1DeepEqual(src EvaluatorTagKey) bool { + + if strings.Compare(p.TagKey, src) != 0 { + return false + } + return true +} +func (p *EvaluatorFilterCondition) Field2DeepEqual(src EvaluatorFilterOperatorType) bool { + + if strings.Compare(p.Operator, src) != 0 { + return false + } + return true +} +func (p *EvaluatorFilterCondition) Field3DeepEqual(src string) bool { + + if strings.Compare(p.Value, src) != 0 { + return false + } + return true +} type Correction struct { Score *float64 `thrift:"score,1,optional" frugal:"1,optional,double" form:"score" json:"score,omitempty" query:"score"` diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go index bf8c17615..6ab11c44e 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go @@ -82,6 +82,33 @@ func (p *Evaluator) IsValid() error { } return nil } +func (p *EvaluatorTemplate) IsValid() error { + if p.EvaluatorContent != nil { + if err := p.EvaluatorContent.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorContent not valid, %w", err) + } + } + if p.BaseInfo != nil { + if err := p.BaseInfo.IsValid(); err != nil { + return fmt.Errorf("field BaseInfo not valid, %w", err) + } + } + return nil +} +func (p *EvaluatorFilterOption) IsValid() error { + if p.Filters != nil { + if err := p.Filters.IsValid(); err != nil { + return fmt.Errorf("field Filters not valid, %w", err) + } + } + return nil +} +func (p *EvaluatorFilters) IsValid() error { + return nil +} +func (p *EvaluatorFilterCondition) IsValid() error { + return nil +} func (p *Correction) IsValid() error { return nil } diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go index 4d1e19cc1..96ecd581e 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go @@ -1540,6 +1540,20 @@ func (p *EvaluatorContent) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 3: + if fieldTypeId == thrift.LIST { + l, err = p.FastReadField3(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 101: if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField101(buf[offset:]) @@ -1625,6 +1639,31 @@ func (p *EvaluatorContent) FastReadField2(buf []byte) (int, error) { return offset, nil } +func (p *EvaluatorContent) FastReadField3(buf []byte) (int, error) { + offset := 0 + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make([]*common.ArgsSchema, 0, size) + values := make([]common.ArgsSchema, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + if l, err := _elem.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + + _field = append(_field, _elem) + } + p.OutputSchemas = _field + return offset, nil +} + func (p *EvaluatorContent) FastReadField101(buf []byte) (int, error) { offset := 0 _field := NewPromptEvaluator() @@ -1658,6 +1697,7 @@ func (p *EvaluatorContent) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) in if p != nil { offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField101(buf[offset:], w) offset += p.fastWriteField102(buf[offset:], w) } @@ -1670,6 +1710,7 @@ func (p *EvaluatorContent) BLength() int { if p != nil { l += p.field1Length() l += p.field2Length() + l += p.field3Length() l += p.field101Length() l += p.field102Length() } @@ -1702,6 +1743,22 @@ func (p *EvaluatorContent) fastWriteField2(buf []byte, w thrift.NocopyWriter) in return offset } +func (p *EvaluatorContent) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetOutputSchemas() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.LIST, 3) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range p.OutputSchemas { + length++ + offset += v.FastWriteNocopy(buf[offset:], w) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRUCT, length) + } + return offset +} + func (p *EvaluatorContent) fastWriteField101(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetPromptEvaluator() { @@ -1742,6 +1799,19 @@ func (p *EvaluatorContent) field2Length() int { return l } +func (p *EvaluatorContent) field3Length() int { + l := 0 + if p.IsSetOutputSchemas() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.ListBeginLength() + for _, v := range p.OutputSchemas { + _ = v + l += v.BLength() + } + } + return l +} + func (p *EvaluatorContent) field101Length() int { l := 0 if p.IsSetPromptEvaluator() { @@ -1786,6 +1856,21 @@ func (p *EvaluatorContent) DeepCopy(s interface{}) error { } } + if src.OutputSchemas != nil { + p.OutputSchemas = make([]*common.ArgsSchema, 0, len(src.OutputSchemas)) + for _, elem := range src.OutputSchemas { + var _elem *common.ArgsSchema + if elem != nil { + _elem = &common.ArgsSchema{} + if err := _elem.DeepCopy(elem); err != nil { + return err + } + } + + p.OutputSchemas = append(p.OutputSchemas, _elem) + } + } + var _promptEvaluator *PromptEvaluator if src.PromptEvaluator != nil { _promptEvaluator = &PromptEvaluator{} @@ -1950,6 +2035,62 @@ func (p *Evaluator) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 20: + if fieldTypeId == thrift.BOOL { + l, err = p.FastReadField20(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 21: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField21(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 22: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField22(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 23: + if fieldTypeId == thrift.MAP { + l, err = p.FastReadField23(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 + } + } default: l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -2092,6 +2233,90 @@ func (p *Evaluator) FastReadField12(buf []byte) (int, error) { return offset, nil } +func (p *Evaluator) FastReadField20(buf []byte) (int, error) { + offset := 0 + + var _field *bool + if v, l, err := thrift.Binary.ReadBool(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Builtin = _field + return offset, nil +} + +func (p *Evaluator) FastReadField21(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Benchmark = _field + return offset, nil +} + +func (p *Evaluator) FastReadField22(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Vendor = _field + return offset, nil +} + +func (p *Evaluator) FastReadField23(buf []byte) (int, error) { + offset := 0 + + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make(map[EvaluatorTagKey][]string, size) + for i := 0; i < size; i++ { + var _key EvaluatorTagKey + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _key = v + } + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _val := make([]string, 0, size) + for i := 0; i < size; i++ { + var _elem string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _elem = v + } + + _val = append(_val, _elem) + } + + _field[_key] = _val + } + p.Tags = _field + return offset, nil +} + func (p *Evaluator) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } @@ -2102,12 +2327,16 @@ func (p *Evaluator) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) offset += p.fastWriteField6(buf[offset:], w) + offset += p.fastWriteField20(buf[offset:], w) offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField4(buf[offset:], w) offset += p.fastWriteField5(buf[offset:], w) offset += p.fastWriteField7(buf[offset:], w) offset += p.fastWriteField11(buf[offset:], w) offset += p.fastWriteField12(buf[offset:], w) + offset += p.fastWriteField21(buf[offset:], w) + offset += p.fastWriteField22(buf[offset:], w) + offset += p.fastWriteField23(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) return offset @@ -2125,6 +2354,10 @@ func (p *Evaluator) BLength() int { l += p.field7Length() l += p.field11Length() l += p.field12Length() + l += p.field20Length() + l += p.field21Length() + l += p.field22Length() + l += p.field23Length() } l += thrift.Binary.FieldStopLength() return l @@ -2211,6 +2444,55 @@ func (p *Evaluator) fastWriteField12(buf []byte, w thrift.NocopyWriter) int { return offset } +func (p *Evaluator) fastWriteField20(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBuiltin() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.BOOL, 20) + offset += thrift.Binary.WriteBool(buf[offset:], *p.Builtin) + } + return offset +} + +func (p *Evaluator) fastWriteField21(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBenchmark() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 21) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Benchmark) + } + return offset +} + +func (p *Evaluator) fastWriteField22(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetVendor() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 22) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Vendor) + } + return offset +} + +func (p *Evaluator) fastWriteField23(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 23) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() + var length int + for k, v := range p.Tags { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range v { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) + } + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) + return offset +} + func (p *Evaluator) field1Length() int { l := 0 if p.IsSetEvaluatorID() { @@ -2292,6 +2574,50 @@ func (p *Evaluator) field12Length() int { return l } +func (p *Evaluator) field20Length() int { + l := 0 + if p.IsSetBuiltin() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.BoolLength() + } + return l +} + +func (p *Evaluator) field21Length() int { + l := 0 + if p.IsSetBenchmark() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Benchmark) + } + return l +} + +func (p *Evaluator) field22Length() int { + l := 0 + if p.IsSetVendor() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Vendor) + } + return l +} + +func (p *Evaluator) field23Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.MapBeginLength() + for k, v := range p.Tags { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.ListBeginLength() + for _, v := range v { + _ = v + l += thrift.Binary.StringLengthNocopy(v) + } + } + return l +} + func (p *Evaluator) DeepCopy(s interface{}) error { src, ok := s.(*Evaluator) if !ok { @@ -2360,6 +2686,1383 @@ func (p *Evaluator) DeepCopy(s interface{}) error { p.LatestVersion = &tmp } + if src.Builtin != nil { + tmp := *src.Builtin + p.Builtin = &tmp + } + + if src.Benchmark != nil { + var tmp string + if *src.Benchmark != "" { + tmp = kutils.StringDeepCopy(*src.Benchmark) + } + p.Benchmark = &tmp + } + + if src.Vendor != nil { + var tmp string + if *src.Vendor != "" { + tmp = kutils.StringDeepCopy(*src.Vendor) + } + p.Vendor = &tmp + } + + if src.Tags != nil { + p.Tags = make(map[EvaluatorTagKey][]string, len(src.Tags)) + for key, val := range src.Tags { + var _key EvaluatorTagKey + _key = key + + var _val []string + if val != nil { + _val = make([]string, 0, len(val)) + for _, elem := range val { + var _elem string + if elem != "" { + _elem = kutils.StringDeepCopy(elem) + } + _val = append(_val, _elem) + } + } + + p.Tags[_key] = _val + } + } + + return nil +} + +func (p *EvaluatorTemplate) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField2(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 3: + if fieldTypeId == thrift.I32 { + l, err = p.FastReadField3(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 4: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField4(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 5: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField5(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 6: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField6(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 7: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField7(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 8: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField8(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 9: + if fieldTypeId == thrift.MAP { + l, err = p.FastReadField9(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 101: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField101(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 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorTemplate[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorTemplate) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.ID = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.WorkspaceID = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastReadField3(buf []byte) (int, error) { + offset := 0 + + var _field *EvaluatorType + if v, l, err := thrift.Binary.ReadI32(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + + tmp := EvaluatorType(v) + _field = &tmp + } + p.EvaluatorType = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastReadField4(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Name = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastReadField5(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Description = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastReadField6(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Popularity = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastReadField7(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Benchmark = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastReadField8(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Vendor = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastReadField9(buf []byte) (int, error) { + offset := 0 + + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make(map[EvaluatorTagKey][]string, size) + for i := 0; i < size; i++ { + var _key EvaluatorTagKey + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _key = v + } + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _val := make([]string, 0, size) + for i := 0; i < size; i++ { + var _elem string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _elem = v + } + + _val = append(_val, _elem) + } + + _field[_key] = _val + } + p.Tags = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastReadField101(buf []byte) (int, error) { + offset := 0 + _field := NewEvaluatorContent() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.EvaluatorContent = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := common.NewBaseInfo() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.BaseInfo = _field + return offset, nil +} + +func (p *EvaluatorTemplate) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorTemplate) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField6(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) + offset += p.fastWriteField4(buf[offset:], w) + offset += p.fastWriteField5(buf[offset:], w) + offset += p.fastWriteField7(buf[offset:], w) + offset += p.fastWriteField8(buf[offset:], w) + offset += p.fastWriteField9(buf[offset:], w) + offset += p.fastWriteField101(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorTemplate) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field3Length() + l += p.field4Length() + l += p.field5Length() + l += p.field6Length() + l += p.field7Length() + l += p.field8Length() + l += p.field9Length() + l += p.field101Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorTemplate) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetID() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], *p.ID) + } + return offset +} + +func (p *EvaluatorTemplate) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetWorkspaceID() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 2) + offset += thrift.Binary.WriteI64(buf[offset:], *p.WorkspaceID) + } + return offset +} + +func (p *EvaluatorTemplate) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetEvaluatorType() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I32, 3) + offset += thrift.Binary.WriteI32(buf[offset:], int32(*p.EvaluatorType)) + } + return offset +} + +func (p *EvaluatorTemplate) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetName() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 4) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Name) + } + return offset +} + +func (p *EvaluatorTemplate) fastWriteField5(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetDescription() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 5) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Description) + } + return offset +} + +func (p *EvaluatorTemplate) fastWriteField6(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetPopularity() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 6) + offset += thrift.Binary.WriteI64(buf[offset:], *p.Popularity) + } + return offset +} + +func (p *EvaluatorTemplate) fastWriteField7(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBenchmark() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 7) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Benchmark) + } + return offset +} + +func (p *EvaluatorTemplate) fastWriteField8(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetVendor() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 8) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Vendor) + } + return offset +} + +func (p *EvaluatorTemplate) fastWriteField9(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 9) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() + var length int + for k, v := range p.Tags { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range v { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) + } + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) + return offset +} + +func (p *EvaluatorTemplate) fastWriteField101(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetEvaluatorContent() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 101) + offset += p.EvaluatorContent.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorTemplate) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBaseInfo() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseInfo.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorTemplate) field1Length() int { + l := 0 + if p.IsSetID() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *EvaluatorTemplate) field2Length() int { + l := 0 + if p.IsSetWorkspaceID() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *EvaluatorTemplate) field3Length() int { + l := 0 + if p.IsSetEvaluatorType() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I32Length() + } + return l +} + +func (p *EvaluatorTemplate) field4Length() int { + l := 0 + if p.IsSetName() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Name) + } + return l +} + +func (p *EvaluatorTemplate) field5Length() int { + l := 0 + if p.IsSetDescription() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Description) + } + return l +} + +func (p *EvaluatorTemplate) field6Length() int { + l := 0 + if p.IsSetPopularity() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *EvaluatorTemplate) field7Length() int { + l := 0 + if p.IsSetBenchmark() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Benchmark) + } + return l +} + +func (p *EvaluatorTemplate) field8Length() int { + l := 0 + if p.IsSetVendor() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Vendor) + } + return l +} + +func (p *EvaluatorTemplate) field9Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.MapBeginLength() + for k, v := range p.Tags { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.ListBeginLength() + for _, v := range v { + _ = v + l += thrift.Binary.StringLengthNocopy(v) + } + } + return l +} + +func (p *EvaluatorTemplate) field101Length() int { + l := 0 + if p.IsSetEvaluatorContent() { + l += thrift.Binary.FieldBeginLength() + l += p.EvaluatorContent.BLength() + } + return l +} + +func (p *EvaluatorTemplate) field255Length() int { + l := 0 + if p.IsSetBaseInfo() { + l += thrift.Binary.FieldBeginLength() + l += p.BaseInfo.BLength() + } + return l +} + +func (p *EvaluatorTemplate) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorTemplate) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.ID != nil { + tmp := *src.ID + p.ID = &tmp + } + + if src.WorkspaceID != nil { + tmp := *src.WorkspaceID + p.WorkspaceID = &tmp + } + + if src.EvaluatorType != nil { + tmp := *src.EvaluatorType + p.EvaluatorType = &tmp + } + + if src.Name != nil { + var tmp string + if *src.Name != "" { + tmp = kutils.StringDeepCopy(*src.Name) + } + p.Name = &tmp + } + + if src.Description != nil { + var tmp string + if *src.Description != "" { + tmp = kutils.StringDeepCopy(*src.Description) + } + p.Description = &tmp + } + + if src.Popularity != nil { + tmp := *src.Popularity + p.Popularity = &tmp + } + + if src.Benchmark != nil { + var tmp string + if *src.Benchmark != "" { + tmp = kutils.StringDeepCopy(*src.Benchmark) + } + p.Benchmark = &tmp + } + + if src.Vendor != nil { + var tmp string + if *src.Vendor != "" { + tmp = kutils.StringDeepCopy(*src.Vendor) + } + p.Vendor = &tmp + } + + if src.Tags != nil { + p.Tags = make(map[EvaluatorTagKey][]string, len(src.Tags)) + for key, val := range src.Tags { + var _key EvaluatorTagKey + _key = key + + var _val []string + if val != nil { + _val = make([]string, 0, len(val)) + for _, elem := range val { + var _elem string + if elem != "" { + _elem = kutils.StringDeepCopy(elem) + } + _val = append(_val, _elem) + } + } + + p.Tags[_key] = _val + } + } + + var _evaluatorContent *EvaluatorContent + if src.EvaluatorContent != nil { + _evaluatorContent = &EvaluatorContent{} + if err := _evaluatorContent.DeepCopy(src.EvaluatorContent); err != nil { + return err + } + } + p.EvaluatorContent = _evaluatorContent + + var _baseInfo *common.BaseInfo + if src.BaseInfo != nil { + _baseInfo = &common.BaseInfo{} + if err := _baseInfo.DeepCopy(src.BaseInfo); err != nil { + return err + } + } + p.BaseInfo = _baseInfo + + return nil +} + +func (p *EvaluatorFilterOption) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField2(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorFilterOption[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorFilterOption) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.SearchKeyword = _field + return offset, nil +} + +func (p *EvaluatorFilterOption) FastReadField2(buf []byte) (int, error) { + offset := 0 + _field := NewEvaluatorFilters() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Filters = _field + return offset, nil +} + +func (p *EvaluatorFilterOption) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorFilterOption) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorFilterOption) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorFilterOption) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSearchKeyword() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 1) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.SearchKeyword) + } + return offset +} + +func (p *EvaluatorFilterOption) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetFilters() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 2) + offset += p.Filters.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorFilterOption) field1Length() int { + l := 0 + if p.IsSetSearchKeyword() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.SearchKeyword) + } + return l +} + +func (p *EvaluatorFilterOption) field2Length() int { + l := 0 + if p.IsSetFilters() { + l += thrift.Binary.FieldBeginLength() + l += p.Filters.BLength() + } + return l +} + +func (p *EvaluatorFilterOption) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorFilterOption) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.SearchKeyword != nil { + var tmp string + if *src.SearchKeyword != "" { + tmp = kutils.StringDeepCopy(*src.SearchKeyword) + } + p.SearchKeyword = &tmp + } + + var _filters *EvaluatorFilters + if src.Filters != nil { + _filters = &EvaluatorFilters{} + if err := _filters.DeepCopy(src.Filters); err != nil { + return err + } + } + p.Filters = _filters + + return nil +} + +func (p *EvaluatorFilters) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.LIST { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField2(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorFilters[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorFilters) FastReadField1(buf []byte) (int, error) { + offset := 0 + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make([]*EvaluatorFilterCondition, 0, size) + values := make([]EvaluatorFilterCondition, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + if l, err := _elem.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + + _field = append(_field, _elem) + } + p.FilterConditions = _field + return offset, nil +} + +func (p *EvaluatorFilters) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field *FilterLogicOp + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.LogicOp = _field + return offset, nil +} + +func (p *EvaluatorFilters) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorFilters) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorFilters) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorFilters) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetFilterConditions() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.LIST, 1) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range p.FilterConditions { + length++ + offset += v.FastWriteNocopy(buf[offset:], w) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRUCT, length) + } + return offset +} + +func (p *EvaluatorFilters) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetLogicOp() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 2) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.LogicOp) + } + return offset +} + +func (p *EvaluatorFilters) field1Length() int { + l := 0 + if p.IsSetFilterConditions() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.ListBeginLength() + for _, v := range p.FilterConditions { + _ = v + l += v.BLength() + } + } + return l +} + +func (p *EvaluatorFilters) field2Length() int { + l := 0 + if p.IsSetLogicOp() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.LogicOp) + } + return l +} + +func (p *EvaluatorFilters) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorFilters) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.FilterConditions != nil { + p.FilterConditions = make([]*EvaluatorFilterCondition, 0, len(src.FilterConditions)) + for _, elem := range src.FilterConditions { + var _elem *EvaluatorFilterCondition + if elem != nil { + _elem = &EvaluatorFilterCondition{} + if err := _elem.DeepCopy(elem); err != nil { + return err + } + } + + p.FilterConditions = append(p.FilterConditions, _elem) + } + } + + if src.LogicOp != nil { + tmp := *src.LogicOp + p.LogicOp = &tmp + } + + return nil +} + +func (p *EvaluatorFilterCondition) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetTagKey bool = false + var issetOperator bool = false + var issetValue bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetTagKey = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 2: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField2(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetOperator = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 3: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField3(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetValue = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetTagKey { + fieldId = 1 + goto RequiredFieldNotSetError + } + + if !issetOperator { + fieldId = 2 + goto RequiredFieldNotSetError + } + + if !issetValue { + fieldId = 3 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorFilterCondition[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_EvaluatorFilterCondition[fieldId])) +} + +func (p *EvaluatorFilterCondition) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field EvaluatorTagKey + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.TagKey = _field + return offset, nil +} + +func (p *EvaluatorFilterCondition) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field EvaluatorFilterOperatorType + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.Operator = _field + return offset, nil +} + +func (p *EvaluatorFilterCondition) FastReadField3(buf []byte) (int, error) { + offset := 0 + + var _field string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.Value = _field + return offset, nil +} + +func (p *EvaluatorFilterCondition) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorFilterCondition) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorFilterCondition) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field3Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorFilterCondition) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 1) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, p.TagKey) + return offset +} + +func (p *EvaluatorFilterCondition) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 2) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, p.Operator) + return offset +} + +func (p *EvaluatorFilterCondition) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 3) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, p.Value) + return offset +} + +func (p *EvaluatorFilterCondition) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(p.TagKey) + return l +} + +func (p *EvaluatorFilterCondition) field2Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(p.Operator) + return l +} + +func (p *EvaluatorFilterCondition) field3Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(p.Value) + return l +} + +func (p *EvaluatorFilterCondition) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorFilterCondition) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + p.TagKey = src.TagKey + + p.Operator = src.Operator + + if src.Value != "" { + p.Value = kutils.StringDeepCopy(src.Value) + } + return nil } diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go index ecf7350ee..05b6a3194 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go @@ -18,10 +18,14 @@ type ListEvaluatorsRequest struct { CreatorIds []int64 `thrift:"creator_ids,3,optional" frugal:"3,optional,list" json:"creator_ids" form:"creator_ids" ` EvaluatorType []evaluator.EvaluatorType `thrift:"evaluator_type,4,optional" frugal:"4,optional,list" form:"evaluator_type" json:"evaluator_type,omitempty"` WithVersion *bool `thrift:"with_version,5,optional" frugal:"5,optional,bool" form:"with_version" json:"with_version,omitempty"` - PageSize *int32 `thrift:"page_size,101,optional" frugal:"101,optional,i32" form:"page_size" json:"page_size,omitempty"` - PageNumber *int32 `thrift:"page_number,102,optional" frugal:"102,optional,i32" form:"page_number" json:"page_number,omitempty"` - OrderBys []*common.OrderBy `thrift:"order_bys,103,optional" frugal:"103,optional,list" form:"order_bys" json:"order_bys,omitempty"` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + // 是否查询预置评估器 + Builtin *bool `thrift:"builtin,11,optional" frugal:"11,optional,bool" form:"builtin" json:"builtin,omitempty"` + // 筛选器选项 + FilterOption *evaluator.EvaluatorFilterOption `thrift:"filter_option,12,optional" frugal:"12,optional,evaluator.EvaluatorFilterOption" json:"filter_option" form:"filter_option" ` + PageSize *int32 `thrift:"page_size,101,optional" frugal:"101,optional,i32" form:"page_size" json:"page_size,omitempty"` + PageNumber *int32 `thrift:"page_number,102,optional" frugal:"102,optional,i32" form:"page_number" json:"page_number,omitempty"` + OrderBys []*common.OrderBy `thrift:"order_bys,103,optional" frugal:"103,optional,list" form:"order_bys" json:"order_bys,omitempty"` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewListEvaluatorsRequest() *ListEvaluatorsRequest { @@ -86,6 +90,30 @@ func (p *ListEvaluatorsRequest) GetWithVersion() (v bool) { return *p.WithVersion } +var ListEvaluatorsRequest_Builtin_DEFAULT bool + +func (p *ListEvaluatorsRequest) GetBuiltin() (v bool) { + if p == nil { + return + } + if !p.IsSetBuiltin() { + return ListEvaluatorsRequest_Builtin_DEFAULT + } + return *p.Builtin +} + +var ListEvaluatorsRequest_FilterOption_DEFAULT *evaluator.EvaluatorFilterOption + +func (p *ListEvaluatorsRequest) GetFilterOption() (v *evaluator.EvaluatorFilterOption) { + if p == nil { + return + } + if !p.IsSetFilterOption() { + return ListEvaluatorsRequest_FilterOption_DEFAULT + } + return p.FilterOption +} + var ListEvaluatorsRequest_PageSize_DEFAULT int32 func (p *ListEvaluatorsRequest) GetPageSize() (v int32) { @@ -148,6 +176,12 @@ func (p *ListEvaluatorsRequest) SetEvaluatorType(val []evaluator.EvaluatorType) func (p *ListEvaluatorsRequest) SetWithVersion(val *bool) { p.WithVersion = val } +func (p *ListEvaluatorsRequest) SetBuiltin(val *bool) { + p.Builtin = val +} +func (p *ListEvaluatorsRequest) SetFilterOption(val *evaluator.EvaluatorFilterOption) { + p.FilterOption = val +} func (p *ListEvaluatorsRequest) SetPageSize(val *int32) { p.PageSize = val } @@ -167,6 +201,8 @@ var fieldIDToName_ListEvaluatorsRequest = map[int16]string{ 3: "creator_ids", 4: "evaluator_type", 5: "with_version", + 11: "builtin", + 12: "filter_option", 101: "page_size", 102: "page_number", 103: "order_bys", @@ -189,6 +225,14 @@ func (p *ListEvaluatorsRequest) IsSetWithVersion() bool { return p.WithVersion != nil } +func (p *ListEvaluatorsRequest) IsSetBuiltin() bool { + return p.Builtin != nil +} + +func (p *ListEvaluatorsRequest) IsSetFilterOption() bool { + return p.FilterOption != nil +} + func (p *ListEvaluatorsRequest) IsSetPageSize() bool { return p.PageSize != nil } @@ -265,6 +309,22 @@ func (p *ListEvaluatorsRequest) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 11: + if fieldTypeId == thrift.BOOL { + if err = p.ReadField11(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 12: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField12(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } case 101: if fieldTypeId == thrift.I32 { if err = p.ReadField101(iprot); err != nil { @@ -411,6 +471,25 @@ func (p *ListEvaluatorsRequest) ReadField5(iprot thrift.TProtocol) error { p.WithVersion = _field return nil } +func (p *ListEvaluatorsRequest) ReadField11(iprot thrift.TProtocol) error { + + var _field *bool + if v, err := iprot.ReadBool(); err != nil { + return err + } else { + _field = &v + } + p.Builtin = _field + return nil +} +func (p *ListEvaluatorsRequest) ReadField12(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorFilterOption() + if err := _field.Read(iprot); err != nil { + return err + } + p.FilterOption = _field + return nil +} func (p *ListEvaluatorsRequest) ReadField101(iprot thrift.TProtocol) error { var _field *int32 @@ -491,6 +570,14 @@ func (p *ListEvaluatorsRequest) Write(oprot thrift.TProtocol) (err error) { fieldId = 5 goto WriteFieldError } + if err = p.writeField11(oprot); err != nil { + fieldId = 11 + goto WriteFieldError + } + if err = p.writeField12(oprot); err != nil { + fieldId = 12 + goto WriteFieldError + } if err = p.writeField101(oprot); err != nil { fieldId = 101 goto WriteFieldError @@ -629,6 +716,42 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 5 end error: ", p), err) } +func (p *ListEvaluatorsRequest) writeField11(oprot thrift.TProtocol) (err error) { + if p.IsSetBuiltin() { + if err = oprot.WriteFieldBegin("builtin", thrift.BOOL, 11); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteBool(*p.Builtin); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 11 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 11 end error: ", p), err) +} +func (p *ListEvaluatorsRequest) writeField12(oprot thrift.TProtocol) (err error) { + if p.IsSetFilterOption() { + if err = oprot.WriteFieldBegin("filter_option", thrift.STRUCT, 12); err != nil { + goto WriteFieldBeginError + } + if err := p.FilterOption.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 12 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 12 end error: ", p), err) +} func (p *ListEvaluatorsRequest) writeField101(oprot thrift.TProtocol) (err error) { if p.IsSetPageSize() { if err = oprot.WriteFieldBegin("page_size", thrift.I32, 101); err != nil { @@ -739,6 +862,12 @@ func (p *ListEvaluatorsRequest) DeepEqual(ano *ListEvaluatorsRequest) bool { if !p.Field5DeepEqual(ano.WithVersion) { return false } + if !p.Field11DeepEqual(ano.Builtin) { + return false + } + if !p.Field12DeepEqual(ano.FilterOption) { + return false + } if !p.Field101DeepEqual(ano.PageSize) { return false } @@ -811,6 +940,25 @@ func (p *ListEvaluatorsRequest) Field5DeepEqual(src *bool) bool { } return true } +func (p *ListEvaluatorsRequest) Field11DeepEqual(src *bool) bool { + + if p.Builtin == src { + return true + } else if p.Builtin == nil || src == nil { + return false + } + if *p.Builtin != *src { + return false + } + return true +} +func (p *ListEvaluatorsRequest) Field12DeepEqual(src *evaluator.EvaluatorFilterOption) bool { + + if !p.FilterOption.DeepEqual(src) { + return false + } + return true +} func (p *ListEvaluatorsRequest) Field101DeepEqual(src *int32) bool { if p.PageSize == src { @@ -3103,10 +3251,13 @@ type UpdateEvaluatorDraftRequest struct { // 评估器 id EvaluatorID int64 `thrift:"evaluator_id,1,required" frugal:"1,required,i64" json:"evaluator_id" path:"evaluator_id,required" ` // 空间 id - WorkspaceID int64 `thrift:"workspace_id,2,required" frugal:"2,required,i64" json:"workspace_id" form:"workspace_id,required" ` - EvaluatorContent *evaluator.EvaluatorContent `thrift:"evaluator_content,3,required" frugal:"3,required,evaluator.EvaluatorContent" json:"evaluator_content" form:"evaluator_content,required" ` - EvaluatorType evaluator.EvaluatorType `thrift:"evaluator_type,4,required" frugal:"4,required,EvaluatorType" json:"evaluator_type" form:"evaluator_type,required" ` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + WorkspaceID int64 `thrift:"workspace_id,2,required" frugal:"2,required,i64" json:"workspace_id" form:"workspace_id,required" ` + EvaluatorContent *evaluator.EvaluatorContent `thrift:"evaluator_content,3,required" frugal:"3,required,evaluator.EvaluatorContent" json:"evaluator_content" form:"evaluator_content,required" ` + EvaluatorType evaluator.EvaluatorType `thrift:"evaluator_type,4,required" frugal:"4,required,EvaluatorType" json:"evaluator_type" form:"evaluator_type,required" ` + Tags map[evaluator.EvaluatorTagKey][]string `thrift:"tags,5,optional" frugal:"5,optional,map>" json:"tags" form:"tags" ` + // 是否预置评估器 + Builtin *bool `thrift:"builtin,6,optional" frugal:"6,optional,bool" json:"builtin" form:"builtin" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewUpdateEvaluatorDraftRequest() *UpdateEvaluatorDraftRequest { @@ -3149,6 +3300,30 @@ func (p *UpdateEvaluatorDraftRequest) GetEvaluatorType() (v evaluator.EvaluatorT return } +var UpdateEvaluatorDraftRequest_Tags_DEFAULT map[evaluator.EvaluatorTagKey][]string + +func (p *UpdateEvaluatorDraftRequest) GetTags() (v map[evaluator.EvaluatorTagKey][]string) { + if p == nil { + return + } + if !p.IsSetTags() { + return UpdateEvaluatorDraftRequest_Tags_DEFAULT + } + return p.Tags +} + +var UpdateEvaluatorDraftRequest_Builtin_DEFAULT bool + +func (p *UpdateEvaluatorDraftRequest) GetBuiltin() (v bool) { + if p == nil { + return + } + if !p.IsSetBuiltin() { + return UpdateEvaluatorDraftRequest_Builtin_DEFAULT + } + return *p.Builtin +} + var UpdateEvaluatorDraftRequest_Base_DEFAULT *base.Base func (p *UpdateEvaluatorDraftRequest) GetBase() (v *base.Base) { @@ -3172,6 +3347,12 @@ func (p *UpdateEvaluatorDraftRequest) SetEvaluatorContent(val *evaluator.Evaluat func (p *UpdateEvaluatorDraftRequest) SetEvaluatorType(val evaluator.EvaluatorType) { p.EvaluatorType = val } +func (p *UpdateEvaluatorDraftRequest) SetTags(val map[evaluator.EvaluatorTagKey][]string) { + p.Tags = val +} +func (p *UpdateEvaluatorDraftRequest) SetBuiltin(val *bool) { + p.Builtin = val +} func (p *UpdateEvaluatorDraftRequest) SetBase(val *base.Base) { p.Base = val } @@ -3181,6 +3362,8 @@ var fieldIDToName_UpdateEvaluatorDraftRequest = map[int16]string{ 2: "workspace_id", 3: "evaluator_content", 4: "evaluator_type", + 5: "tags", + 6: "builtin", 255: "Base", } @@ -3188,6 +3371,14 @@ func (p *UpdateEvaluatorDraftRequest) IsSetEvaluatorContent() bool { return p.EvaluatorContent != nil } +func (p *UpdateEvaluatorDraftRequest) IsSetTags() bool { + return p.Tags != nil +} + +func (p *UpdateEvaluatorDraftRequest) IsSetBuiltin() bool { + return p.Builtin != nil +} + func (p *UpdateEvaluatorDraftRequest) IsSetBase() bool { return p.Base != nil } @@ -3250,6 +3441,22 @@ func (p *UpdateEvaluatorDraftRequest) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 5: + if fieldTypeId == thrift.MAP { + if err = p.ReadField5(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 6: + if fieldTypeId == thrift.BOOL { + if err = p.ReadField6(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } case 255: if fieldTypeId == thrift.STRUCT { if err = p.ReadField255(iprot); err != nil { @@ -3349,6 +3556,58 @@ func (p *UpdateEvaluatorDraftRequest) ReadField4(iprot thrift.TProtocol) error { p.EvaluatorType = _field return nil } +func (p *UpdateEvaluatorDraftRequest) ReadField5(iprot thrift.TProtocol) error { + _, _, size, err := iprot.ReadMapBegin() + if err != nil { + return err + } + _field := make(map[evaluator.EvaluatorTagKey][]string, size) + for i := 0; i < size; i++ { + var _key evaluator.EvaluatorTagKey + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _key = v + } + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _val := make([]string, 0, size) + for i := 0; i < size; i++ { + + var _elem string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _elem = v + } + + _val = append(_val, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + + _field[_key] = _val + } + if err := iprot.ReadMapEnd(); err != nil { + return err + } + p.Tags = _field + return nil +} +func (p *UpdateEvaluatorDraftRequest) ReadField6(iprot thrift.TProtocol) error { + + var _field *bool + if v, err := iprot.ReadBool(); err != nil { + return err + } else { + _field = &v + } + p.Builtin = _field + return nil +} func (p *UpdateEvaluatorDraftRequest) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBase() if err := _field.Read(iprot); err != nil { @@ -3380,6 +3639,14 @@ func (p *UpdateEvaluatorDraftRequest) Write(oprot thrift.TProtocol) (err error) fieldId = 4 goto WriteFieldError } + if err = p.writeField5(oprot); err != nil { + fieldId = 5 + goto WriteFieldError + } + if err = p.writeField6(oprot); err != nil { + fieldId = 6 + goto WriteFieldError + } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -3466,6 +3733,61 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) } +func (p *UpdateEvaluatorDraftRequest) writeField5(oprot thrift.TProtocol) (err error) { + if p.IsSetTags() { + if err = oprot.WriteFieldBegin("tags", thrift.MAP, 5); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(p.Tags)); err != nil { + return err + } + for k, v := range p.Tags { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + return err + } + for _, v := range v { + if err := oprot.WriteString(v); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + } + if err := oprot.WriteMapEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 5 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 5 end error: ", p), err) +} +func (p *UpdateEvaluatorDraftRequest) writeField6(oprot thrift.TProtocol) (err error) { + if p.IsSetBuiltin() { + if err = oprot.WriteFieldBegin("builtin", thrift.BOOL, 6); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteBool(*p.Builtin); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 6 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 6 end error: ", p), err) +} func (p *UpdateEvaluatorDraftRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { @@ -3511,6 +3833,12 @@ func (p *UpdateEvaluatorDraftRequest) DeepEqual(ano *UpdateEvaluatorDraftRequest if !p.Field4DeepEqual(ano.EvaluatorType) { return false } + if !p.Field5DeepEqual(ano.Tags) { + return false + } + if !p.Field6DeepEqual(ano.Builtin) { + return false + } if !p.Field255DeepEqual(ano.Base) { return false } @@ -3545,6 +3873,37 @@ func (p *UpdateEvaluatorDraftRequest) Field4DeepEqual(src evaluator.EvaluatorTyp } return true } +func (p *UpdateEvaluatorDraftRequest) Field5DeepEqual(src map[evaluator.EvaluatorTagKey][]string) bool { + + if len(p.Tags) != len(src) { + return false + } + for k, v := range p.Tags { + _src := src[k] + if len(v) != len(_src) { + return false + } + for i, v := range v { + _src1 := _src[i] + if strings.Compare(v, _src1) != 0 { + return false + } + } + } + return true +} +func (p *UpdateEvaluatorDraftRequest) Field6DeepEqual(src *bool) bool { + + if p.Builtin == src { + return true + } else if p.Builtin == nil || src == nil { + return false + } + if *p.Builtin != *src { + return false + } + return true +} func (p *UpdateEvaluatorDraftRequest) Field255DeepEqual(src *base.Base) bool { if !p.Base.DeepEqual(src) { @@ -3802,8 +4161,12 @@ type UpdateEvaluatorRequest struct { // 展示用名称 Name *string `thrift:"name,4,optional" frugal:"4,optional,string" json:"name" form:"name" ` // 描述 - Description *string `thrift:"description,5,optional" frugal:"5,optional,string" json:"description" form:"description" ` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + Description *string `thrift:"description,5,optional" frugal:"5,optional,string" json:"description" form:"description" ` + // 是否预置评估器 + Builtin *bool `thrift:"builtin,11,optional" frugal:"11,optional,bool" json:"builtin" form:"builtin" ` + Benchmark *string `thrift:"benchmark,12,optional" frugal:"12,optional,string" json:"benchmark" form:"benchmark" ` + Vendor *string `thrift:"vendor,13,optional" frugal:"13,optional,string" json:"vendor" form:"vendor" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewUpdateEvaluatorRequest() *UpdateEvaluatorRequest { @@ -3858,25 +4221,61 @@ func (p *UpdateEvaluatorRequest) GetDescription() (v string) { return *p.Description } -var UpdateEvaluatorRequest_Base_DEFAULT *base.Base +var UpdateEvaluatorRequest_Builtin_DEFAULT bool -func (p *UpdateEvaluatorRequest) GetBase() (v *base.Base) { +func (p *UpdateEvaluatorRequest) GetBuiltin() (v bool) { if p == nil { return } - if !p.IsSetBase() { - return UpdateEvaluatorRequest_Base_DEFAULT + if !p.IsSetBuiltin() { + return UpdateEvaluatorRequest_Builtin_DEFAULT } - return p.Base -} -func (p *UpdateEvaluatorRequest) SetEvaluatorID(val int64) { - p.EvaluatorID = val + return *p.Builtin } -func (p *UpdateEvaluatorRequest) SetWorkspaceID(val int64) { - p.WorkspaceID = val + +var UpdateEvaluatorRequest_Benchmark_DEFAULT string + +func (p *UpdateEvaluatorRequest) GetBenchmark() (v string) { + if p == nil { + return + } + if !p.IsSetBenchmark() { + return UpdateEvaluatorRequest_Benchmark_DEFAULT + } + return *p.Benchmark } -func (p *UpdateEvaluatorRequest) SetEvaluatorType(val evaluator.EvaluatorType) { - p.EvaluatorType = val + +var UpdateEvaluatorRequest_Vendor_DEFAULT string + +func (p *UpdateEvaluatorRequest) GetVendor() (v string) { + if p == nil { + return + } + if !p.IsSetVendor() { + return UpdateEvaluatorRequest_Vendor_DEFAULT + } + return *p.Vendor +} + +var UpdateEvaluatorRequest_Base_DEFAULT *base.Base + +func (p *UpdateEvaluatorRequest) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return UpdateEvaluatorRequest_Base_DEFAULT + } + return p.Base +} +func (p *UpdateEvaluatorRequest) SetEvaluatorID(val int64) { + p.EvaluatorID = val +} +func (p *UpdateEvaluatorRequest) SetWorkspaceID(val int64) { + p.WorkspaceID = val +} +func (p *UpdateEvaluatorRequest) SetEvaluatorType(val evaluator.EvaluatorType) { + p.EvaluatorType = val } func (p *UpdateEvaluatorRequest) SetName(val *string) { p.Name = val @@ -3884,6 +4283,15 @@ func (p *UpdateEvaluatorRequest) SetName(val *string) { func (p *UpdateEvaluatorRequest) SetDescription(val *string) { p.Description = val } +func (p *UpdateEvaluatorRequest) SetBuiltin(val *bool) { + p.Builtin = val +} +func (p *UpdateEvaluatorRequest) SetBenchmark(val *string) { + p.Benchmark = val +} +func (p *UpdateEvaluatorRequest) SetVendor(val *string) { + p.Vendor = val +} func (p *UpdateEvaluatorRequest) SetBase(val *base.Base) { p.Base = val } @@ -3894,6 +4302,9 @@ var fieldIDToName_UpdateEvaluatorRequest = map[int16]string{ 3: "evaluator_type", 4: "name", 5: "description", + 11: "builtin", + 12: "benchmark", + 13: "vendor", 255: "Base", } @@ -3905,6 +4316,18 @@ func (p *UpdateEvaluatorRequest) IsSetDescription() bool { return p.Description != nil } +func (p *UpdateEvaluatorRequest) IsSetBuiltin() bool { + return p.Builtin != nil +} + +func (p *UpdateEvaluatorRequest) IsSetBenchmark() bool { + return p.Benchmark != nil +} + +func (p *UpdateEvaluatorRequest) IsSetVendor() bool { + return p.Vendor != nil +} + func (p *UpdateEvaluatorRequest) IsSetBase() bool { return p.Base != nil } @@ -3973,6 +4396,30 @@ func (p *UpdateEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 11: + if fieldTypeId == thrift.BOOL { + if err = p.ReadField11(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 12: + if fieldTypeId == thrift.STRING { + if err = p.ReadField12(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 13: + if fieldTypeId == thrift.STRING { + if err = p.ReadField13(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } case 255: if fieldTypeId == thrift.STRUCT { if err = p.ReadField255(iprot); err != nil { @@ -4081,6 +4528,39 @@ func (p *UpdateEvaluatorRequest) ReadField5(iprot thrift.TProtocol) error { p.Description = _field return nil } +func (p *UpdateEvaluatorRequest) ReadField11(iprot thrift.TProtocol) error { + + var _field *bool + if v, err := iprot.ReadBool(); err != nil { + return err + } else { + _field = &v + } + p.Builtin = _field + return nil +} +func (p *UpdateEvaluatorRequest) ReadField12(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Benchmark = _field + return nil +} +func (p *UpdateEvaluatorRequest) ReadField13(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Vendor = _field + return nil +} func (p *UpdateEvaluatorRequest) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBase() if err := _field.Read(iprot); err != nil { @@ -4116,6 +4596,18 @@ func (p *UpdateEvaluatorRequest) Write(oprot thrift.TProtocol) (err error) { fieldId = 5 goto WriteFieldError } + if err = p.writeField11(oprot); err != nil { + fieldId = 11 + goto WriteFieldError + } + if err = p.writeField12(oprot); err != nil { + fieldId = 12 + goto WriteFieldError + } + if err = p.writeField13(oprot); err != nil { + fieldId = 13 + goto WriteFieldError + } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -4222,6 +4714,60 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 5 end error: ", p), err) } +func (p *UpdateEvaluatorRequest) writeField11(oprot thrift.TProtocol) (err error) { + if p.IsSetBuiltin() { + if err = oprot.WriteFieldBegin("builtin", thrift.BOOL, 11); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteBool(*p.Builtin); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 11 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 11 end error: ", p), err) +} +func (p *UpdateEvaluatorRequest) writeField12(oprot thrift.TProtocol) (err error) { + if p.IsSetBenchmark() { + if err = oprot.WriteFieldBegin("benchmark", thrift.STRING, 12); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Benchmark); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 12 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 12 end error: ", p), err) +} +func (p *UpdateEvaluatorRequest) writeField13(oprot thrift.TProtocol) (err error) { + if p.IsSetVendor() { + if err = oprot.WriteFieldBegin("vendor", thrift.STRING, 13); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Vendor); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 13 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 13 end error: ", p), err) +} func (p *UpdateEvaluatorRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { @@ -4270,6 +4816,15 @@ func (p *UpdateEvaluatorRequest) DeepEqual(ano *UpdateEvaluatorRequest) bool { if !p.Field5DeepEqual(ano.Description) { return false } + if !p.Field11DeepEqual(ano.Builtin) { + return false + } + if !p.Field12DeepEqual(ano.Benchmark) { + return false + } + if !p.Field13DeepEqual(ano.Vendor) { + return false + } if !p.Field255DeepEqual(ano.Base) { return false } @@ -4321,6 +4876,42 @@ func (p *UpdateEvaluatorRequest) Field5DeepEqual(src *string) bool { } return true } +func (p *UpdateEvaluatorRequest) Field11DeepEqual(src *bool) bool { + + if p.Builtin == src { + return true + } else if p.Builtin == nil || src == nil { + return false + } + if *p.Builtin != *src { + return false + } + return true +} +func (p *UpdateEvaluatorRequest) Field12DeepEqual(src *string) bool { + + if p.Benchmark == src { + return true + } else if p.Benchmark == nil || src == nil { + return false + } + if strings.Compare(*p.Benchmark, *src) != 0 { + return false + } + return true +} +func (p *UpdateEvaluatorRequest) Field13DeepEqual(src *string) bool { + + if p.Vendor == src { + return true + } else if p.Vendor == nil || src == nil { + return false + } + if strings.Compare(*p.Vendor, *src) != 0 { + return false + } + return true +} func (p *UpdateEvaluatorRequest) Field255DeepEqual(src *base.Base) bool { if !p.Base.DeepEqual(src) { @@ -6077,8 +6668,10 @@ type GetEvaluatorVersionRequest struct { WorkspaceID int64 `thrift:"workspace_id,1,required" frugal:"1,required,i64" json:"workspace_id" query:"workspace_id,required" ` EvaluatorVersionID int64 `thrift:"evaluator_version_id,2,required" frugal:"2,required,i64" json:"evaluator_version_id" path:"evaluator_version_id,required" ` // 是否查询已删除的评估器，默认不查询 - IncludeDeleted *bool `thrift:"include_deleted,3,optional" frugal:"3,optional,bool" json:"include_deleted,omitempty" query:"include_deleted"` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + IncludeDeleted *bool `thrift:"include_deleted,3,optional" frugal:"3,optional,bool" json:"include_deleted,omitempty" query:"include_deleted"` + // 是否预置评估器 + Builtin *bool `thrift:"builtin,4,optional" frugal:"4,optional,bool" json:"builtin" form:"builtin" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewGetEvaluatorVersionRequest() *GetEvaluatorVersionRequest { @@ -6114,6 +6707,18 @@ func (p *GetEvaluatorVersionRequest) GetIncludeDeleted() (v bool) { return *p.IncludeDeleted } +var GetEvaluatorVersionRequest_Builtin_DEFAULT bool + +func (p *GetEvaluatorVersionRequest) GetBuiltin() (v bool) { + if p == nil { + return + } + if !p.IsSetBuiltin() { + return GetEvaluatorVersionRequest_Builtin_DEFAULT + } + return *p.Builtin +} + var GetEvaluatorVersionRequest_Base_DEFAULT *base.Base func (p *GetEvaluatorVersionRequest) GetBase() (v *base.Base) { @@ -6134,6 +6739,9 @@ func (p *GetEvaluatorVersionRequest) SetEvaluatorVersionID(val int64) { func (p *GetEvaluatorVersionRequest) SetIncludeDeleted(val *bool) { p.IncludeDeleted = val } +func (p *GetEvaluatorVersionRequest) SetBuiltin(val *bool) { + p.Builtin = val +} func (p *GetEvaluatorVersionRequest) SetBase(val *base.Base) { p.Base = val } @@ -6142,6 +6750,7 @@ var fieldIDToName_GetEvaluatorVersionRequest = map[int16]string{ 1: "workspace_id", 2: "evaluator_version_id", 3: "include_deleted", + 4: "builtin", 255: "Base", } @@ -6149,6 +6758,10 @@ func (p *GetEvaluatorVersionRequest) IsSetIncludeDeleted() bool { return p.IncludeDeleted != nil } +func (p *GetEvaluatorVersionRequest) IsSetBuiltin() bool { + return p.Builtin != nil +} + func (p *GetEvaluatorVersionRequest) IsSetBase() bool { return p.Base != nil } @@ -6199,6 +6812,14 @@ func (p *GetEvaluatorVersionRequest) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 4: + if fieldTypeId == thrift.BOOL { + if err = p.ReadField4(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } case 255: if fieldTypeId == thrift.STRUCT { if err = p.ReadField255(iprot); err != nil { @@ -6280,6 +6901,17 @@ func (p *GetEvaluatorVersionRequest) ReadField3(iprot thrift.TProtocol) error { p.IncludeDeleted = _field return nil } +func (p *GetEvaluatorVersionRequest) ReadField4(iprot thrift.TProtocol) error { + + var _field *bool + if v, err := iprot.ReadBool(); err != nil { + return err + } else { + _field = &v + } + p.Builtin = _field + return nil +} func (p *GetEvaluatorVersionRequest) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBase() if err := _field.Read(iprot); err != nil { @@ -6307,6 +6939,10 @@ func (p *GetEvaluatorVersionRequest) Write(oprot thrift.TProtocol) (err error) { fieldId = 3 goto WriteFieldError } + if err = p.writeField4(oprot); err != nil { + fieldId = 4 + goto WriteFieldError + } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -6379,6 +7015,24 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) } +func (p *GetEvaluatorVersionRequest) writeField4(oprot thrift.TProtocol) (err error) { + if p.IsSetBuiltin() { + if err = oprot.WriteFieldBegin("builtin", thrift.BOOL, 4); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteBool(*p.Builtin); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) +} func (p *GetEvaluatorVersionRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { @@ -6421,6 +7075,9 @@ func (p *GetEvaluatorVersionRequest) DeepEqual(ano *GetEvaluatorVersionRequest) if !p.Field3DeepEqual(ano.IncludeDeleted) { return false } + if !p.Field4DeepEqual(ano.Builtin) { + return false + } if !p.Field255DeepEqual(ano.Base) { return false } @@ -6453,6 +7110,18 @@ func (p *GetEvaluatorVersionRequest) Field3DeepEqual(src *bool) bool { } return true } +func (p *GetEvaluatorVersionRequest) Field4DeepEqual(src *bool) bool { + + if p.Builtin == src { + return true + } else if p.Builtin == nil || src == nil { + return false + } + if *p.Builtin != *src { + return false + } + return true +} func (p *GetEvaluatorVersionRequest) Field255DeepEqual(src *base.Base) bool { if !p.Base.DeepEqual(src) { @@ -17067,1431 +17736,8979 @@ func (p *ValidateEvaluatorResponse) Field255DeepEqual(src *base.BaseResp) bool { return true } -type EvaluatorService interface { - // 评估器 - ListEvaluators(ctx context.Context, request *ListEvaluatorsRequest) (r *ListEvaluatorsResponse, err error) - - BatchGetEvaluators(ctx context.Context, request *BatchGetEvaluatorsRequest) (r *BatchGetEvaluatorsResponse, err error) - - GetEvaluator(ctx context.Context, request *GetEvaluatorRequest) (r *GetEvaluatorResponse, err error) +type ListTemplatesV2Request struct { + // 筛选器选项 + FilterOption *evaluator.EvaluatorFilterOption `thrift:"filter_option,1,optional" frugal:"1,optional,evaluator.EvaluatorFilterOption" json:"filter_option" form:"filter_option" ` +} - CreateEvaluator(ctx context.Context, request *CreateEvaluatorRequest) (r *CreateEvaluatorResponse, err error) +func NewListTemplatesV2Request() *ListTemplatesV2Request { + return &ListTemplatesV2Request{} +} - UpdateEvaluator(ctx context.Context, request *UpdateEvaluatorRequest) (r *UpdateEvaluatorResponse, err error) +func (p *ListTemplatesV2Request) InitDefault() { +} - UpdateEvaluatorDraft(ctx context.Context, request *UpdateEvaluatorDraftRequest) (r *UpdateEvaluatorDraftResponse, err error) +var ListTemplatesV2Request_FilterOption_DEFAULT *evaluator.EvaluatorFilterOption - DeleteEvaluator(ctx context.Context, request *DeleteEvaluatorRequest) (r *DeleteEvaluatorResponse, err error) +func (p *ListTemplatesV2Request) GetFilterOption() (v *evaluator.EvaluatorFilterOption) { + if p == nil { + return + } + if !p.IsSetFilterOption() { + return ListTemplatesV2Request_FilterOption_DEFAULT + } + return p.FilterOption +} +func (p *ListTemplatesV2Request) SetFilterOption(val *evaluator.EvaluatorFilterOption) { + p.FilterOption = val +} - CheckEvaluatorName(ctx context.Context, request *CheckEvaluatorNameRequest) (r *CheckEvaluatorNameResponse, err error) - // 评估器版本 - ListEvaluatorVersions(ctx context.Context, request *ListEvaluatorVersionsRequest) (r *ListEvaluatorVersionsResponse, err error) +var fieldIDToName_ListTemplatesV2Request = map[int16]string{ + 1: "filter_option", +} - GetEvaluatorVersion(ctx context.Context, request *GetEvaluatorVersionRequest) (r *GetEvaluatorVersionResponse, err error) +func (p *ListTemplatesV2Request) IsSetFilterOption() bool { + return p.FilterOption != nil +} - BatchGetEvaluatorVersions(ctx context.Context, request *BatchGetEvaluatorVersionsRequest) (r *BatchGetEvaluatorVersionsResponse, err error) +func (p *ListTemplatesV2Request) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 - SubmitEvaluatorVersion(ctx context.Context, request *SubmitEvaluatorVersionRequest) (r *SubmitEvaluatorVersionResponse, err error) - // 评估器预置模版 - ListTemplates(ctx context.Context, request *ListTemplatesRequest) (r *ListTemplatesResponse, err error) + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } - GetTemplateInfo(ctx context.Context, request *GetTemplateInfoRequest) (r *GetTemplateInfoResponse, err error) + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } - GetDefaultPromptEvaluatorTools(ctx context.Context, req *GetDefaultPromptEvaluatorToolsRequest) (r *GetDefaultPromptEvaluatorToolsResponse, err error) - // 评估器执行 - RunEvaluator(ctx context.Context, req *RunEvaluatorRequest) (r *RunEvaluatorResponse, err error) - - DebugEvaluator(ctx context.Context, req *DebugEvaluatorRequest) (r *DebugEvaluatorResponse, err error) - - BatchDebugEvaluator(ctx context.Context, req *BatchDebugEvaluatorRequest) (r *BatchDebugEvaluatorResponse, err error) - // 评估器执行结果 - UpdateEvaluatorRecord(ctx context.Context, req *UpdateEvaluatorRecordRequest) (r *UpdateEvaluatorRecordResponse, err error) + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } - GetEvaluatorRecord(ctx context.Context, req *GetEvaluatorRecordRequest) (r *GetEvaluatorRecordResponse, err error) + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_ListTemplatesV2Request[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) - BatchGetEvaluatorRecords(ctx context.Context, req *BatchGetEvaluatorRecordsRequest) (r *BatchGetEvaluatorRecordsResponse, err error) - // 评估器验证 - ValidateEvaluator(ctx context.Context, request *ValidateEvaluatorRequest) (r *ValidateEvaluatorResponse, err error) +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -type EvaluatorServiceClient struct { - c thrift.TClient +func (p *ListTemplatesV2Request) ReadField1(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorFilterOption() + if err := _field.Read(iprot); err != nil { + return err + } + p.FilterOption = _field + return nil } -func NewEvaluatorServiceClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *EvaluatorServiceClient { - return &EvaluatorServiceClient{ - c: thrift.NewTStandardClient(f.GetProtocol(t), f.GetProtocol(t)), +func (p *ListTemplatesV2Request) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("ListTemplatesV2Request"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func NewEvaluatorServiceClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *EvaluatorServiceClient { - return &EvaluatorServiceClient{ - c: thrift.NewTStandardClient(iprot, oprot), +func (p *ListTemplatesV2Request) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetFilterOption() { + if err = oprot.WriteFieldBegin("filter_option", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.FilterOption.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func NewEvaluatorServiceClient(c thrift.TClient) *EvaluatorServiceClient { - return &EvaluatorServiceClient{ - c: c, +func (p *ListTemplatesV2Request) String() string { + if p == nil { + return "" } -} + return fmt.Sprintf("ListTemplatesV2Request(%+v)", *p) -func (p *EvaluatorServiceClient) Client_() thrift.TClient { - return p.c } -func (p *EvaluatorServiceClient) ListEvaluators(ctx context.Context, request *ListEvaluatorsRequest) (r *ListEvaluatorsResponse, err error) { - var _args EvaluatorServiceListEvaluatorsArgs - _args.Request = request - var _result EvaluatorServiceListEvaluatorsResult - if err = p.Client_().Call(ctx, "ListEvaluators", &_args, &_result); err != nil { - return +func (p *ListTemplatesV2Request) DeepEqual(ano *ListTemplatesV2Request) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - return _result.GetSuccess(), nil -} -func (p *EvaluatorServiceClient) BatchGetEvaluators(ctx context.Context, request *BatchGetEvaluatorsRequest) (r *BatchGetEvaluatorsResponse, err error) { - var _args EvaluatorServiceBatchGetEvaluatorsArgs - _args.Request = request - var _result EvaluatorServiceBatchGetEvaluatorsResult - if err = p.Client_().Call(ctx, "BatchGetEvaluators", &_args, &_result); err != nil { - return + if !p.Field1DeepEqual(ano.FilterOption) { + return false } - return _result.GetSuccess(), nil + return true } -func (p *EvaluatorServiceClient) GetEvaluator(ctx context.Context, request *GetEvaluatorRequest) (r *GetEvaluatorResponse, err error) { - var _args EvaluatorServiceGetEvaluatorArgs - _args.Request = request - var _result EvaluatorServiceGetEvaluatorResult - if err = p.Client_().Call(ctx, "GetEvaluator", &_args, &_result); err != nil { - return + +func (p *ListTemplatesV2Request) Field1DeepEqual(src *evaluator.EvaluatorFilterOption) bool { + + if !p.FilterOption.DeepEqual(src) { + return false } - return _result.GetSuccess(), nil + return true } -func (p *EvaluatorServiceClient) CreateEvaluator(ctx context.Context, request *CreateEvaluatorRequest) (r *CreateEvaluatorResponse, err error) { - var _args EvaluatorServiceCreateEvaluatorArgs - _args.Request = request - var _result EvaluatorServiceCreateEvaluatorResult - if err = p.Client_().Call(ctx, "CreateEvaluator", &_args, &_result); err != nil { - return - } - return _result.GetSuccess(), nil + +type ListTemplatesV2Response struct { + EvaluatorTemplates []*evaluator.EvaluatorTemplate `thrift:"evaluator_templates,1,optional" frugal:"1,optional,list" form:"evaluator_templates" json:"evaluator_templates,omitempty"` + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` } -func (p *EvaluatorServiceClient) UpdateEvaluator(ctx context.Context, request *UpdateEvaluatorRequest) (r *UpdateEvaluatorResponse, err error) { - var _args EvaluatorServiceUpdateEvaluatorArgs - _args.Request = request - var _result EvaluatorServiceUpdateEvaluatorResult - if err = p.Client_().Call(ctx, "UpdateEvaluator", &_args, &_result); err != nil { - return - } - return _result.GetSuccess(), nil + +func NewListTemplatesV2Response() *ListTemplatesV2Response { + return &ListTemplatesV2Response{} } -func (p *EvaluatorServiceClient) UpdateEvaluatorDraft(ctx context.Context, request *UpdateEvaluatorDraftRequest) (r *UpdateEvaluatorDraftResponse, err error) { - var _args EvaluatorServiceUpdateEvaluatorDraftArgs - _args.Request = request - var _result EvaluatorServiceUpdateEvaluatorDraftResult - if err = p.Client_().Call(ctx, "UpdateEvaluatorDraft", &_args, &_result); err != nil { - return - } - return _result.GetSuccess(), nil + +func (p *ListTemplatesV2Response) InitDefault() { } -func (p *EvaluatorServiceClient) DeleteEvaluator(ctx context.Context, request *DeleteEvaluatorRequest) (r *DeleteEvaluatorResponse, err error) { - var _args EvaluatorServiceDeleteEvaluatorArgs - _args.Request = request - var _result EvaluatorServiceDeleteEvaluatorResult - if err = p.Client_().Call(ctx, "DeleteEvaluator", &_args, &_result); err != nil { + +var ListTemplatesV2Response_EvaluatorTemplates_DEFAULT []*evaluator.EvaluatorTemplate + +func (p *ListTemplatesV2Response) GetEvaluatorTemplates() (v []*evaluator.EvaluatorTemplate) { + if p == nil { return } - return _result.GetSuccess(), nil -} -func (p *EvaluatorServiceClient) CheckEvaluatorName(ctx context.Context, request *CheckEvaluatorNameRequest) (r *CheckEvaluatorNameResponse, err error) { - var _args EvaluatorServiceCheckEvaluatorNameArgs - _args.Request = request - var _result EvaluatorServiceCheckEvaluatorNameResult - if err = p.Client_().Call(ctx, "CheckEvaluatorName", &_args, &_result); err != nil { - return + if !p.IsSetEvaluatorTemplates() { + return ListTemplatesV2Response_EvaluatorTemplates_DEFAULT } - return _result.GetSuccess(), nil + return p.EvaluatorTemplates } -func (p *EvaluatorServiceClient) ListEvaluatorVersions(ctx context.Context, request *ListEvaluatorVersionsRequest) (r *ListEvaluatorVersionsResponse, err error) { - var _args EvaluatorServiceListEvaluatorVersionsArgs - _args.Request = request - var _result EvaluatorServiceListEvaluatorVersionsResult - if err = p.Client_().Call(ctx, "ListEvaluatorVersions", &_args, &_result); err != nil { + +var ListTemplatesV2Response_BaseResp_DEFAULT *base.BaseResp + +func (p *ListTemplatesV2Response) GetBaseResp() (v *base.BaseResp) { + if p == nil { return } - return _result.GetSuccess(), nil -} -func (p *EvaluatorServiceClient) GetEvaluatorVersion(ctx context.Context, request *GetEvaluatorVersionRequest) (r *GetEvaluatorVersionResponse, err error) { - var _args EvaluatorServiceGetEvaluatorVersionArgs - _args.Request = request - var _result EvaluatorServiceGetEvaluatorVersionResult - if err = p.Client_().Call(ctx, "GetEvaluatorVersion", &_args, &_result); err != nil { - return + if !p.IsSetBaseResp() { + return ListTemplatesV2Response_BaseResp_DEFAULT } - return _result.GetSuccess(), nil + return p.BaseResp } -func (p *EvaluatorServiceClient) BatchGetEvaluatorVersions(ctx context.Context, request *BatchGetEvaluatorVersionsRequest) (r *BatchGetEvaluatorVersionsResponse, err error) { - var _args EvaluatorServiceBatchGetEvaluatorVersionsArgs - _args.Request = request - var _result EvaluatorServiceBatchGetEvaluatorVersionsResult - if err = p.Client_().Call(ctx, "BatchGetEvaluatorVersions", &_args, &_result); err != nil { - return - } - return _result.GetSuccess(), nil +func (p *ListTemplatesV2Response) SetEvaluatorTemplates(val []*evaluator.EvaluatorTemplate) { + p.EvaluatorTemplates = val } -func (p *EvaluatorServiceClient) SubmitEvaluatorVersion(ctx context.Context, request *SubmitEvaluatorVersionRequest) (r *SubmitEvaluatorVersionResponse, err error) { - var _args EvaluatorServiceSubmitEvaluatorVersionArgs - _args.Request = request - var _result EvaluatorServiceSubmitEvaluatorVersionResult - if err = p.Client_().Call(ctx, "SubmitEvaluatorVersion", &_args, &_result); err != nil { - return - } - return _result.GetSuccess(), nil +func (p *ListTemplatesV2Response) SetBaseResp(val *base.BaseResp) { + p.BaseResp = val } -func (p *EvaluatorServiceClient) ListTemplates(ctx context.Context, request *ListTemplatesRequest) (r *ListTemplatesResponse, err error) { - var _args EvaluatorServiceListTemplatesArgs - _args.Request = request - var _result EvaluatorServiceListTemplatesResult - if err = p.Client_().Call(ctx, "ListTemplates", &_args, &_result); err != nil { - return - } - return _result.GetSuccess(), nil + +var fieldIDToName_ListTemplatesV2Response = map[int16]string{ + 1: "evaluator_templates", + 255: "BaseResp", } -func (p *EvaluatorServiceClient) GetTemplateInfo(ctx context.Context, request *GetTemplateInfoRequest) (r *GetTemplateInfoResponse, err error) { - var _args EvaluatorServiceGetTemplateInfoArgs - _args.Request = request - var _result EvaluatorServiceGetTemplateInfoResult - if err = p.Client_().Call(ctx, "GetTemplateInfo", &_args, &_result); err != nil { - return - } - return _result.GetSuccess(), nil + +func (p *ListTemplatesV2Response) IsSetEvaluatorTemplates() bool { + return p.EvaluatorTemplates != nil } -func (p *EvaluatorServiceClient) GetDefaultPromptEvaluatorTools(ctx context.Context, req *GetDefaultPromptEvaluatorToolsRequest) (r *GetDefaultPromptEvaluatorToolsResponse, err error) { - var _args EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs - _args.Req = req - var _result EvaluatorServiceGetDefaultPromptEvaluatorToolsResult - if err = p.Client_().Call(ctx, "GetDefaultPromptEvaluatorTools", &_args, &_result); err != nil { - return - } - return _result.GetSuccess(), nil + +func (p *ListTemplatesV2Response) IsSetBaseResp() bool { + return p.BaseResp != nil } -func (p *EvaluatorServiceClient) RunEvaluator(ctx context.Context, req *RunEvaluatorRequest) (r *RunEvaluatorResponse, err error) { - var _args EvaluatorServiceRunEvaluatorArgs - _args.Req = req - var _result EvaluatorServiceRunEvaluatorResult - if err = p.Client_().Call(ctx, "RunEvaluator", &_args, &_result); err != nil { - return + +func (p *ListTemplatesV2Response) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError } - return _result.GetSuccess(), nil -} -func (p *EvaluatorServiceClient) DebugEvaluator(ctx context.Context, req *DebugEvaluatorRequest) (r *DebugEvaluatorResponse, err error) { - var _args EvaluatorServiceDebugEvaluatorArgs + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.LIST { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_ListTemplatesV2Response[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *ListTemplatesV2Response) ReadField1(iprot thrift.TProtocol) error { + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _field := make([]*evaluator.EvaluatorTemplate, 0, size) + values := make([]evaluator.EvaluatorTemplate, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + + if err := _elem.Read(iprot); err != nil { + return err + } + + _field = append(_field, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + p.EvaluatorTemplates = _field + return nil +} +func (p *ListTemplatesV2Response) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBaseResp() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseResp = _field + return nil +} + +func (p *ListTemplatesV2Response) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("ListTemplatesV2Response"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *ListTemplatesV2Response) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluatorTemplates() { + if err = oprot.WriteFieldBegin("evaluator_templates", thrift.LIST, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteListBegin(thrift.STRUCT, len(p.EvaluatorTemplates)); err != nil { + return err + } + for _, v := range p.EvaluatorTemplates { + if err := v.Write(oprot); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *ListTemplatesV2Response) writeField255(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseResp.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *ListTemplatesV2Response) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("ListTemplatesV2Response(%+v)", *p) + +} + +func (p *ListTemplatesV2Response) DeepEqual(ano *ListTemplatesV2Response) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorTemplates) { + return false + } + if !p.Field255DeepEqual(ano.BaseResp) { + return false + } + return true +} + +func (p *ListTemplatesV2Response) Field1DeepEqual(src []*evaluator.EvaluatorTemplate) bool { + + if len(p.EvaluatorTemplates) != len(src) { + return false + } + for i, v := range p.EvaluatorTemplates { + _src := src[i] + if !v.DeepEqual(_src) { + return false + } + } + return true +} +func (p *ListTemplatesV2Response) Field255DeepEqual(src *base.BaseResp) bool { + + if !p.BaseResp.DeepEqual(src) { + return false + } + return true +} + +type GetTemplateInfoV2Request struct { + EvaluatorTemplateID int64 `thrift:"evaluator_template_id,1,required" frugal:"1,required,i64" json:"evaluator_template_id" form:"evaluator_template_id,required" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` +} + +func NewGetTemplateInfoV2Request() *GetTemplateInfoV2Request { + return &GetTemplateInfoV2Request{} +} + +func (p *GetTemplateInfoV2Request) InitDefault() { +} + +func (p *GetTemplateInfoV2Request) GetEvaluatorTemplateID() (v int64) { + if p != nil { + return p.EvaluatorTemplateID + } + return +} + +var GetTemplateInfoV2Request_Base_DEFAULT *base.Base + +func (p *GetTemplateInfoV2Request) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return GetTemplateInfoV2Request_Base_DEFAULT + } + return p.Base +} +func (p *GetTemplateInfoV2Request) SetEvaluatorTemplateID(val int64) { + p.EvaluatorTemplateID = val +} +func (p *GetTemplateInfoV2Request) SetBase(val *base.Base) { + p.Base = val +} + +var fieldIDToName_GetTemplateInfoV2Request = map[int16]string{ + 1: "evaluator_template_id", + 255: "Base", +} + +func (p *GetTemplateInfoV2Request) IsSetBase() bool { + return p.Base != nil +} + +func (p *GetTemplateInfoV2Request) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplateID bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetEvaluatorTemplateID = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetEvaluatorTemplateID { + fieldId = 1 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateInfoV2Request[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_GetTemplateInfoV2Request[fieldId])) +} + +func (p *GetTemplateInfoV2Request) ReadField1(iprot thrift.TProtocol) error { + + var _field int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = v + } + p.EvaluatorTemplateID = _field + return nil +} +func (p *GetTemplateInfoV2Request) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBase() + if err := _field.Read(iprot); err != nil { + return err + } + p.Base = _field + return nil +} + +func (p *GetTemplateInfoV2Request) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("GetTemplateInfoV2Request"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *GetTemplateInfoV2Request) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("evaluator_template_id", thrift.I64, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(p.EvaluatorTemplateID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *GetTemplateInfoV2Request) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBase() { + if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.Base.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *GetTemplateInfoV2Request) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("GetTemplateInfoV2Request(%+v)", *p) + +} + +func (p *GetTemplateInfoV2Request) DeepEqual(ano *GetTemplateInfoV2Request) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorTemplateID) { + return false + } + if !p.Field255DeepEqual(ano.Base) { + return false + } + return true +} + +func (p *GetTemplateInfoV2Request) Field1DeepEqual(src int64) bool { + + if p.EvaluatorTemplateID != src { + return false + } + return true +} +func (p *GetTemplateInfoV2Request) Field255DeepEqual(src *base.Base) bool { + + if !p.Base.DeepEqual(src) { + return false + } + return true +} + +type GetTemplateInfoV2Response struct { + EvaluatorTemplate *evaluator.EvaluatorTemplate `thrift:"evaluator_template,1,optional" frugal:"1,optional,evaluator.EvaluatorTemplate" form:"evaluator_template" json:"evaluator_template,omitempty"` + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` +} + +func NewGetTemplateInfoV2Response() *GetTemplateInfoV2Response { + return &GetTemplateInfoV2Response{} +} + +func (p *GetTemplateInfoV2Response) InitDefault() { +} + +var GetTemplateInfoV2Response_EvaluatorTemplate_DEFAULT *evaluator.EvaluatorTemplate + +func (p *GetTemplateInfoV2Response) GetEvaluatorTemplate() (v *evaluator.EvaluatorTemplate) { + if p == nil { + return + } + if !p.IsSetEvaluatorTemplate() { + return GetTemplateInfoV2Response_EvaluatorTemplate_DEFAULT + } + return p.EvaluatorTemplate +} + +var GetTemplateInfoV2Response_BaseResp_DEFAULT *base.BaseResp + +func (p *GetTemplateInfoV2Response) GetBaseResp() (v *base.BaseResp) { + if p == nil { + return + } + if !p.IsSetBaseResp() { + return GetTemplateInfoV2Response_BaseResp_DEFAULT + } + return p.BaseResp +} +func (p *GetTemplateInfoV2Response) SetEvaluatorTemplate(val *evaluator.EvaluatorTemplate) { + p.EvaluatorTemplate = val +} +func (p *GetTemplateInfoV2Response) SetBaseResp(val *base.BaseResp) { + p.BaseResp = val +} + +var fieldIDToName_GetTemplateInfoV2Response = map[int16]string{ + 1: "evaluator_template", + 255: "BaseResp", +} + +func (p *GetTemplateInfoV2Response) IsSetEvaluatorTemplate() bool { + return p.EvaluatorTemplate != nil +} + +func (p *GetTemplateInfoV2Response) IsSetBaseResp() bool { + return p.BaseResp != nil +} + +func (p *GetTemplateInfoV2Response) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateInfoV2Response[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *GetTemplateInfoV2Response) ReadField1(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorTemplate() + if err := _field.Read(iprot); err != nil { + return err + } + p.EvaluatorTemplate = _field + return nil +} +func (p *GetTemplateInfoV2Response) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBaseResp() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseResp = _field + return nil +} + +func (p *GetTemplateInfoV2Response) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("GetTemplateInfoV2Response"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *GetTemplateInfoV2Response) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluatorTemplate() { + if err = oprot.WriteFieldBegin("evaluator_template", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorTemplate.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *GetTemplateInfoV2Response) writeField255(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseResp.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *GetTemplateInfoV2Response) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("GetTemplateInfoV2Response(%+v)", *p) + +} + +func (p *GetTemplateInfoV2Response) DeepEqual(ano *GetTemplateInfoV2Response) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorTemplate) { + return false + } + if !p.Field255DeepEqual(ano.BaseResp) { + return false + } + return true +} + +func (p *GetTemplateInfoV2Response) Field1DeepEqual(src *evaluator.EvaluatorTemplate) bool { + + if !p.EvaluatorTemplate.DeepEqual(src) { + return false + } + return true +} +func (p *GetTemplateInfoV2Response) Field255DeepEqual(src *base.BaseResp) bool { + + if !p.BaseResp.DeepEqual(src) { + return false + } + return true +} + +type GetLatestEvaluatorVersionRequest struct { + EvaluatorID int64 `thrift:"evaluator_id,1,required" frugal:"1,required,i64" json:"evaluator_id" path:"evaluator_id,required" ` + WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" query:"workspace_id" ` + // 是否预置评估器 + Builtin *bool `thrift:"builtin,3,optional" frugal:"3,optional,bool" json:"builtin,omitempty" query:"builtin"` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` +} + +func NewGetLatestEvaluatorVersionRequest() *GetLatestEvaluatorVersionRequest { + return &GetLatestEvaluatorVersionRequest{} +} + +func (p *GetLatestEvaluatorVersionRequest) InitDefault() { +} + +func (p *GetLatestEvaluatorVersionRequest) GetEvaluatorID() (v int64) { + if p != nil { + return p.EvaluatorID + } + return +} + +var GetLatestEvaluatorVersionRequest_WorkspaceID_DEFAULT int64 + +func (p *GetLatestEvaluatorVersionRequest) GetWorkspaceID() (v int64) { + if p == nil { + return + } + if !p.IsSetWorkspaceID() { + return GetLatestEvaluatorVersionRequest_WorkspaceID_DEFAULT + } + return *p.WorkspaceID +} + +var GetLatestEvaluatorVersionRequest_Builtin_DEFAULT bool + +func (p *GetLatestEvaluatorVersionRequest) GetBuiltin() (v bool) { + if p == nil { + return + } + if !p.IsSetBuiltin() { + return GetLatestEvaluatorVersionRequest_Builtin_DEFAULT + } + return *p.Builtin +} + +var GetLatestEvaluatorVersionRequest_Base_DEFAULT *base.Base + +func (p *GetLatestEvaluatorVersionRequest) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return GetLatestEvaluatorVersionRequest_Base_DEFAULT + } + return p.Base +} +func (p *GetLatestEvaluatorVersionRequest) SetEvaluatorID(val int64) { + p.EvaluatorID = val +} +func (p *GetLatestEvaluatorVersionRequest) SetWorkspaceID(val *int64) { + p.WorkspaceID = val +} +func (p *GetLatestEvaluatorVersionRequest) SetBuiltin(val *bool) { + p.Builtin = val +} +func (p *GetLatestEvaluatorVersionRequest) SetBase(val *base.Base) { + p.Base = val +} + +var fieldIDToName_GetLatestEvaluatorVersionRequest = map[int16]string{ + 1: "evaluator_id", + 2: "workspace_id", + 3: "builtin", + 255: "Base", +} + +func (p *GetLatestEvaluatorVersionRequest) IsSetWorkspaceID() bool { + return p.WorkspaceID != nil +} + +func (p *GetLatestEvaluatorVersionRequest) IsSetBuiltin() bool { + return p.Builtin != nil +} + +func (p *GetLatestEvaluatorVersionRequest) IsSetBase() bool { + return p.Base != nil +} + +func (p *GetLatestEvaluatorVersionRequest) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorID bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetEvaluatorID = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.I64 { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 3: + if fieldTypeId == thrift.BOOL { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetEvaluatorID { + fieldId = 1 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetLatestEvaluatorVersionRequest[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_GetLatestEvaluatorVersionRequest[fieldId])) +} + +func (p *GetLatestEvaluatorVersionRequest) ReadField1(iprot thrift.TProtocol) error { + + var _field int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = v + } + p.EvaluatorID = _field + return nil +} +func (p *GetLatestEvaluatorVersionRequest) ReadField2(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.WorkspaceID = _field + return nil +} +func (p *GetLatestEvaluatorVersionRequest) ReadField3(iprot thrift.TProtocol) error { + + var _field *bool + if v, err := iprot.ReadBool(); err != nil { + return err + } else { + _field = &v + } + p.Builtin = _field + return nil +} +func (p *GetLatestEvaluatorVersionRequest) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBase() + if err := _field.Read(iprot); err != nil { + return err + } + p.Base = _field + return nil +} + +func (p *GetLatestEvaluatorVersionRequest) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("GetLatestEvaluatorVersionRequest"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *GetLatestEvaluatorVersionRequest) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("evaluator_id", thrift.I64, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(p.EvaluatorID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *GetLatestEvaluatorVersionRequest) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetWorkspaceID() { + if err = oprot.WriteFieldBegin("workspace_id", thrift.I64, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.WorkspaceID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *GetLatestEvaluatorVersionRequest) writeField3(oprot thrift.TProtocol) (err error) { + if p.IsSetBuiltin() { + if err = oprot.WriteFieldBegin("builtin", thrift.BOOL, 3); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteBool(*p.Builtin); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} +func (p *GetLatestEvaluatorVersionRequest) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBase() { + if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.Base.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *GetLatestEvaluatorVersionRequest) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("GetLatestEvaluatorVersionRequest(%+v)", *p) + +} + +func (p *GetLatestEvaluatorVersionRequest) DeepEqual(ano *GetLatestEvaluatorVersionRequest) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorID) { + return false + } + if !p.Field2DeepEqual(ano.WorkspaceID) { + return false + } + if !p.Field3DeepEqual(ano.Builtin) { + return false + } + if !p.Field255DeepEqual(ano.Base) { + return false + } + return true +} + +func (p *GetLatestEvaluatorVersionRequest) Field1DeepEqual(src int64) bool { + + if p.EvaluatorID != src { + return false + } + return true +} +func (p *GetLatestEvaluatorVersionRequest) Field2DeepEqual(src *int64) bool { + + if p.WorkspaceID == src { + return true + } else if p.WorkspaceID == nil || src == nil { + return false + } + if *p.WorkspaceID != *src { + return false + } + return true +} +func (p *GetLatestEvaluatorVersionRequest) Field3DeepEqual(src *bool) bool { + + if p.Builtin == src { + return true + } else if p.Builtin == nil || src == nil { + return false + } + if *p.Builtin != *src { + return false + } + return true +} +func (p *GetLatestEvaluatorVersionRequest) Field255DeepEqual(src *base.Base) bool { + + if !p.Base.DeepEqual(src) { + return false + } + return true +} + +type GetLatestEvaluatorVersionResponse struct { + Version *evaluator.EvaluatorVersion `thrift:"version,1,required" frugal:"1,required,evaluator.EvaluatorVersion" form:"version,required" json:"version,required"` + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` +} + +func NewGetLatestEvaluatorVersionResponse() *GetLatestEvaluatorVersionResponse { + return &GetLatestEvaluatorVersionResponse{} +} + +func (p *GetLatestEvaluatorVersionResponse) InitDefault() { +} + +var GetLatestEvaluatorVersionResponse_Version_DEFAULT *evaluator.EvaluatorVersion + +func (p *GetLatestEvaluatorVersionResponse) GetVersion() (v *evaluator.EvaluatorVersion) { + if p == nil { + return + } + if !p.IsSetVersion() { + return GetLatestEvaluatorVersionResponse_Version_DEFAULT + } + return p.Version +} + +var GetLatestEvaluatorVersionResponse_BaseResp_DEFAULT *base.BaseResp + +func (p *GetLatestEvaluatorVersionResponse) GetBaseResp() (v *base.BaseResp) { + if p == nil { + return + } + if !p.IsSetBaseResp() { + return GetLatestEvaluatorVersionResponse_BaseResp_DEFAULT + } + return p.BaseResp +} +func (p *GetLatestEvaluatorVersionResponse) SetVersion(val *evaluator.EvaluatorVersion) { + p.Version = val +} +func (p *GetLatestEvaluatorVersionResponse) SetBaseResp(val *base.BaseResp) { + p.BaseResp = val +} + +var fieldIDToName_GetLatestEvaluatorVersionResponse = map[int16]string{ + 1: "version", + 255: "BaseResp", +} + +func (p *GetLatestEvaluatorVersionResponse) IsSetVersion() bool { + return p.Version != nil +} + +func (p *GetLatestEvaluatorVersionResponse) IsSetBaseResp() bool { + return p.BaseResp != nil +} + +func (p *GetLatestEvaluatorVersionResponse) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetVersion bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetVersion = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetVersion { + fieldId = 1 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetLatestEvaluatorVersionResponse[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_GetLatestEvaluatorVersionResponse[fieldId])) +} + +func (p *GetLatestEvaluatorVersionResponse) ReadField1(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorVersion() + if err := _field.Read(iprot); err != nil { + return err + } + p.Version = _field + return nil +} +func (p *GetLatestEvaluatorVersionResponse) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBaseResp() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseResp = _field + return nil +} + +func (p *GetLatestEvaluatorVersionResponse) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("GetLatestEvaluatorVersionResponse"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *GetLatestEvaluatorVersionResponse) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("version", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.Version.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *GetLatestEvaluatorVersionResponse) writeField255(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseResp.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *GetLatestEvaluatorVersionResponse) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("GetLatestEvaluatorVersionResponse(%+v)", *p) + +} + +func (p *GetLatestEvaluatorVersionResponse) DeepEqual(ano *GetLatestEvaluatorVersionResponse) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Version) { + return false + } + if !p.Field255DeepEqual(ano.BaseResp) { + return false + } + return true +} + +func (p *GetLatestEvaluatorVersionResponse) Field1DeepEqual(src *evaluator.EvaluatorVersion) bool { + + if !p.Version.DeepEqual(src) { + return false + } + return true +} +func (p *GetLatestEvaluatorVersionResponse) Field255DeepEqual(src *base.BaseResp) bool { + + if !p.BaseResp.DeepEqual(src) { + return false + } + return true +} + +type DebugBuiltinEvaluatorRequest struct { + EvaluatorID int64 `thrift:"evaluator_id,1,required" frugal:"1,required,i64" json:"evaluator_id" form:"evaluator_id,required" ` + InputData *evaluator.EvaluatorInputData `thrift:"input_data,2,required" frugal:"2,required,evaluator.EvaluatorInputData" form:"input_data,required" json:"input_data,required"` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` +} + +func NewDebugBuiltinEvaluatorRequest() *DebugBuiltinEvaluatorRequest { + return &DebugBuiltinEvaluatorRequest{} +} + +func (p *DebugBuiltinEvaluatorRequest) InitDefault() { +} + +func (p *DebugBuiltinEvaluatorRequest) GetEvaluatorID() (v int64) { + if p != nil { + return p.EvaluatorID + } + return +} + +var DebugBuiltinEvaluatorRequest_InputData_DEFAULT *evaluator.EvaluatorInputData + +func (p *DebugBuiltinEvaluatorRequest) GetInputData() (v *evaluator.EvaluatorInputData) { + if p == nil { + return + } + if !p.IsSetInputData() { + return DebugBuiltinEvaluatorRequest_InputData_DEFAULT + } + return p.InputData +} + +var DebugBuiltinEvaluatorRequest_Base_DEFAULT *base.Base + +func (p *DebugBuiltinEvaluatorRequest) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return DebugBuiltinEvaluatorRequest_Base_DEFAULT + } + return p.Base +} +func (p *DebugBuiltinEvaluatorRequest) SetEvaluatorID(val int64) { + p.EvaluatorID = val +} +func (p *DebugBuiltinEvaluatorRequest) SetInputData(val *evaluator.EvaluatorInputData) { + p.InputData = val +} +func (p *DebugBuiltinEvaluatorRequest) SetBase(val *base.Base) { + p.Base = val +} + +var fieldIDToName_DebugBuiltinEvaluatorRequest = map[int16]string{ + 1: "evaluator_id", + 2: "input_data", + 255: "Base", +} + +func (p *DebugBuiltinEvaluatorRequest) IsSetInputData() bool { + return p.InputData != nil +} + +func (p *DebugBuiltinEvaluatorRequest) IsSetBase() bool { + return p.Base != nil +} + +func (p *DebugBuiltinEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorID bool = false + var issetInputData bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetEvaluatorID = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + issetInputData = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetEvaluatorID { + fieldId = 1 + goto RequiredFieldNotSetError + } + + if !issetInputData { + fieldId = 2 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_DebugBuiltinEvaluatorRequest[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_DebugBuiltinEvaluatorRequest[fieldId])) +} + +func (p *DebugBuiltinEvaluatorRequest) ReadField1(iprot thrift.TProtocol) error { + + var _field int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = v + } + p.EvaluatorID = _field + return nil +} +func (p *DebugBuiltinEvaluatorRequest) ReadField2(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorInputData() + if err := _field.Read(iprot); err != nil { + return err + } + p.InputData = _field + return nil +} +func (p *DebugBuiltinEvaluatorRequest) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBase() + if err := _field.Read(iprot); err != nil { + return err + } + p.Base = _field + return nil +} + +func (p *DebugBuiltinEvaluatorRequest) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("DebugBuiltinEvaluatorRequest"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *DebugBuiltinEvaluatorRequest) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("evaluator_id", thrift.I64, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(p.EvaluatorID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *DebugBuiltinEvaluatorRequest) writeField2(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("input_data", thrift.STRUCT, 2); err != nil { + goto WriteFieldBeginError + } + if err := p.InputData.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *DebugBuiltinEvaluatorRequest) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBase() { + if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.Base.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *DebugBuiltinEvaluatorRequest) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("DebugBuiltinEvaluatorRequest(%+v)", *p) + +} + +func (p *DebugBuiltinEvaluatorRequest) DeepEqual(ano *DebugBuiltinEvaluatorRequest) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorID) { + return false + } + if !p.Field2DeepEqual(ano.InputData) { + return false + } + if !p.Field255DeepEqual(ano.Base) { + return false + } + return true +} + +func (p *DebugBuiltinEvaluatorRequest) Field1DeepEqual(src int64) bool { + + if p.EvaluatorID != src { + return false + } + return true +} +func (p *DebugBuiltinEvaluatorRequest) Field2DeepEqual(src *evaluator.EvaluatorInputData) bool { + + if !p.InputData.DeepEqual(src) { + return false + } + return true +} +func (p *DebugBuiltinEvaluatorRequest) Field255DeepEqual(src *base.Base) bool { + + if !p.Base.DeepEqual(src) { + return false + } + return true +} + +type DebugBuiltinEvaluatorResponse struct { + OutputData *evaluator.EvaluatorOutputData `thrift:"output_data,1,required" frugal:"1,required,evaluator.EvaluatorOutputData" form:"output_data,required" json:"output_data,required"` + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` +} + +func NewDebugBuiltinEvaluatorResponse() *DebugBuiltinEvaluatorResponse { + return &DebugBuiltinEvaluatorResponse{} +} + +func (p *DebugBuiltinEvaluatorResponse) InitDefault() { +} + +var DebugBuiltinEvaluatorResponse_OutputData_DEFAULT *evaluator.EvaluatorOutputData + +func (p *DebugBuiltinEvaluatorResponse) GetOutputData() (v *evaluator.EvaluatorOutputData) { + if p == nil { + return + } + if !p.IsSetOutputData() { + return DebugBuiltinEvaluatorResponse_OutputData_DEFAULT + } + return p.OutputData +} + +var DebugBuiltinEvaluatorResponse_BaseResp_DEFAULT *base.BaseResp + +func (p *DebugBuiltinEvaluatorResponse) GetBaseResp() (v *base.BaseResp) { + if p == nil { + return + } + if !p.IsSetBaseResp() { + return DebugBuiltinEvaluatorResponse_BaseResp_DEFAULT + } + return p.BaseResp +} +func (p *DebugBuiltinEvaluatorResponse) SetOutputData(val *evaluator.EvaluatorOutputData) { + p.OutputData = val +} +func (p *DebugBuiltinEvaluatorResponse) SetBaseResp(val *base.BaseResp) { + p.BaseResp = val +} + +var fieldIDToName_DebugBuiltinEvaluatorResponse = map[int16]string{ + 1: "output_data", + 255: "BaseResp", +} + +func (p *DebugBuiltinEvaluatorResponse) IsSetOutputData() bool { + return p.OutputData != nil +} + +func (p *DebugBuiltinEvaluatorResponse) IsSetBaseResp() bool { + return p.BaseResp != nil +} + +func (p *DebugBuiltinEvaluatorResponse) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetOutputData bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetOutputData = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetOutputData { + fieldId = 1 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_DebugBuiltinEvaluatorResponse[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_DebugBuiltinEvaluatorResponse[fieldId])) +} + +func (p *DebugBuiltinEvaluatorResponse) ReadField1(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorOutputData() + if err := _field.Read(iprot); err != nil { + return err + } + p.OutputData = _field + return nil +} +func (p *DebugBuiltinEvaluatorResponse) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBaseResp() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseResp = _field + return nil +} + +func (p *DebugBuiltinEvaluatorResponse) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("DebugBuiltinEvaluatorResponse"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *DebugBuiltinEvaluatorResponse) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("output_data", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.OutputData.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *DebugBuiltinEvaluatorResponse) writeField255(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseResp.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *DebugBuiltinEvaluatorResponse) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("DebugBuiltinEvaluatorResponse(%+v)", *p) + +} + +func (p *DebugBuiltinEvaluatorResponse) DeepEqual(ano *DebugBuiltinEvaluatorResponse) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.OutputData) { + return false + } + if !p.Field255DeepEqual(ano.BaseResp) { + return false + } + return true +} + +func (p *DebugBuiltinEvaluatorResponse) Field1DeepEqual(src *evaluator.EvaluatorOutputData) bool { + + if !p.OutputData.DeepEqual(src) { + return false + } + return true +} +func (p *DebugBuiltinEvaluatorResponse) Field255DeepEqual(src *base.BaseResp) bool { + + if !p.BaseResp.DeepEqual(src) { + return false + } + return true +} + +type PublishBuiltinEvaluatorRequest struct { + EvaluatorID int64 `thrift:"evaluator_id,1,required" frugal:"1,required,i64" json:"evaluator_id" path:"evaluator_id,required" ` + Version string `thrift:"version,2,required" frugal:"2,required,string" form:"version,required" json:"version,required"` + WorkspaceID *int64 `thrift:"workspace_id,3,optional" frugal:"3,optional,i64" json:"workspace_id" form:"workspace_id" ` + // 上下架操作类型 + OperationType *evaluator.OperationType `thrift:"operation_type,4,optional" frugal:"4,optional,string" json:"operation_type" form:"operation_type" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` +} + +func NewPublishBuiltinEvaluatorRequest() *PublishBuiltinEvaluatorRequest { + return &PublishBuiltinEvaluatorRequest{} +} + +func (p *PublishBuiltinEvaluatorRequest) InitDefault() { +} + +func (p *PublishBuiltinEvaluatorRequest) GetEvaluatorID() (v int64) { + if p != nil { + return p.EvaluatorID + } + return +} + +func (p *PublishBuiltinEvaluatorRequest) GetVersion() (v string) { + if p != nil { + return p.Version + } + return +} + +var PublishBuiltinEvaluatorRequest_WorkspaceID_DEFAULT int64 + +func (p *PublishBuiltinEvaluatorRequest) GetWorkspaceID() (v int64) { + if p == nil { + return + } + if !p.IsSetWorkspaceID() { + return PublishBuiltinEvaluatorRequest_WorkspaceID_DEFAULT + } + return *p.WorkspaceID +} + +var PublishBuiltinEvaluatorRequest_OperationType_DEFAULT evaluator.OperationType + +func (p *PublishBuiltinEvaluatorRequest) GetOperationType() (v evaluator.OperationType) { + if p == nil { + return + } + if !p.IsSetOperationType() { + return PublishBuiltinEvaluatorRequest_OperationType_DEFAULT + } + return *p.OperationType +} + +var PublishBuiltinEvaluatorRequest_Base_DEFAULT *base.Base + +func (p *PublishBuiltinEvaluatorRequest) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return PublishBuiltinEvaluatorRequest_Base_DEFAULT + } + return p.Base +} +func (p *PublishBuiltinEvaluatorRequest) SetEvaluatorID(val int64) { + p.EvaluatorID = val +} +func (p *PublishBuiltinEvaluatorRequest) SetVersion(val string) { + p.Version = val +} +func (p *PublishBuiltinEvaluatorRequest) SetWorkspaceID(val *int64) { + p.WorkspaceID = val +} +func (p *PublishBuiltinEvaluatorRequest) SetOperationType(val *evaluator.OperationType) { + p.OperationType = val +} +func (p *PublishBuiltinEvaluatorRequest) SetBase(val *base.Base) { + p.Base = val +} + +var fieldIDToName_PublishBuiltinEvaluatorRequest = map[int16]string{ + 1: "evaluator_id", + 2: "version", + 3: "workspace_id", + 4: "operation_type", + 255: "Base", +} + +func (p *PublishBuiltinEvaluatorRequest) IsSetWorkspaceID() bool { + return p.WorkspaceID != nil +} + +func (p *PublishBuiltinEvaluatorRequest) IsSetOperationType() bool { + return p.OperationType != nil +} + +func (p *PublishBuiltinEvaluatorRequest) IsSetBase() bool { + return p.Base != nil +} + +func (p *PublishBuiltinEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorID bool = false + var issetVersion bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetEvaluatorID = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRING { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + issetVersion = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 3: + if fieldTypeId == thrift.I64 { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 4: + if fieldTypeId == thrift.STRING { + if err = p.ReadField4(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetEvaluatorID { + fieldId = 1 + goto RequiredFieldNotSetError + } + + if !issetVersion { + fieldId = 2 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_PublishBuiltinEvaluatorRequest[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_PublishBuiltinEvaluatorRequest[fieldId])) +} + +func (p *PublishBuiltinEvaluatorRequest) ReadField1(iprot thrift.TProtocol) error { + + var _field int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = v + } + p.EvaluatorID = _field + return nil +} +func (p *PublishBuiltinEvaluatorRequest) ReadField2(iprot thrift.TProtocol) error { + + var _field string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = v + } + p.Version = _field + return nil +} +func (p *PublishBuiltinEvaluatorRequest) ReadField3(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.WorkspaceID = _field + return nil +} +func (p *PublishBuiltinEvaluatorRequest) ReadField4(iprot thrift.TProtocol) error { + + var _field *evaluator.OperationType + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.OperationType = _field + return nil +} +func (p *PublishBuiltinEvaluatorRequest) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBase() + if err := _field.Read(iprot); err != nil { + return err + } + p.Base = _field + return nil +} + +func (p *PublishBuiltinEvaluatorRequest) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("PublishBuiltinEvaluatorRequest"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } + if err = p.writeField4(oprot); err != nil { + fieldId = 4 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *PublishBuiltinEvaluatorRequest) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("evaluator_id", thrift.I64, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(p.EvaluatorID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *PublishBuiltinEvaluatorRequest) writeField2(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("version", thrift.STRING, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(p.Version); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *PublishBuiltinEvaluatorRequest) writeField3(oprot thrift.TProtocol) (err error) { + if p.IsSetWorkspaceID() { + if err = oprot.WriteFieldBegin("workspace_id", thrift.I64, 3); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.WorkspaceID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} +func (p *PublishBuiltinEvaluatorRequest) writeField4(oprot thrift.TProtocol) (err error) { + if p.IsSetOperationType() { + if err = oprot.WriteFieldBegin("operation_type", thrift.STRING, 4); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.OperationType); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) +} +func (p *PublishBuiltinEvaluatorRequest) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBase() { + if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.Base.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *PublishBuiltinEvaluatorRequest) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("PublishBuiltinEvaluatorRequest(%+v)", *p) + +} + +func (p *PublishBuiltinEvaluatorRequest) DeepEqual(ano *PublishBuiltinEvaluatorRequest) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorID) { + return false + } + if !p.Field2DeepEqual(ano.Version) { + return false + } + if !p.Field3DeepEqual(ano.WorkspaceID) { + return false + } + if !p.Field4DeepEqual(ano.OperationType) { + return false + } + if !p.Field255DeepEqual(ano.Base) { + return false + } + return true +} + +func (p *PublishBuiltinEvaluatorRequest) Field1DeepEqual(src int64) bool { + + if p.EvaluatorID != src { + return false + } + return true +} +func (p *PublishBuiltinEvaluatorRequest) Field2DeepEqual(src string) bool { + + if strings.Compare(p.Version, src) != 0 { + return false + } + return true +} +func (p *PublishBuiltinEvaluatorRequest) Field3DeepEqual(src *int64) bool { + + if p.WorkspaceID == src { + return true + } else if p.WorkspaceID == nil || src == nil { + return false + } + if *p.WorkspaceID != *src { + return false + } + return true +} +func (p *PublishBuiltinEvaluatorRequest) Field4DeepEqual(src *evaluator.OperationType) bool { + + if p.OperationType == src { + return true + } else if p.OperationType == nil || src == nil { + return false + } + if strings.Compare(*p.OperationType, *src) != 0 { + return false + } + return true +} +func (p *PublishBuiltinEvaluatorRequest) Field255DeepEqual(src *base.Base) bool { + + if !p.Base.DeepEqual(src) { + return false + } + return true +} + +type PublishBuiltinEvaluatorResponse struct { + Version *evaluator.EvaluatorVersion `thrift:"version,1,required" frugal:"1,required,evaluator.EvaluatorVersion" form:"version,required" json:"version,required"` + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` +} + +func NewPublishBuiltinEvaluatorResponse() *PublishBuiltinEvaluatorResponse { + return &PublishBuiltinEvaluatorResponse{} +} + +func (p *PublishBuiltinEvaluatorResponse) InitDefault() { +} + +var PublishBuiltinEvaluatorResponse_Version_DEFAULT *evaluator.EvaluatorVersion + +func (p *PublishBuiltinEvaluatorResponse) GetVersion() (v *evaluator.EvaluatorVersion) { + if p == nil { + return + } + if !p.IsSetVersion() { + return PublishBuiltinEvaluatorResponse_Version_DEFAULT + } + return p.Version +} + +var PublishBuiltinEvaluatorResponse_BaseResp_DEFAULT *base.BaseResp + +func (p *PublishBuiltinEvaluatorResponse) GetBaseResp() (v *base.BaseResp) { + if p == nil { + return + } + if !p.IsSetBaseResp() { + return PublishBuiltinEvaluatorResponse_BaseResp_DEFAULT + } + return p.BaseResp +} +func (p *PublishBuiltinEvaluatorResponse) SetVersion(val *evaluator.EvaluatorVersion) { + p.Version = val +} +func (p *PublishBuiltinEvaluatorResponse) SetBaseResp(val *base.BaseResp) { + p.BaseResp = val +} + +var fieldIDToName_PublishBuiltinEvaluatorResponse = map[int16]string{ + 1: "version", + 255: "BaseResp", +} + +func (p *PublishBuiltinEvaluatorResponse) IsSetVersion() bool { + return p.Version != nil +} + +func (p *PublishBuiltinEvaluatorResponse) IsSetBaseResp() bool { + return p.BaseResp != nil +} + +func (p *PublishBuiltinEvaluatorResponse) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetVersion bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetVersion = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetVersion { + fieldId = 1 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_PublishBuiltinEvaluatorResponse[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_PublishBuiltinEvaluatorResponse[fieldId])) +} + +func (p *PublishBuiltinEvaluatorResponse) ReadField1(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorVersion() + if err := _field.Read(iprot); err != nil { + return err + } + p.Version = _field + return nil +} +func (p *PublishBuiltinEvaluatorResponse) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBaseResp() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseResp = _field + return nil +} + +func (p *PublishBuiltinEvaluatorResponse) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("PublishBuiltinEvaluatorResponse"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *PublishBuiltinEvaluatorResponse) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("version", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.Version.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *PublishBuiltinEvaluatorResponse) writeField255(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseResp.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *PublishBuiltinEvaluatorResponse) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("PublishBuiltinEvaluatorResponse(%+v)", *p) + +} + +func (p *PublishBuiltinEvaluatorResponse) DeepEqual(ano *PublishBuiltinEvaluatorResponse) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Version) { + return false + } + if !p.Field255DeepEqual(ano.BaseResp) { + return false + } + return true +} + +func (p *PublishBuiltinEvaluatorResponse) Field1DeepEqual(src *evaluator.EvaluatorVersion) bool { + + if !p.Version.DeepEqual(src) { + return false + } + return true +} +func (p *PublishBuiltinEvaluatorResponse) Field255DeepEqual(src *base.BaseResp) bool { + + if !p.BaseResp.DeepEqual(src) { + return false + } + return true +} + +type CreateEvaluatorTemplateRequest struct { + EvaluatorTemplate *evaluator.EvaluatorTemplate `thrift:"evaluator_template,1,required" frugal:"1,required,evaluator.EvaluatorTemplate" form:"evaluator_template,required" json:"evaluator_template,required"` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` +} + +func NewCreateEvaluatorTemplateRequest() *CreateEvaluatorTemplateRequest { + return &CreateEvaluatorTemplateRequest{} +} + +func (p *CreateEvaluatorTemplateRequest) InitDefault() { +} + +var CreateEvaluatorTemplateRequest_EvaluatorTemplate_DEFAULT *evaluator.EvaluatorTemplate + +func (p *CreateEvaluatorTemplateRequest) GetEvaluatorTemplate() (v *evaluator.EvaluatorTemplate) { + if p == nil { + return + } + if !p.IsSetEvaluatorTemplate() { + return CreateEvaluatorTemplateRequest_EvaluatorTemplate_DEFAULT + } + return p.EvaluatorTemplate +} + +var CreateEvaluatorTemplateRequest_Base_DEFAULT *base.Base + +func (p *CreateEvaluatorTemplateRequest) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return CreateEvaluatorTemplateRequest_Base_DEFAULT + } + return p.Base +} +func (p *CreateEvaluatorTemplateRequest) SetEvaluatorTemplate(val *evaluator.EvaluatorTemplate) { + p.EvaluatorTemplate = val +} +func (p *CreateEvaluatorTemplateRequest) SetBase(val *base.Base) { + p.Base = val +} + +var fieldIDToName_CreateEvaluatorTemplateRequest = map[int16]string{ + 1: "evaluator_template", + 255: "Base", +} + +func (p *CreateEvaluatorTemplateRequest) IsSetEvaluatorTemplate() bool { + return p.EvaluatorTemplate != nil +} + +func (p *CreateEvaluatorTemplateRequest) IsSetBase() bool { + return p.Base != nil +} + +func (p *CreateEvaluatorTemplateRequest) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplate bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetEvaluatorTemplate = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetEvaluatorTemplate { + fieldId = 1 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_CreateEvaluatorTemplateRequest[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_CreateEvaluatorTemplateRequest[fieldId])) +} + +func (p *CreateEvaluatorTemplateRequest) ReadField1(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorTemplate() + if err := _field.Read(iprot); err != nil { + return err + } + p.EvaluatorTemplate = _field + return nil +} +func (p *CreateEvaluatorTemplateRequest) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBase() + if err := _field.Read(iprot); err != nil { + return err + } + p.Base = _field + return nil +} + +func (p *CreateEvaluatorTemplateRequest) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("CreateEvaluatorTemplateRequest"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *CreateEvaluatorTemplateRequest) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("evaluator_template", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorTemplate.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *CreateEvaluatorTemplateRequest) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBase() { + if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.Base.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *CreateEvaluatorTemplateRequest) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("CreateEvaluatorTemplateRequest(%+v)", *p) + +} + +func (p *CreateEvaluatorTemplateRequest) DeepEqual(ano *CreateEvaluatorTemplateRequest) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorTemplate) { + return false + } + if !p.Field255DeepEqual(ano.Base) { + return false + } + return true +} + +func (p *CreateEvaluatorTemplateRequest) Field1DeepEqual(src *evaluator.EvaluatorTemplate) bool { + + if !p.EvaluatorTemplate.DeepEqual(src) { + return false + } + return true +} +func (p *CreateEvaluatorTemplateRequest) Field255DeepEqual(src *base.Base) bool { + + if !p.Base.DeepEqual(src) { + return false + } + return true +} + +type CreateEvaluatorTemplateResponse struct { + EvaluatorTemplate *evaluator.EvaluatorTemplate `thrift:"evaluator_template,1,required" frugal:"1,required,evaluator.EvaluatorTemplate" form:"evaluator_template,required" json:"evaluator_template,required"` + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` +} + +func NewCreateEvaluatorTemplateResponse() *CreateEvaluatorTemplateResponse { + return &CreateEvaluatorTemplateResponse{} +} + +func (p *CreateEvaluatorTemplateResponse) InitDefault() { +} + +var CreateEvaluatorTemplateResponse_EvaluatorTemplate_DEFAULT *evaluator.EvaluatorTemplate + +func (p *CreateEvaluatorTemplateResponse) GetEvaluatorTemplate() (v *evaluator.EvaluatorTemplate) { + if p == nil { + return + } + if !p.IsSetEvaluatorTemplate() { + return CreateEvaluatorTemplateResponse_EvaluatorTemplate_DEFAULT + } + return p.EvaluatorTemplate +} + +var CreateEvaluatorTemplateResponse_BaseResp_DEFAULT *base.BaseResp + +func (p *CreateEvaluatorTemplateResponse) GetBaseResp() (v *base.BaseResp) { + if p == nil { + return + } + if !p.IsSetBaseResp() { + return CreateEvaluatorTemplateResponse_BaseResp_DEFAULT + } + return p.BaseResp +} +func (p *CreateEvaluatorTemplateResponse) SetEvaluatorTemplate(val *evaluator.EvaluatorTemplate) { + p.EvaluatorTemplate = val +} +func (p *CreateEvaluatorTemplateResponse) SetBaseResp(val *base.BaseResp) { + p.BaseResp = val +} + +var fieldIDToName_CreateEvaluatorTemplateResponse = map[int16]string{ + 1: "evaluator_template", + 255: "BaseResp", +} + +func (p *CreateEvaluatorTemplateResponse) IsSetEvaluatorTemplate() bool { + return p.EvaluatorTemplate != nil +} + +func (p *CreateEvaluatorTemplateResponse) IsSetBaseResp() bool { + return p.BaseResp != nil +} + +func (p *CreateEvaluatorTemplateResponse) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplate bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetEvaluatorTemplate = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetEvaluatorTemplate { + fieldId = 1 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_CreateEvaluatorTemplateResponse[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_CreateEvaluatorTemplateResponse[fieldId])) +} + +func (p *CreateEvaluatorTemplateResponse) ReadField1(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorTemplate() + if err := _field.Read(iprot); err != nil { + return err + } + p.EvaluatorTemplate = _field + return nil +} +func (p *CreateEvaluatorTemplateResponse) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBaseResp() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseResp = _field + return nil +} + +func (p *CreateEvaluatorTemplateResponse) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("CreateEvaluatorTemplateResponse"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *CreateEvaluatorTemplateResponse) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("evaluator_template", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorTemplate.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *CreateEvaluatorTemplateResponse) writeField255(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseResp.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *CreateEvaluatorTemplateResponse) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("CreateEvaluatorTemplateResponse(%+v)", *p) + +} + +func (p *CreateEvaluatorTemplateResponse) DeepEqual(ano *CreateEvaluatorTemplateResponse) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorTemplate) { + return false + } + if !p.Field255DeepEqual(ano.BaseResp) { + return false + } + return true +} + +func (p *CreateEvaluatorTemplateResponse) Field1DeepEqual(src *evaluator.EvaluatorTemplate) bool { + + if !p.EvaluatorTemplate.DeepEqual(src) { + return false + } + return true +} +func (p *CreateEvaluatorTemplateResponse) Field255DeepEqual(src *base.BaseResp) bool { + + if !p.BaseResp.DeepEqual(src) { + return false + } + return true +} + +type UpdateEvaluatorTemplateRequest struct { + EvaluatorTemplate *evaluator.EvaluatorTemplate `thrift:"evaluator_template,1,required" frugal:"1,required,evaluator.EvaluatorTemplate" form:"evaluator_template,required" json:"evaluator_template,required"` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` +} + +func NewUpdateEvaluatorTemplateRequest() *UpdateEvaluatorTemplateRequest { + return &UpdateEvaluatorTemplateRequest{} +} + +func (p *UpdateEvaluatorTemplateRequest) InitDefault() { +} + +var UpdateEvaluatorTemplateRequest_EvaluatorTemplate_DEFAULT *evaluator.EvaluatorTemplate + +func (p *UpdateEvaluatorTemplateRequest) GetEvaluatorTemplate() (v *evaluator.EvaluatorTemplate) { + if p == nil { + return + } + if !p.IsSetEvaluatorTemplate() { + return UpdateEvaluatorTemplateRequest_EvaluatorTemplate_DEFAULT + } + return p.EvaluatorTemplate +} + +var UpdateEvaluatorTemplateRequest_Base_DEFAULT *base.Base + +func (p *UpdateEvaluatorTemplateRequest) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return UpdateEvaluatorTemplateRequest_Base_DEFAULT + } + return p.Base +} +func (p *UpdateEvaluatorTemplateRequest) SetEvaluatorTemplate(val *evaluator.EvaluatorTemplate) { + p.EvaluatorTemplate = val +} +func (p *UpdateEvaluatorTemplateRequest) SetBase(val *base.Base) { + p.Base = val +} + +var fieldIDToName_UpdateEvaluatorTemplateRequest = map[int16]string{ + 1: "evaluator_template", + 255: "Base", +} + +func (p *UpdateEvaluatorTemplateRequest) IsSetEvaluatorTemplate() bool { + return p.EvaluatorTemplate != nil +} + +func (p *UpdateEvaluatorTemplateRequest) IsSetBase() bool { + return p.Base != nil +} + +func (p *UpdateEvaluatorTemplateRequest) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplate bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetEvaluatorTemplate = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetEvaluatorTemplate { + fieldId = 1 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_UpdateEvaluatorTemplateRequest[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_UpdateEvaluatorTemplateRequest[fieldId])) +} + +func (p *UpdateEvaluatorTemplateRequest) ReadField1(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorTemplate() + if err := _field.Read(iprot); err != nil { + return err + } + p.EvaluatorTemplate = _field + return nil +} +func (p *UpdateEvaluatorTemplateRequest) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBase() + if err := _field.Read(iprot); err != nil { + return err + } + p.Base = _field + return nil +} + +func (p *UpdateEvaluatorTemplateRequest) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("UpdateEvaluatorTemplateRequest"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *UpdateEvaluatorTemplateRequest) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("evaluator_template", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorTemplate.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *UpdateEvaluatorTemplateRequest) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBase() { + if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.Base.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *UpdateEvaluatorTemplateRequest) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("UpdateEvaluatorTemplateRequest(%+v)", *p) + +} + +func (p *UpdateEvaluatorTemplateRequest) DeepEqual(ano *UpdateEvaluatorTemplateRequest) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorTemplate) { + return false + } + if !p.Field255DeepEqual(ano.Base) { + return false + } + return true +} + +func (p *UpdateEvaluatorTemplateRequest) Field1DeepEqual(src *evaluator.EvaluatorTemplate) bool { + + if !p.EvaluatorTemplate.DeepEqual(src) { + return false + } + return true +} +func (p *UpdateEvaluatorTemplateRequest) Field255DeepEqual(src *base.Base) bool { + + if !p.Base.DeepEqual(src) { + return false + } + return true +} + +type UpdateEvaluatorTemplateResponse struct { + EvaluatorTemplate *evaluator.EvaluatorTemplate `thrift:"evaluator_template,1,required" frugal:"1,required,evaluator.EvaluatorTemplate" form:"evaluator_template,required" json:"evaluator_template,required"` + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` +} + +func NewUpdateEvaluatorTemplateResponse() *UpdateEvaluatorTemplateResponse { + return &UpdateEvaluatorTemplateResponse{} +} + +func (p *UpdateEvaluatorTemplateResponse) InitDefault() { +} + +var UpdateEvaluatorTemplateResponse_EvaluatorTemplate_DEFAULT *evaluator.EvaluatorTemplate + +func (p *UpdateEvaluatorTemplateResponse) GetEvaluatorTemplate() (v *evaluator.EvaluatorTemplate) { + if p == nil { + return + } + if !p.IsSetEvaluatorTemplate() { + return UpdateEvaluatorTemplateResponse_EvaluatorTemplate_DEFAULT + } + return p.EvaluatorTemplate +} + +var UpdateEvaluatorTemplateResponse_BaseResp_DEFAULT *base.BaseResp + +func (p *UpdateEvaluatorTemplateResponse) GetBaseResp() (v *base.BaseResp) { + if p == nil { + return + } + if !p.IsSetBaseResp() { + return UpdateEvaluatorTemplateResponse_BaseResp_DEFAULT + } + return p.BaseResp +} +func (p *UpdateEvaluatorTemplateResponse) SetEvaluatorTemplate(val *evaluator.EvaluatorTemplate) { + p.EvaluatorTemplate = val +} +func (p *UpdateEvaluatorTemplateResponse) SetBaseResp(val *base.BaseResp) { + p.BaseResp = val +} + +var fieldIDToName_UpdateEvaluatorTemplateResponse = map[int16]string{ + 1: "evaluator_template", + 255: "BaseResp", +} + +func (p *UpdateEvaluatorTemplateResponse) IsSetEvaluatorTemplate() bool { + return p.EvaluatorTemplate != nil +} + +func (p *UpdateEvaluatorTemplateResponse) IsSetBaseResp() bool { + return p.BaseResp != nil +} + +func (p *UpdateEvaluatorTemplateResponse) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplate bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetEvaluatorTemplate = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetEvaluatorTemplate { + fieldId = 1 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_UpdateEvaluatorTemplateResponse[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_UpdateEvaluatorTemplateResponse[fieldId])) +} + +func (p *UpdateEvaluatorTemplateResponse) ReadField1(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorTemplate() + if err := _field.Read(iprot); err != nil { + return err + } + p.EvaluatorTemplate = _field + return nil +} +func (p *UpdateEvaluatorTemplateResponse) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBaseResp() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseResp = _field + return nil +} + +func (p *UpdateEvaluatorTemplateResponse) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("UpdateEvaluatorTemplateResponse"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *UpdateEvaluatorTemplateResponse) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("evaluator_template", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorTemplate.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *UpdateEvaluatorTemplateResponse) writeField255(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseResp.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *UpdateEvaluatorTemplateResponse) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("UpdateEvaluatorTemplateResponse(%+v)", *p) + +} + +func (p *UpdateEvaluatorTemplateResponse) DeepEqual(ano *UpdateEvaluatorTemplateResponse) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorTemplate) { + return false + } + if !p.Field255DeepEqual(ano.BaseResp) { + return false + } + return true +} + +func (p *UpdateEvaluatorTemplateResponse) Field1DeepEqual(src *evaluator.EvaluatorTemplate) bool { + + if !p.EvaluatorTemplate.DeepEqual(src) { + return false + } + return true +} +func (p *UpdateEvaluatorTemplateResponse) Field255DeepEqual(src *base.BaseResp) bool { + + if !p.BaseResp.DeepEqual(src) { + return false + } + return true +} + +type DeleteEvaluatorTemplateRequest struct { + EvaluatorTemplateID int64 `thrift:"evaluator_template_id,1,required" frugal:"1,required,i64" json:"evaluator_template_id" form:"evaluator_template_id,required" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` +} + +func NewDeleteEvaluatorTemplateRequest() *DeleteEvaluatorTemplateRequest { + return &DeleteEvaluatorTemplateRequest{} +} + +func (p *DeleteEvaluatorTemplateRequest) InitDefault() { +} + +func (p *DeleteEvaluatorTemplateRequest) GetEvaluatorTemplateID() (v int64) { + if p != nil { + return p.EvaluatorTemplateID + } + return +} + +var DeleteEvaluatorTemplateRequest_Base_DEFAULT *base.Base + +func (p *DeleteEvaluatorTemplateRequest) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return DeleteEvaluatorTemplateRequest_Base_DEFAULT + } + return p.Base +} +func (p *DeleteEvaluatorTemplateRequest) SetEvaluatorTemplateID(val int64) { + p.EvaluatorTemplateID = val +} +func (p *DeleteEvaluatorTemplateRequest) SetBase(val *base.Base) { + p.Base = val +} + +var fieldIDToName_DeleteEvaluatorTemplateRequest = map[int16]string{ + 1: "evaluator_template_id", + 255: "Base", +} + +func (p *DeleteEvaluatorTemplateRequest) IsSetBase() bool { + return p.Base != nil +} + +func (p *DeleteEvaluatorTemplateRequest) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplateID bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + issetEvaluatorTemplateID = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetEvaluatorTemplateID { + fieldId = 1 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_DeleteEvaluatorTemplateRequest[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_DeleteEvaluatorTemplateRequest[fieldId])) +} + +func (p *DeleteEvaluatorTemplateRequest) ReadField1(iprot thrift.TProtocol) error { + + var _field int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = v + } + p.EvaluatorTemplateID = _field + return nil +} +func (p *DeleteEvaluatorTemplateRequest) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBase() + if err := _field.Read(iprot); err != nil { + return err + } + p.Base = _field + return nil +} + +func (p *DeleteEvaluatorTemplateRequest) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("DeleteEvaluatorTemplateRequest"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *DeleteEvaluatorTemplateRequest) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("evaluator_template_id", thrift.I64, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(p.EvaluatorTemplateID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *DeleteEvaluatorTemplateRequest) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBase() { + if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.Base.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *DeleteEvaluatorTemplateRequest) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("DeleteEvaluatorTemplateRequest(%+v)", *p) + +} + +func (p *DeleteEvaluatorTemplateRequest) DeepEqual(ano *DeleteEvaluatorTemplateRequest) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorTemplateID) { + return false + } + if !p.Field255DeepEqual(ano.Base) { + return false + } + return true +} + +func (p *DeleteEvaluatorTemplateRequest) Field1DeepEqual(src int64) bool { + + if p.EvaluatorTemplateID != src { + return false + } + return true +} +func (p *DeleteEvaluatorTemplateRequest) Field255DeepEqual(src *base.Base) bool { + + if !p.Base.DeepEqual(src) { + return false + } + return true +} + +type DeleteEvaluatorTemplateResponse struct { + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` +} + +func NewDeleteEvaluatorTemplateResponse() *DeleteEvaluatorTemplateResponse { + return &DeleteEvaluatorTemplateResponse{} +} + +func (p *DeleteEvaluatorTemplateResponse) InitDefault() { +} + +var DeleteEvaluatorTemplateResponse_BaseResp_DEFAULT *base.BaseResp + +func (p *DeleteEvaluatorTemplateResponse) GetBaseResp() (v *base.BaseResp) { + if p == nil { + return + } + if !p.IsSetBaseResp() { + return DeleteEvaluatorTemplateResponse_BaseResp_DEFAULT + } + return p.BaseResp +} +func (p *DeleteEvaluatorTemplateResponse) SetBaseResp(val *base.BaseResp) { + p.BaseResp = val +} + +var fieldIDToName_DeleteEvaluatorTemplateResponse = map[int16]string{ + 255: "BaseResp", +} + +func (p *DeleteEvaluatorTemplateResponse) IsSetBaseResp() bool { + return p.BaseResp != nil +} + +func (p *DeleteEvaluatorTemplateResponse) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_DeleteEvaluatorTemplateResponse[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *DeleteEvaluatorTemplateResponse) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBaseResp() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseResp = _field + return nil +} + +func (p *DeleteEvaluatorTemplateResponse) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("DeleteEvaluatorTemplateResponse"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *DeleteEvaluatorTemplateResponse) writeField255(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseResp.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *DeleteEvaluatorTemplateResponse) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("DeleteEvaluatorTemplateResponse(%+v)", *p) + +} + +func (p *DeleteEvaluatorTemplateResponse) DeepEqual(ano *DeleteEvaluatorTemplateResponse) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field255DeepEqual(ano.BaseResp) { + return false + } + return true +} + +func (p *DeleteEvaluatorTemplateResponse) Field255DeepEqual(src *base.BaseResp) bool { + + if !p.BaseResp.DeepEqual(src) { + return false + } + return true +} + +type ListEvaluatorTagsRequest struct { + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` +} + +func NewListEvaluatorTagsRequest() *ListEvaluatorTagsRequest { + return &ListEvaluatorTagsRequest{} +} + +func (p *ListEvaluatorTagsRequest) InitDefault() { +} + +var ListEvaluatorTagsRequest_Base_DEFAULT *base.Base + +func (p *ListEvaluatorTagsRequest) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return ListEvaluatorTagsRequest_Base_DEFAULT + } + return p.Base +} +func (p *ListEvaluatorTagsRequest) SetBase(val *base.Base) { + p.Base = val +} + +var fieldIDToName_ListEvaluatorTagsRequest = map[int16]string{ + 255: "Base", +} + +func (p *ListEvaluatorTagsRequest) IsSetBase() bool { + return p.Base != nil +} + +func (p *ListEvaluatorTagsRequest) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_ListEvaluatorTagsRequest[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *ListEvaluatorTagsRequest) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBase() + if err := _field.Read(iprot); err != nil { + return err + } + p.Base = _field + return nil +} + +func (p *ListEvaluatorTagsRequest) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("ListEvaluatorTagsRequest"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *ListEvaluatorTagsRequest) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBase() { + if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.Base.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *ListEvaluatorTagsRequest) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("ListEvaluatorTagsRequest(%+v)", *p) + +} + +func (p *ListEvaluatorTagsRequest) DeepEqual(ano *ListEvaluatorTagsRequest) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field255DeepEqual(ano.Base) { + return false + } + return true +} + +func (p *ListEvaluatorTagsRequest) Field255DeepEqual(src *base.Base) bool { + + if !p.Base.DeepEqual(src) { + return false + } + return true +} + +type ListEvaluatorTagsResponse struct { + // 筛选器选项 + Tags map[evaluator.EvaluatorTagKey][]string `thrift:"tags,1,optional" frugal:"1,optional,map>" form:"tags" json:"tags,omitempty"` + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` +} + +func NewListEvaluatorTagsResponse() *ListEvaluatorTagsResponse { + return &ListEvaluatorTagsResponse{} +} + +func (p *ListEvaluatorTagsResponse) InitDefault() { +} + +var ListEvaluatorTagsResponse_Tags_DEFAULT map[evaluator.EvaluatorTagKey][]string + +func (p *ListEvaluatorTagsResponse) GetTags() (v map[evaluator.EvaluatorTagKey][]string) { + if p == nil { + return + } + if !p.IsSetTags() { + return ListEvaluatorTagsResponse_Tags_DEFAULT + } + return p.Tags +} + +var ListEvaluatorTagsResponse_BaseResp_DEFAULT *base.BaseResp + +func (p *ListEvaluatorTagsResponse) GetBaseResp() (v *base.BaseResp) { + if p == nil { + return + } + if !p.IsSetBaseResp() { + return ListEvaluatorTagsResponse_BaseResp_DEFAULT + } + return p.BaseResp +} +func (p *ListEvaluatorTagsResponse) SetTags(val map[evaluator.EvaluatorTagKey][]string) { + p.Tags = val +} +func (p *ListEvaluatorTagsResponse) SetBaseResp(val *base.BaseResp) { + p.BaseResp = val +} + +var fieldIDToName_ListEvaluatorTagsResponse = map[int16]string{ + 1: "tags", + 255: "BaseResp", +} + +func (p *ListEvaluatorTagsResponse) IsSetTags() bool { + return p.Tags != nil +} + +func (p *ListEvaluatorTagsResponse) IsSetBaseResp() bool { + return p.BaseResp != nil +} + +func (p *ListEvaluatorTagsResponse) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.MAP { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_ListEvaluatorTagsResponse[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *ListEvaluatorTagsResponse) ReadField1(iprot thrift.TProtocol) error { + _, _, size, err := iprot.ReadMapBegin() + if err != nil { + return err + } + _field := make(map[evaluator.EvaluatorTagKey][]string, size) + for i := 0; i < size; i++ { + var _key evaluator.EvaluatorTagKey + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _key = v + } + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _val := make([]string, 0, size) + for i := 0; i < size; i++ { + + var _elem string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _elem = v + } + + _val = append(_val, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + + _field[_key] = _val + } + if err := iprot.ReadMapEnd(); err != nil { + return err + } + p.Tags = _field + return nil +} +func (p *ListEvaluatorTagsResponse) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBaseResp() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseResp = _field + return nil +} + +func (p *ListEvaluatorTagsResponse) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("ListEvaluatorTagsResponse"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *ListEvaluatorTagsResponse) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetTags() { + if err = oprot.WriteFieldBegin("tags", thrift.MAP, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(p.Tags)); err != nil { + return err + } + for k, v := range p.Tags { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + return err + } + for _, v := range v { + if err := oprot.WriteString(v); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + } + if err := oprot.WriteMapEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *ListEvaluatorTagsResponse) writeField255(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseResp.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *ListEvaluatorTagsResponse) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("ListEvaluatorTagsResponse(%+v)", *p) + +} + +func (p *ListEvaluatorTagsResponse) DeepEqual(ano *ListEvaluatorTagsResponse) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Tags) { + return false + } + if !p.Field255DeepEqual(ano.BaseResp) { + return false + } + return true +} + +func (p *ListEvaluatorTagsResponse) Field1DeepEqual(src map[evaluator.EvaluatorTagKey][]string) bool { + + if len(p.Tags) != len(src) { + return false + } + for k, v := range p.Tags { + _src := src[k] + if len(v) != len(_src) { + return false + } + for i, v := range v { + _src1 := _src[i] + if strings.Compare(v, _src1) != 0 { + return false + } + } + } + return true +} +func (p *ListEvaluatorTagsResponse) Field255DeepEqual(src *base.BaseResp) bool { + + if !p.BaseResp.DeepEqual(src) { + return false + } + return true +} + +type EvaluatorService interface { + // 评估器 + ListEvaluators(ctx context.Context, request *ListEvaluatorsRequest) (r *ListEvaluatorsResponse, err error) + + BatchGetEvaluators(ctx context.Context, request *BatchGetEvaluatorsRequest) (r *BatchGetEvaluatorsResponse, err error) + + GetEvaluator(ctx context.Context, request *GetEvaluatorRequest) (r *GetEvaluatorResponse, err error) + + CreateEvaluator(ctx context.Context, request *CreateEvaluatorRequest) (r *CreateEvaluatorResponse, err error) + + UpdateEvaluator(ctx context.Context, request *UpdateEvaluatorRequest) (r *UpdateEvaluatorResponse, err error) + + UpdateEvaluatorDraft(ctx context.Context, request *UpdateEvaluatorDraftRequest) (r *UpdateEvaluatorDraftResponse, err error) + + DeleteEvaluator(ctx context.Context, request *DeleteEvaluatorRequest) (r *DeleteEvaluatorResponse, err error) + + CheckEvaluatorName(ctx context.Context, request *CheckEvaluatorNameRequest) (r *CheckEvaluatorNameResponse, err error) + // 评估器版本 + ListEvaluatorVersions(ctx context.Context, request *ListEvaluatorVersionsRequest) (r *ListEvaluatorVersionsResponse, err error) + + GetEvaluatorVersion(ctx context.Context, request *GetEvaluatorVersionRequest) (r *GetEvaluatorVersionResponse, err error) + + BatchGetEvaluatorVersions(ctx context.Context, request *BatchGetEvaluatorVersionsRequest) (r *BatchGetEvaluatorVersionsResponse, err error) + + SubmitEvaluatorVersion(ctx context.Context, request *SubmitEvaluatorVersionRequest) (r *SubmitEvaluatorVersionResponse, err error) + // 评估器预置模版 + ListTemplates(ctx context.Context, request *ListTemplatesRequest) (r *ListTemplatesResponse, err error) + + GetTemplateInfo(ctx context.Context, request *GetTemplateInfoRequest) (r *GetTemplateInfoResponse, err error) + + GetDefaultPromptEvaluatorTools(ctx context.Context, req *GetDefaultPromptEvaluatorToolsRequest) (r *GetDefaultPromptEvaluatorToolsResponse, err error) + // 评估器执行 + RunEvaluator(ctx context.Context, req *RunEvaluatorRequest) (r *RunEvaluatorResponse, err error) + + DebugEvaluator(ctx context.Context, req *DebugEvaluatorRequest) (r *DebugEvaluatorResponse, err error) + + BatchDebugEvaluator(ctx context.Context, req *BatchDebugEvaluatorRequest) (r *BatchDebugEvaluatorResponse, err error) + // 评估器执行结果 + UpdateEvaluatorRecord(ctx context.Context, req *UpdateEvaluatorRecordRequest) (r *UpdateEvaluatorRecordResponse, err error) + + GetEvaluatorRecord(ctx context.Context, req *GetEvaluatorRecordRequest) (r *GetEvaluatorRecordResponse, err error) + + BatchGetEvaluatorRecords(ctx context.Context, req *BatchGetEvaluatorRecordsRequest) (r *BatchGetEvaluatorRecordsResponse, err error) + // 评估器验证 + ValidateEvaluator(ctx context.Context, request *ValidateEvaluatorRequest) (r *ValidateEvaluatorResponse, err error) + // 查询评估器模板 + ListTemplatesV2(ctx context.Context, request *ListTemplatesV2Request) (r *ListTemplatesV2Response, err error) + // 创建评估器模板 + CreateEvaluatorTemplate(ctx context.Context, request *CreateEvaluatorTemplateRequest) (r *CreateEvaluatorTemplateResponse, err error) + // 更新评估器模板 + UpdateEvaluatorTemplate(ctx context.Context, request *UpdateEvaluatorTemplateRequest) (r *UpdateEvaluatorTemplateResponse, err error) + // 删除 + DeleteEvaluatorTemplate(ctx context.Context, request *DeleteEvaluatorTemplateRequest) (r *DeleteEvaluatorTemplateResponse, err error) + // 调试预置评估器 + DebugBuiltinEvaluator(ctx context.Context, req *DebugBuiltinEvaluatorRequest) (r *DebugBuiltinEvaluatorResponse, err error) + // 发布预置评估器 + PublishBuiltinEvaluator(ctx context.Context, req *PublishBuiltinEvaluatorRequest) (r *PublishBuiltinEvaluatorResponse, err error) + // 查询Tag + ListEvaluatorTags(ctx context.Context, req *ListEvaluatorTagsRequest) (r *ListEvaluatorTagsResponse, err error) +} + +type EvaluatorServiceClient struct { + c thrift.TClient +} + +func NewEvaluatorServiceClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *EvaluatorServiceClient { + return &EvaluatorServiceClient{ + c: thrift.NewTStandardClient(f.GetProtocol(t), f.GetProtocol(t)), + } +} + +func NewEvaluatorServiceClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *EvaluatorServiceClient { + return &EvaluatorServiceClient{ + c: thrift.NewTStandardClient(iprot, oprot), + } +} + +func NewEvaluatorServiceClient(c thrift.TClient) *EvaluatorServiceClient { + return &EvaluatorServiceClient{ + c: c, + } +} + +func (p *EvaluatorServiceClient) Client_() thrift.TClient { + return p.c +} + +func (p *EvaluatorServiceClient) ListEvaluators(ctx context.Context, request *ListEvaluatorsRequest) (r *ListEvaluatorsResponse, err error) { + var _args EvaluatorServiceListEvaluatorsArgs + _args.Request = request + var _result EvaluatorServiceListEvaluatorsResult + if err = p.Client_().Call(ctx, "ListEvaluators", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) BatchGetEvaluators(ctx context.Context, request *BatchGetEvaluatorsRequest) (r *BatchGetEvaluatorsResponse, err error) { + var _args EvaluatorServiceBatchGetEvaluatorsArgs + _args.Request = request + var _result EvaluatorServiceBatchGetEvaluatorsResult + if err = p.Client_().Call(ctx, "BatchGetEvaluators", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) GetEvaluator(ctx context.Context, request *GetEvaluatorRequest) (r *GetEvaluatorResponse, err error) { + var _args EvaluatorServiceGetEvaluatorArgs + _args.Request = request + var _result EvaluatorServiceGetEvaluatorResult + if err = p.Client_().Call(ctx, "GetEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) CreateEvaluator(ctx context.Context, request *CreateEvaluatorRequest) (r *CreateEvaluatorResponse, err error) { + var _args EvaluatorServiceCreateEvaluatorArgs + _args.Request = request + var _result EvaluatorServiceCreateEvaluatorResult + if err = p.Client_().Call(ctx, "CreateEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) UpdateEvaluator(ctx context.Context, request *UpdateEvaluatorRequest) (r *UpdateEvaluatorResponse, err error) { + var _args EvaluatorServiceUpdateEvaluatorArgs + _args.Request = request + var _result EvaluatorServiceUpdateEvaluatorResult + if err = p.Client_().Call(ctx, "UpdateEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) UpdateEvaluatorDraft(ctx context.Context, request *UpdateEvaluatorDraftRequest) (r *UpdateEvaluatorDraftResponse, err error) { + var _args EvaluatorServiceUpdateEvaluatorDraftArgs + _args.Request = request + var _result EvaluatorServiceUpdateEvaluatorDraftResult + if err = p.Client_().Call(ctx, "UpdateEvaluatorDraft", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) DeleteEvaluator(ctx context.Context, request *DeleteEvaluatorRequest) (r *DeleteEvaluatorResponse, err error) { + var _args EvaluatorServiceDeleteEvaluatorArgs + _args.Request = request + var _result EvaluatorServiceDeleteEvaluatorResult + if err = p.Client_().Call(ctx, "DeleteEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) CheckEvaluatorName(ctx context.Context, request *CheckEvaluatorNameRequest) (r *CheckEvaluatorNameResponse, err error) { + var _args EvaluatorServiceCheckEvaluatorNameArgs + _args.Request = request + var _result EvaluatorServiceCheckEvaluatorNameResult + if err = p.Client_().Call(ctx, "CheckEvaluatorName", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) ListEvaluatorVersions(ctx context.Context, request *ListEvaluatorVersionsRequest) (r *ListEvaluatorVersionsResponse, err error) { + var _args EvaluatorServiceListEvaluatorVersionsArgs + _args.Request = request + var _result EvaluatorServiceListEvaluatorVersionsResult + if err = p.Client_().Call(ctx, "ListEvaluatorVersions", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) GetEvaluatorVersion(ctx context.Context, request *GetEvaluatorVersionRequest) (r *GetEvaluatorVersionResponse, err error) { + var _args EvaluatorServiceGetEvaluatorVersionArgs + _args.Request = request + var _result EvaluatorServiceGetEvaluatorVersionResult + if err = p.Client_().Call(ctx, "GetEvaluatorVersion", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) BatchGetEvaluatorVersions(ctx context.Context, request *BatchGetEvaluatorVersionsRequest) (r *BatchGetEvaluatorVersionsResponse, err error) { + var _args EvaluatorServiceBatchGetEvaluatorVersionsArgs + _args.Request = request + var _result EvaluatorServiceBatchGetEvaluatorVersionsResult + if err = p.Client_().Call(ctx, "BatchGetEvaluatorVersions", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) SubmitEvaluatorVersion(ctx context.Context, request *SubmitEvaluatorVersionRequest) (r *SubmitEvaluatorVersionResponse, err error) { + var _args EvaluatorServiceSubmitEvaluatorVersionArgs + _args.Request = request + var _result EvaluatorServiceSubmitEvaluatorVersionResult + if err = p.Client_().Call(ctx, "SubmitEvaluatorVersion", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) ListTemplates(ctx context.Context, request *ListTemplatesRequest) (r *ListTemplatesResponse, err error) { + var _args EvaluatorServiceListTemplatesArgs + _args.Request = request + var _result EvaluatorServiceListTemplatesResult + if err = p.Client_().Call(ctx, "ListTemplates", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) GetTemplateInfo(ctx context.Context, request *GetTemplateInfoRequest) (r *GetTemplateInfoResponse, err error) { + var _args EvaluatorServiceGetTemplateInfoArgs + _args.Request = request + var _result EvaluatorServiceGetTemplateInfoResult + if err = p.Client_().Call(ctx, "GetTemplateInfo", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) GetDefaultPromptEvaluatorTools(ctx context.Context, req *GetDefaultPromptEvaluatorToolsRequest) (r *GetDefaultPromptEvaluatorToolsResponse, err error) { + var _args EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs + _args.Req = req + var _result EvaluatorServiceGetDefaultPromptEvaluatorToolsResult + if err = p.Client_().Call(ctx, "GetDefaultPromptEvaluatorTools", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) RunEvaluator(ctx context.Context, req *RunEvaluatorRequest) (r *RunEvaluatorResponse, err error) { + var _args EvaluatorServiceRunEvaluatorArgs + _args.Req = req + var _result EvaluatorServiceRunEvaluatorResult + if err = p.Client_().Call(ctx, "RunEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) DebugEvaluator(ctx context.Context, req *DebugEvaluatorRequest) (r *DebugEvaluatorResponse, err error) { + var _args EvaluatorServiceDebugEvaluatorArgs _args.Req = req var _result EvaluatorServiceDebugEvaluatorResult if err = p.Client_().Call(ctx, "DebugEvaluator", &_args, &_result); err != nil { return } - return _result.GetSuccess(), nil + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) BatchDebugEvaluator(ctx context.Context, req *BatchDebugEvaluatorRequest) (r *BatchDebugEvaluatorResponse, err error) { + var _args EvaluatorServiceBatchDebugEvaluatorArgs + _args.Req = req + var _result EvaluatorServiceBatchDebugEvaluatorResult + if err = p.Client_().Call(ctx, "BatchDebugEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) UpdateEvaluatorRecord(ctx context.Context, req *UpdateEvaluatorRecordRequest) (r *UpdateEvaluatorRecordResponse, err error) { + var _args EvaluatorServiceUpdateEvaluatorRecordArgs + _args.Req = req + var _result EvaluatorServiceUpdateEvaluatorRecordResult + if err = p.Client_().Call(ctx, "UpdateEvaluatorRecord", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) GetEvaluatorRecord(ctx context.Context, req *GetEvaluatorRecordRequest) (r *GetEvaluatorRecordResponse, err error) { + var _args EvaluatorServiceGetEvaluatorRecordArgs + _args.Req = req + var _result EvaluatorServiceGetEvaluatorRecordResult + if err = p.Client_().Call(ctx, "GetEvaluatorRecord", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) BatchGetEvaluatorRecords(ctx context.Context, req *BatchGetEvaluatorRecordsRequest) (r *BatchGetEvaluatorRecordsResponse, err error) { + var _args EvaluatorServiceBatchGetEvaluatorRecordsArgs + _args.Req = req + var _result EvaluatorServiceBatchGetEvaluatorRecordsResult + if err = p.Client_().Call(ctx, "BatchGetEvaluatorRecords", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) ValidateEvaluator(ctx context.Context, request *ValidateEvaluatorRequest) (r *ValidateEvaluatorResponse, err error) { + var _args EvaluatorServiceValidateEvaluatorArgs + _args.Request = request + var _result EvaluatorServiceValidateEvaluatorResult + if err = p.Client_().Call(ctx, "ValidateEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) ListTemplatesV2(ctx context.Context, request *ListTemplatesV2Request) (r *ListTemplatesV2Response, err error) { + var _args EvaluatorServiceListTemplatesV2Args + _args.Request = request + var _result EvaluatorServiceListTemplatesV2Result + if err = p.Client_().Call(ctx, "ListTemplatesV2", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) CreateEvaluatorTemplate(ctx context.Context, request *CreateEvaluatorTemplateRequest) (r *CreateEvaluatorTemplateResponse, err error) { + var _args EvaluatorServiceCreateEvaluatorTemplateArgs + _args.Request = request + var _result EvaluatorServiceCreateEvaluatorTemplateResult + if err = p.Client_().Call(ctx, "CreateEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) UpdateEvaluatorTemplate(ctx context.Context, request *UpdateEvaluatorTemplateRequest) (r *UpdateEvaluatorTemplateResponse, err error) { + var _args EvaluatorServiceUpdateEvaluatorTemplateArgs + _args.Request = request + var _result EvaluatorServiceUpdateEvaluatorTemplateResult + if err = p.Client_().Call(ctx, "UpdateEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) DeleteEvaluatorTemplate(ctx context.Context, request *DeleteEvaluatorTemplateRequest) (r *DeleteEvaluatorTemplateResponse, err error) { + var _args EvaluatorServiceDeleteEvaluatorTemplateArgs + _args.Request = request + var _result EvaluatorServiceDeleteEvaluatorTemplateResult + if err = p.Client_().Call(ctx, "DeleteEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) DebugBuiltinEvaluator(ctx context.Context, req *DebugBuiltinEvaluatorRequest) (r *DebugBuiltinEvaluatorResponse, err error) { + var _args EvaluatorServiceDebugBuiltinEvaluatorArgs + _args.Req = req + var _result EvaluatorServiceDebugBuiltinEvaluatorResult + if err = p.Client_().Call(ctx, "DebugBuiltinEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) PublishBuiltinEvaluator(ctx context.Context, req *PublishBuiltinEvaluatorRequest) (r *PublishBuiltinEvaluatorResponse, err error) { + var _args EvaluatorServicePublishBuiltinEvaluatorArgs + _args.Req = req + var _result EvaluatorServicePublishBuiltinEvaluatorResult + if err = p.Client_().Call(ctx, "PublishBuiltinEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluatorServiceClient) ListEvaluatorTags(ctx context.Context, req *ListEvaluatorTagsRequest) (r *ListEvaluatorTagsResponse, err error) { + var _args EvaluatorServiceListEvaluatorTagsArgs + _args.Req = req + var _result EvaluatorServiceListEvaluatorTagsResult + if err = p.Client_().Call(ctx, "ListEvaluatorTags", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +type EvaluatorServiceProcessor struct { + processorMap map[string]thrift.TProcessorFunction + handler EvaluatorService +} + +func (p *EvaluatorServiceProcessor) AddToProcessorMap(key string, processor thrift.TProcessorFunction) { + p.processorMap[key] = processor +} + +func (p *EvaluatorServiceProcessor) GetProcessorFunction(key string) (processor thrift.TProcessorFunction, ok bool) { + processor, ok = p.processorMap[key] + return processor, ok +} + +func (p *EvaluatorServiceProcessor) ProcessorMap() map[string]thrift.TProcessorFunction { + return p.processorMap +} + +func NewEvaluatorServiceProcessor(handler EvaluatorService) *EvaluatorServiceProcessor { + self := &EvaluatorServiceProcessor{handler: handler, processorMap: make(map[string]thrift.TProcessorFunction)} + self.AddToProcessorMap("ListEvaluators", &evaluatorServiceProcessorListEvaluators{handler: handler}) + self.AddToProcessorMap("BatchGetEvaluators", &evaluatorServiceProcessorBatchGetEvaluators{handler: handler}) + self.AddToProcessorMap("GetEvaluator", &evaluatorServiceProcessorGetEvaluator{handler: handler}) + self.AddToProcessorMap("CreateEvaluator", &evaluatorServiceProcessorCreateEvaluator{handler: handler}) + self.AddToProcessorMap("UpdateEvaluator", &evaluatorServiceProcessorUpdateEvaluator{handler: handler}) + self.AddToProcessorMap("UpdateEvaluatorDraft", &evaluatorServiceProcessorUpdateEvaluatorDraft{handler: handler}) + self.AddToProcessorMap("DeleteEvaluator", &evaluatorServiceProcessorDeleteEvaluator{handler: handler}) + self.AddToProcessorMap("CheckEvaluatorName", &evaluatorServiceProcessorCheckEvaluatorName{handler: handler}) + self.AddToProcessorMap("ListEvaluatorVersions", &evaluatorServiceProcessorListEvaluatorVersions{handler: handler}) + self.AddToProcessorMap("GetEvaluatorVersion", &evaluatorServiceProcessorGetEvaluatorVersion{handler: handler}) + self.AddToProcessorMap("BatchGetEvaluatorVersions", &evaluatorServiceProcessorBatchGetEvaluatorVersions{handler: handler}) + self.AddToProcessorMap("SubmitEvaluatorVersion", &evaluatorServiceProcessorSubmitEvaluatorVersion{handler: handler}) + self.AddToProcessorMap("ListTemplates", &evaluatorServiceProcessorListTemplates{handler: handler}) + self.AddToProcessorMap("GetTemplateInfo", &evaluatorServiceProcessorGetTemplateInfo{handler: handler}) + self.AddToProcessorMap("GetDefaultPromptEvaluatorTools", &evaluatorServiceProcessorGetDefaultPromptEvaluatorTools{handler: handler}) + self.AddToProcessorMap("RunEvaluator", &evaluatorServiceProcessorRunEvaluator{handler: handler}) + self.AddToProcessorMap("DebugEvaluator", &evaluatorServiceProcessorDebugEvaluator{handler: handler}) + self.AddToProcessorMap("BatchDebugEvaluator", &evaluatorServiceProcessorBatchDebugEvaluator{handler: handler}) + self.AddToProcessorMap("UpdateEvaluatorRecord", &evaluatorServiceProcessorUpdateEvaluatorRecord{handler: handler}) + self.AddToProcessorMap("GetEvaluatorRecord", &evaluatorServiceProcessorGetEvaluatorRecord{handler: handler}) + self.AddToProcessorMap("BatchGetEvaluatorRecords", &evaluatorServiceProcessorBatchGetEvaluatorRecords{handler: handler}) + self.AddToProcessorMap("ValidateEvaluator", &evaluatorServiceProcessorValidateEvaluator{handler: handler}) + self.AddToProcessorMap("ListTemplatesV2", &evaluatorServiceProcessorListTemplatesV2{handler: handler}) + self.AddToProcessorMap("CreateEvaluatorTemplate", &evaluatorServiceProcessorCreateEvaluatorTemplate{handler: handler}) + self.AddToProcessorMap("UpdateEvaluatorTemplate", &evaluatorServiceProcessorUpdateEvaluatorTemplate{handler: handler}) + self.AddToProcessorMap("DeleteEvaluatorTemplate", &evaluatorServiceProcessorDeleteEvaluatorTemplate{handler: handler}) + self.AddToProcessorMap("DebugBuiltinEvaluator", &evaluatorServiceProcessorDebugBuiltinEvaluator{handler: handler}) + self.AddToProcessorMap("PublishBuiltinEvaluator", &evaluatorServiceProcessorPublishBuiltinEvaluator{handler: handler}) + self.AddToProcessorMap("ListEvaluatorTags", &evaluatorServiceProcessorListEvaluatorTags{handler: handler}) + return self +} +func (p *EvaluatorServiceProcessor) Process(ctx context.Context, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + name, _, seqId, err := iprot.ReadMessageBegin() + if err != nil { + return false, err + } + if processor, ok := p.GetProcessorFunction(name); ok { + return processor.Process(ctx, seqId, iprot, oprot) + } + iprot.Skip(thrift.STRUCT) + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, "Unknown function "+name) + oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, x +} + +type evaluatorServiceProcessorListEvaluators struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorListEvaluators) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceListEvaluatorsArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("ListEvaluators", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceListEvaluatorsResult{} + var retval *ListEvaluatorsResponse + if retval, err2 = p.handler.ListEvaluators(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing ListEvaluators: "+err2.Error()) + oprot.WriteMessageBegin("ListEvaluators", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("ListEvaluators", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorBatchGetEvaluators struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorBatchGetEvaluators) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceBatchGetEvaluatorsArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("BatchGetEvaluators", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceBatchGetEvaluatorsResult{} + var retval *BatchGetEvaluatorsResponse + if retval, err2 = p.handler.BatchGetEvaluators(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing BatchGetEvaluators: "+err2.Error()) + oprot.WriteMessageBegin("BatchGetEvaluators", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("BatchGetEvaluators", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorGetEvaluator struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorGetEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceGetEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("GetEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceGetEvaluatorResult{} + var retval *GetEvaluatorResponse + if retval, err2 = p.handler.GetEvaluator(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("GetEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("GetEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorCreateEvaluator struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorCreateEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceCreateEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("CreateEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceCreateEvaluatorResult{} + var retval *CreateEvaluatorResponse + if retval, err2 = p.handler.CreateEvaluator(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing CreateEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("CreateEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("CreateEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorUpdateEvaluator struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorUpdateEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceUpdateEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("UpdateEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceUpdateEvaluatorResult{} + var retval *UpdateEvaluatorResponse + if retval, err2 = p.handler.UpdateEvaluator(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing UpdateEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("UpdateEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("UpdateEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorUpdateEvaluatorDraft struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorUpdateEvaluatorDraft) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceUpdateEvaluatorDraftArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("UpdateEvaluatorDraft", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceUpdateEvaluatorDraftResult{} + var retval *UpdateEvaluatorDraftResponse + if retval, err2 = p.handler.UpdateEvaluatorDraft(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing UpdateEvaluatorDraft: "+err2.Error()) + oprot.WriteMessageBegin("UpdateEvaluatorDraft", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("UpdateEvaluatorDraft", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorDeleteEvaluator struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorDeleteEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceDeleteEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("DeleteEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceDeleteEvaluatorResult{} + var retval *DeleteEvaluatorResponse + if retval, err2 = p.handler.DeleteEvaluator(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing DeleteEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("DeleteEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("DeleteEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorCheckEvaluatorName struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorCheckEvaluatorName) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceCheckEvaluatorNameArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("CheckEvaluatorName", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceCheckEvaluatorNameResult{} + var retval *CheckEvaluatorNameResponse + if retval, err2 = p.handler.CheckEvaluatorName(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing CheckEvaluatorName: "+err2.Error()) + oprot.WriteMessageBegin("CheckEvaluatorName", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("CheckEvaluatorName", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorListEvaluatorVersions struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorListEvaluatorVersions) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceListEvaluatorVersionsArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("ListEvaluatorVersions", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceListEvaluatorVersionsResult{} + var retval *ListEvaluatorVersionsResponse + if retval, err2 = p.handler.ListEvaluatorVersions(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing ListEvaluatorVersions: "+err2.Error()) + oprot.WriteMessageBegin("ListEvaluatorVersions", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("ListEvaluatorVersions", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorGetEvaluatorVersion struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorGetEvaluatorVersion) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceGetEvaluatorVersionArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("GetEvaluatorVersion", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceGetEvaluatorVersionResult{} + var retval *GetEvaluatorVersionResponse + if retval, err2 = p.handler.GetEvaluatorVersion(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetEvaluatorVersion: "+err2.Error()) + oprot.WriteMessageBegin("GetEvaluatorVersion", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("GetEvaluatorVersion", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorBatchGetEvaluatorVersions struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorBatchGetEvaluatorVersions) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceBatchGetEvaluatorVersionsArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("BatchGetEvaluatorVersions", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceBatchGetEvaluatorVersionsResult{} + var retval *BatchGetEvaluatorVersionsResponse + if retval, err2 = p.handler.BatchGetEvaluatorVersions(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing BatchGetEvaluatorVersions: "+err2.Error()) + oprot.WriteMessageBegin("BatchGetEvaluatorVersions", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("BatchGetEvaluatorVersions", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorSubmitEvaluatorVersion struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorSubmitEvaluatorVersion) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceSubmitEvaluatorVersionArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("SubmitEvaluatorVersion", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceSubmitEvaluatorVersionResult{} + var retval *SubmitEvaluatorVersionResponse + if retval, err2 = p.handler.SubmitEvaluatorVersion(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing SubmitEvaluatorVersion: "+err2.Error()) + oprot.WriteMessageBegin("SubmitEvaluatorVersion", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("SubmitEvaluatorVersion", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorListTemplates struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorListTemplates) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceListTemplatesArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("ListTemplates", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceListTemplatesResult{} + var retval *ListTemplatesResponse + if retval, err2 = p.handler.ListTemplates(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing ListTemplates: "+err2.Error()) + oprot.WriteMessageBegin("ListTemplates", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("ListTemplates", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorGetTemplateInfo struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorGetTemplateInfo) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceGetTemplateInfoArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("GetTemplateInfo", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceGetTemplateInfoResult{} + var retval *GetTemplateInfoResponse + if retval, err2 = p.handler.GetTemplateInfo(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetTemplateInfo: "+err2.Error()) + oprot.WriteMessageBegin("GetTemplateInfo", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("GetTemplateInfo", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorGetDefaultPromptEvaluatorTools struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorGetDefaultPromptEvaluatorTools) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("GetDefaultPromptEvaluatorTools", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceGetDefaultPromptEvaluatorToolsResult{} + var retval *GetDefaultPromptEvaluatorToolsResponse + if retval, err2 = p.handler.GetDefaultPromptEvaluatorTools(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetDefaultPromptEvaluatorTools: "+err2.Error()) + oprot.WriteMessageBegin("GetDefaultPromptEvaluatorTools", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("GetDefaultPromptEvaluatorTools", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorRunEvaluator struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorRunEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceRunEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("RunEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceRunEvaluatorResult{} + var retval *RunEvaluatorResponse + if retval, err2 = p.handler.RunEvaluator(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing RunEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("RunEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("RunEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorDebugEvaluator struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorDebugEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceDebugEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("DebugEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceDebugEvaluatorResult{} + var retval *DebugEvaluatorResponse + if retval, err2 = p.handler.DebugEvaluator(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing DebugEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("DebugEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("DebugEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorBatchDebugEvaluator struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorBatchDebugEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceBatchDebugEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("BatchDebugEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceBatchDebugEvaluatorResult{} + var retval *BatchDebugEvaluatorResponse + if retval, err2 = p.handler.BatchDebugEvaluator(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing BatchDebugEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("BatchDebugEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("BatchDebugEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorUpdateEvaluatorRecord struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorUpdateEvaluatorRecord) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceUpdateEvaluatorRecordArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("UpdateEvaluatorRecord", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceUpdateEvaluatorRecordResult{} + var retval *UpdateEvaluatorRecordResponse + if retval, err2 = p.handler.UpdateEvaluatorRecord(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing UpdateEvaluatorRecord: "+err2.Error()) + oprot.WriteMessageBegin("UpdateEvaluatorRecord", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("UpdateEvaluatorRecord", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorGetEvaluatorRecord struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorGetEvaluatorRecord) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceGetEvaluatorRecordArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("GetEvaluatorRecord", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceGetEvaluatorRecordResult{} + var retval *GetEvaluatorRecordResponse + if retval, err2 = p.handler.GetEvaluatorRecord(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetEvaluatorRecord: "+err2.Error()) + oprot.WriteMessageBegin("GetEvaluatorRecord", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("GetEvaluatorRecord", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorBatchGetEvaluatorRecords struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorBatchGetEvaluatorRecords) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceBatchGetEvaluatorRecordsArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("BatchGetEvaluatorRecords", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceBatchGetEvaluatorRecordsResult{} + var retval *BatchGetEvaluatorRecordsResponse + if retval, err2 = p.handler.BatchGetEvaluatorRecords(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing BatchGetEvaluatorRecords: "+err2.Error()) + oprot.WriteMessageBegin("BatchGetEvaluatorRecords", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("BatchGetEvaluatorRecords", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorValidateEvaluator struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorValidateEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceValidateEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("ValidateEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceValidateEvaluatorResult{} + var retval *ValidateEvaluatorResponse + if retval, err2 = p.handler.ValidateEvaluator(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing ValidateEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("ValidateEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("ValidateEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorListTemplatesV2 struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorListTemplatesV2) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceListTemplatesV2Args{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("ListTemplatesV2", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceListTemplatesV2Result{} + var retval *ListTemplatesV2Response + if retval, err2 = p.handler.ListTemplatesV2(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing ListTemplatesV2: "+err2.Error()) + oprot.WriteMessageBegin("ListTemplatesV2", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("ListTemplatesV2", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorCreateEvaluatorTemplate struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorCreateEvaluatorTemplate) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceCreateEvaluatorTemplateArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("CreateEvaluatorTemplate", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceCreateEvaluatorTemplateResult{} + var retval *CreateEvaluatorTemplateResponse + if retval, err2 = p.handler.CreateEvaluatorTemplate(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing CreateEvaluatorTemplate: "+err2.Error()) + oprot.WriteMessageBegin("CreateEvaluatorTemplate", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("CreateEvaluatorTemplate", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorUpdateEvaluatorTemplate struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorUpdateEvaluatorTemplate) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceUpdateEvaluatorTemplateArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("UpdateEvaluatorTemplate", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceUpdateEvaluatorTemplateResult{} + var retval *UpdateEvaluatorTemplateResponse + if retval, err2 = p.handler.UpdateEvaluatorTemplate(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing UpdateEvaluatorTemplate: "+err2.Error()) + oprot.WriteMessageBegin("UpdateEvaluatorTemplate", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("UpdateEvaluatorTemplate", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorDeleteEvaluatorTemplate struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorDeleteEvaluatorTemplate) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceDeleteEvaluatorTemplateArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("DeleteEvaluatorTemplate", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceDeleteEvaluatorTemplateResult{} + var retval *DeleteEvaluatorTemplateResponse + if retval, err2 = p.handler.DeleteEvaluatorTemplate(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing DeleteEvaluatorTemplate: "+err2.Error()) + oprot.WriteMessageBegin("DeleteEvaluatorTemplate", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("DeleteEvaluatorTemplate", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorDebugBuiltinEvaluator struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorDebugBuiltinEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceDebugBuiltinEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("DebugBuiltinEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceDebugBuiltinEvaluatorResult{} + var retval *DebugBuiltinEvaluatorResponse + if retval, err2 = p.handler.DebugBuiltinEvaluator(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing DebugBuiltinEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("DebugBuiltinEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("DebugBuiltinEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorPublishBuiltinEvaluator struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorPublishBuiltinEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServicePublishBuiltinEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("PublishBuiltinEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServicePublishBuiltinEvaluatorResult{} + var retval *PublishBuiltinEvaluatorResponse + if retval, err2 = p.handler.PublishBuiltinEvaluator(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing PublishBuiltinEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("PublishBuiltinEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("PublishBuiltinEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluatorServiceProcessorListEvaluatorTags struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorListEvaluatorTags) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceListEvaluatorTagsArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("ListEvaluatorTags", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceListEvaluatorTagsResult{} + var retval *ListEvaluatorTagsResponse + if retval, err2 = p.handler.ListEvaluatorTags(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing ListEvaluatorTags: "+err2.Error()) + oprot.WriteMessageBegin("ListEvaluatorTags", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("ListEvaluatorTags", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type EvaluatorServiceListEvaluatorsArgs struct { + Request *ListEvaluatorsRequest `thrift:"request,1" frugal:"1,default,ListEvaluatorsRequest"` +} + +func NewEvaluatorServiceListEvaluatorsArgs() *EvaluatorServiceListEvaluatorsArgs { + return &EvaluatorServiceListEvaluatorsArgs{} +} + +func (p *EvaluatorServiceListEvaluatorsArgs) InitDefault() { +} + +var EvaluatorServiceListEvaluatorsArgs_Request_DEFAULT *ListEvaluatorsRequest + +func (p *EvaluatorServiceListEvaluatorsArgs) GetRequest() (v *ListEvaluatorsRequest) { + if p == nil { + return + } + if !p.IsSetRequest() { + return EvaluatorServiceListEvaluatorsArgs_Request_DEFAULT + } + return p.Request +} +func (p *EvaluatorServiceListEvaluatorsArgs) SetRequest(val *ListEvaluatorsRequest) { + p.Request = val +} + +var fieldIDToName_EvaluatorServiceListEvaluatorsArgs = map[int16]string{ + 1: "request", +} + +func (p *EvaluatorServiceListEvaluatorsArgs) IsSetRequest() bool { + return p.Request != nil +} + +func (p *EvaluatorServiceListEvaluatorsArgs) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorsArgs[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceListEvaluatorsArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewListEvaluatorsRequest() + if err := _field.Read(iprot); err != nil { + return err + } + p.Request = _field + return nil +} + +func (p *EvaluatorServiceListEvaluatorsArgs) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("ListEvaluators_args"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorServiceListEvaluatorsArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.Request.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} + +func (p *EvaluatorServiceListEvaluatorsArgs) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorServiceListEvaluatorsArgs(%+v)", *p) + +} + +func (p *EvaluatorServiceListEvaluatorsArgs) DeepEqual(ano *EvaluatorServiceListEvaluatorsArgs) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Request) { + return false + } + return true +} + +func (p *EvaluatorServiceListEvaluatorsArgs) Field1DeepEqual(src *ListEvaluatorsRequest) bool { + + if !p.Request.DeepEqual(src) { + return false + } + return true +} + +type EvaluatorServiceListEvaluatorsResult struct { + Success *ListEvaluatorsResponse `thrift:"success,0,optional" frugal:"0,optional,ListEvaluatorsResponse"` +} + +func NewEvaluatorServiceListEvaluatorsResult() *EvaluatorServiceListEvaluatorsResult { + return &EvaluatorServiceListEvaluatorsResult{} +} + +func (p *EvaluatorServiceListEvaluatorsResult) InitDefault() { +} + +var EvaluatorServiceListEvaluatorsResult_Success_DEFAULT *ListEvaluatorsResponse + +func (p *EvaluatorServiceListEvaluatorsResult) GetSuccess() (v *ListEvaluatorsResponse) { + if p == nil { + return + } + if !p.IsSetSuccess() { + return EvaluatorServiceListEvaluatorsResult_Success_DEFAULT + } + return p.Success +} +func (p *EvaluatorServiceListEvaluatorsResult) SetSuccess(x interface{}) { + p.Success = x.(*ListEvaluatorsResponse) +} + +var fieldIDToName_EvaluatorServiceListEvaluatorsResult = map[int16]string{ + 0: "success", +} + +func (p *EvaluatorServiceListEvaluatorsResult) IsSetSuccess() bool { + return p.Success != nil +} + +func (p *EvaluatorServiceListEvaluatorsResult) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField0(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorsResult[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceListEvaluatorsResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewListEvaluatorsResponse() + if err := _field.Read(iprot); err != nil { + return err + } + p.Success = _field + return nil +} + +func (p *EvaluatorServiceListEvaluatorsResult) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("ListEvaluators_result"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField0(oprot); err != nil { + fieldId = 0 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorServiceListEvaluatorsResult) writeField0(oprot thrift.TProtocol) (err error) { + if p.IsSetSuccess() { + if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { + goto WriteFieldBeginError + } + if err := p.Success.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) +} + +func (p *EvaluatorServiceListEvaluatorsResult) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorServiceListEvaluatorsResult(%+v)", *p) + +} + +func (p *EvaluatorServiceListEvaluatorsResult) DeepEqual(ano *EvaluatorServiceListEvaluatorsResult) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field0DeepEqual(ano.Success) { + return false + } + return true +} + +func (p *EvaluatorServiceListEvaluatorsResult) Field0DeepEqual(src *ListEvaluatorsResponse) bool { + + if !p.Success.DeepEqual(src) { + return false + } + return true +} + +type EvaluatorServiceBatchGetEvaluatorsArgs struct { + Request *BatchGetEvaluatorsRequest `thrift:"request,1" frugal:"1,default,BatchGetEvaluatorsRequest"` +} + +func NewEvaluatorServiceBatchGetEvaluatorsArgs() *EvaluatorServiceBatchGetEvaluatorsArgs { + return &EvaluatorServiceBatchGetEvaluatorsArgs{} +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) InitDefault() { +} + +var EvaluatorServiceBatchGetEvaluatorsArgs_Request_DEFAULT *BatchGetEvaluatorsRequest + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) GetRequest() (v *BatchGetEvaluatorsRequest) { + if p == nil { + return + } + if !p.IsSetRequest() { + return EvaluatorServiceBatchGetEvaluatorsArgs_Request_DEFAULT + } + return p.Request +} +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) SetRequest(val *BatchGetEvaluatorsRequest) { + p.Request = val +} + +var fieldIDToName_EvaluatorServiceBatchGetEvaluatorsArgs = map[int16]string{ + 1: "request", +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) IsSetRequest() bool { + return p.Request != nil +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorsArgs[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewBatchGetEvaluatorsRequest() + if err := _field.Read(iprot); err != nil { + return err + } + p.Request = _field + return nil +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("BatchGetEvaluators_args"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.Request.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorsArgs(%+v)", *p) + +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorsArgs) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Request) { + return false + } + return true +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) Field1DeepEqual(src *BatchGetEvaluatorsRequest) bool { + + if !p.Request.DeepEqual(src) { + return false + } + return true +} + +type EvaluatorServiceBatchGetEvaluatorsResult struct { + Success *BatchGetEvaluatorsResponse `thrift:"success,0,optional" frugal:"0,optional,BatchGetEvaluatorsResponse"` +} + +func NewEvaluatorServiceBatchGetEvaluatorsResult() *EvaluatorServiceBatchGetEvaluatorsResult { + return &EvaluatorServiceBatchGetEvaluatorsResult{} +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) InitDefault() { +} + +var EvaluatorServiceBatchGetEvaluatorsResult_Success_DEFAULT *BatchGetEvaluatorsResponse + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) GetSuccess() (v *BatchGetEvaluatorsResponse) { + if p == nil { + return + } + if !p.IsSetSuccess() { + return EvaluatorServiceBatchGetEvaluatorsResult_Success_DEFAULT + } + return p.Success +} +func (p *EvaluatorServiceBatchGetEvaluatorsResult) SetSuccess(x interface{}) { + p.Success = x.(*BatchGetEvaluatorsResponse) +} + +var fieldIDToName_EvaluatorServiceBatchGetEvaluatorsResult = map[int16]string{ + 0: "success", +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) IsSetSuccess() bool { + return p.Success != nil +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField0(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorsResult[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewBatchGetEvaluatorsResponse() + if err := _field.Read(iprot); err != nil { + return err + } + p.Success = _field + return nil +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("BatchGetEvaluators_result"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField0(oprot); err != nil { + fieldId = 0 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) writeField0(oprot thrift.TProtocol) (err error) { + if p.IsSetSuccess() { + if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { + goto WriteFieldBeginError + } + if err := p.Success.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorsResult(%+v)", *p) + +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorsResult) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field0DeepEqual(ano.Success) { + return false + } + return true +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) Field0DeepEqual(src *BatchGetEvaluatorsResponse) bool { + + if !p.Success.DeepEqual(src) { + return false + } + return true +} + +type EvaluatorServiceGetEvaluatorArgs struct { + Request *GetEvaluatorRequest `thrift:"request,1" frugal:"1,default,GetEvaluatorRequest"` +} + +func NewEvaluatorServiceGetEvaluatorArgs() *EvaluatorServiceGetEvaluatorArgs { + return &EvaluatorServiceGetEvaluatorArgs{} +} + +func (p *EvaluatorServiceGetEvaluatorArgs) InitDefault() { +} + +var EvaluatorServiceGetEvaluatorArgs_Request_DEFAULT *GetEvaluatorRequest + +func (p *EvaluatorServiceGetEvaluatorArgs) GetRequest() (v *GetEvaluatorRequest) { + if p == nil { + return + } + if !p.IsSetRequest() { + return EvaluatorServiceGetEvaluatorArgs_Request_DEFAULT + } + return p.Request +} +func (p *EvaluatorServiceGetEvaluatorArgs) SetRequest(val *GetEvaluatorRequest) { + p.Request = val +} + +var fieldIDToName_EvaluatorServiceGetEvaluatorArgs = map[int16]string{ + 1: "request", +} + +func (p *EvaluatorServiceGetEvaluatorArgs) IsSetRequest() bool { + return p.Request != nil +} + +func (p *EvaluatorServiceGetEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorArgs[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceGetEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewGetEvaluatorRequest() + if err := _field.Read(iprot); err != nil { + return err + } + p.Request = _field + return nil +} + +func (p *EvaluatorServiceGetEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("GetEvaluator_args"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorServiceGetEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.Request.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} + +func (p *EvaluatorServiceGetEvaluatorArgs) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorServiceGetEvaluatorArgs(%+v)", *p) + +} + +func (p *EvaluatorServiceGetEvaluatorArgs) DeepEqual(ano *EvaluatorServiceGetEvaluatorArgs) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Request) { + return false + } + return true +} + +func (p *EvaluatorServiceGetEvaluatorArgs) Field1DeepEqual(src *GetEvaluatorRequest) bool { + + if !p.Request.DeepEqual(src) { + return false + } + return true +} + +type EvaluatorServiceGetEvaluatorResult struct { + Success *GetEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,GetEvaluatorResponse"` +} + +func NewEvaluatorServiceGetEvaluatorResult() *EvaluatorServiceGetEvaluatorResult { + return &EvaluatorServiceGetEvaluatorResult{} +} + +func (p *EvaluatorServiceGetEvaluatorResult) InitDefault() { +} + +var EvaluatorServiceGetEvaluatorResult_Success_DEFAULT *GetEvaluatorResponse + +func (p *EvaluatorServiceGetEvaluatorResult) GetSuccess() (v *GetEvaluatorResponse) { + if p == nil { + return + } + if !p.IsSetSuccess() { + return EvaluatorServiceGetEvaluatorResult_Success_DEFAULT + } + return p.Success +} +func (p *EvaluatorServiceGetEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*GetEvaluatorResponse) +} + +var fieldIDToName_EvaluatorServiceGetEvaluatorResult = map[int16]string{ + 0: "success", +} + +func (p *EvaluatorServiceGetEvaluatorResult) IsSetSuccess() bool { + return p.Success != nil +} + +func (p *EvaluatorServiceGetEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField0(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorResult[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceGetEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewGetEvaluatorResponse() + if err := _field.Read(iprot); err != nil { + return err + } + p.Success = _field + return nil +} + +func (p *EvaluatorServiceGetEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("GetEvaluator_result"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField0(oprot); err != nil { + fieldId = 0 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceClient) BatchDebugEvaluator(ctx context.Context, req *BatchDebugEvaluatorRequest) (r *BatchDebugEvaluatorResponse, err error) { - var _args EvaluatorServiceBatchDebugEvaluatorArgs - _args.Req = req - var _result EvaluatorServiceBatchDebugEvaluatorResult - if err = p.Client_().Call(ctx, "BatchDebugEvaluator", &_args, &_result); err != nil { - return + +func (p *EvaluatorServiceGetEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { + if p.IsSetSuccess() { + if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { + goto WriteFieldBeginError + } + if err := p.Success.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } } - return _result.GetSuccess(), nil + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceClient) UpdateEvaluatorRecord(ctx context.Context, req *UpdateEvaluatorRecordRequest) (r *UpdateEvaluatorRecordResponse, err error) { - var _args EvaluatorServiceUpdateEvaluatorRecordArgs - _args.Req = req - var _result EvaluatorServiceUpdateEvaluatorRecordResult - if err = p.Client_().Call(ctx, "UpdateEvaluatorRecord", &_args, &_result); err != nil { - return + +func (p *EvaluatorServiceGetEvaluatorResult) String() string { + if p == nil { + return "" } - return _result.GetSuccess(), nil + return fmt.Sprintf("EvaluatorServiceGetEvaluatorResult(%+v)", *p) + } -func (p *EvaluatorServiceClient) GetEvaluatorRecord(ctx context.Context, req *GetEvaluatorRecordRequest) (r *GetEvaluatorRecordResponse, err error) { - var _args EvaluatorServiceGetEvaluatorRecordArgs - _args.Req = req - var _result EvaluatorServiceGetEvaluatorRecordResult - if err = p.Client_().Call(ctx, "GetEvaluatorRecord", &_args, &_result); err != nil { - return + +func (p *EvaluatorServiceGetEvaluatorResult) DeepEqual(ano *EvaluatorServiceGetEvaluatorResult) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - return _result.GetSuccess(), nil + if !p.Field0DeepEqual(ano.Success) { + return false + } + return true } -func (p *EvaluatorServiceClient) BatchGetEvaluatorRecords(ctx context.Context, req *BatchGetEvaluatorRecordsRequest) (r *BatchGetEvaluatorRecordsResponse, err error) { - var _args EvaluatorServiceBatchGetEvaluatorRecordsArgs - _args.Req = req - var _result EvaluatorServiceBatchGetEvaluatorRecordsResult - if err = p.Client_().Call(ctx, "BatchGetEvaluatorRecords", &_args, &_result); err != nil { - return + +func (p *EvaluatorServiceGetEvaluatorResult) Field0DeepEqual(src *GetEvaluatorResponse) bool { + + if !p.Success.DeepEqual(src) { + return false } - return _result.GetSuccess(), nil + return true } -func (p *EvaluatorServiceClient) ValidateEvaluator(ctx context.Context, request *ValidateEvaluatorRequest) (r *ValidateEvaluatorResponse, err error) { - var _args EvaluatorServiceValidateEvaluatorArgs - _args.Request = request - var _result EvaluatorServiceValidateEvaluatorResult - if err = p.Client_().Call(ctx, "ValidateEvaluator", &_args, &_result); err != nil { + +type EvaluatorServiceCreateEvaluatorArgs struct { + Request *CreateEvaluatorRequest `thrift:"request,1" frugal:"1,default,CreateEvaluatorRequest"` +} + +func NewEvaluatorServiceCreateEvaluatorArgs() *EvaluatorServiceCreateEvaluatorArgs { + return &EvaluatorServiceCreateEvaluatorArgs{} +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) InitDefault() { +} + +var EvaluatorServiceCreateEvaluatorArgs_Request_DEFAULT *CreateEvaluatorRequest + +func (p *EvaluatorServiceCreateEvaluatorArgs) GetRequest() (v *CreateEvaluatorRequest) { + if p == nil { return } - return _result.GetSuccess(), nil + if !p.IsSetRequest() { + return EvaluatorServiceCreateEvaluatorArgs_Request_DEFAULT + } + return p.Request +} +func (p *EvaluatorServiceCreateEvaluatorArgs) SetRequest(val *CreateEvaluatorRequest) { + p.Request = val +} + +var fieldIDToName_EvaluatorServiceCreateEvaluatorArgs = map[int16]string{ + 1: "request", +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) IsSetRequest() bool { + return p.Request != nil +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorArgs[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewCreateEvaluatorRequest() + if err := _field.Read(iprot); err != nil { + return err + } + p.Request = _field + return nil +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("CreateEvaluator_args"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.Request.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorServiceCreateEvaluatorArgs(%+v)", *p) + +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) DeepEqual(ano *EvaluatorServiceCreateEvaluatorArgs) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Request) { + return false + } + return true +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) Field1DeepEqual(src *CreateEvaluatorRequest) bool { + + if !p.Request.DeepEqual(src) { + return false + } + return true } -type EvaluatorServiceProcessor struct { - processorMap map[string]thrift.TProcessorFunction - handler EvaluatorService +type EvaluatorServiceCreateEvaluatorResult struct { + Success *CreateEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,CreateEvaluatorResponse"` } -func (p *EvaluatorServiceProcessor) AddToProcessorMap(key string, processor thrift.TProcessorFunction) { - p.processorMap[key] = processor +func NewEvaluatorServiceCreateEvaluatorResult() *EvaluatorServiceCreateEvaluatorResult { + return &EvaluatorServiceCreateEvaluatorResult{} } -func (p *EvaluatorServiceProcessor) GetProcessorFunction(key string) (processor thrift.TProcessorFunction, ok bool) { - processor, ok = p.processorMap[key] - return processor, ok +func (p *EvaluatorServiceCreateEvaluatorResult) InitDefault() { } -func (p *EvaluatorServiceProcessor) ProcessorMap() map[string]thrift.TProcessorFunction { - return p.processorMap -} +var EvaluatorServiceCreateEvaluatorResult_Success_DEFAULT *CreateEvaluatorResponse -func NewEvaluatorServiceProcessor(handler EvaluatorService) *EvaluatorServiceProcessor { - self := &EvaluatorServiceProcessor{handler: handler, processorMap: make(map[string]thrift.TProcessorFunction)} - self.AddToProcessorMap("ListEvaluators", &evaluatorServiceProcessorListEvaluators{handler: handler}) - self.AddToProcessorMap("BatchGetEvaluators", &evaluatorServiceProcessorBatchGetEvaluators{handler: handler}) - self.AddToProcessorMap("GetEvaluator", &evaluatorServiceProcessorGetEvaluator{handler: handler}) - self.AddToProcessorMap("CreateEvaluator", &evaluatorServiceProcessorCreateEvaluator{handler: handler}) - self.AddToProcessorMap("UpdateEvaluator", &evaluatorServiceProcessorUpdateEvaluator{handler: handler}) - self.AddToProcessorMap("UpdateEvaluatorDraft", &evaluatorServiceProcessorUpdateEvaluatorDraft{handler: handler}) - self.AddToProcessorMap("DeleteEvaluator", &evaluatorServiceProcessorDeleteEvaluator{handler: handler}) - self.AddToProcessorMap("CheckEvaluatorName", &evaluatorServiceProcessorCheckEvaluatorName{handler: handler}) - self.AddToProcessorMap("ListEvaluatorVersions", &evaluatorServiceProcessorListEvaluatorVersions{handler: handler}) - self.AddToProcessorMap("GetEvaluatorVersion", &evaluatorServiceProcessorGetEvaluatorVersion{handler: handler}) - self.AddToProcessorMap("BatchGetEvaluatorVersions", &evaluatorServiceProcessorBatchGetEvaluatorVersions{handler: handler}) - self.AddToProcessorMap("SubmitEvaluatorVersion", &evaluatorServiceProcessorSubmitEvaluatorVersion{handler: handler}) - self.AddToProcessorMap("ListTemplates", &evaluatorServiceProcessorListTemplates{handler: handler}) - self.AddToProcessorMap("GetTemplateInfo", &evaluatorServiceProcessorGetTemplateInfo{handler: handler}) - self.AddToProcessorMap("GetDefaultPromptEvaluatorTools", &evaluatorServiceProcessorGetDefaultPromptEvaluatorTools{handler: handler}) - self.AddToProcessorMap("RunEvaluator", &evaluatorServiceProcessorRunEvaluator{handler: handler}) - self.AddToProcessorMap("DebugEvaluator", &evaluatorServiceProcessorDebugEvaluator{handler: handler}) - self.AddToProcessorMap("BatchDebugEvaluator", &evaluatorServiceProcessorBatchDebugEvaluator{handler: handler}) - self.AddToProcessorMap("UpdateEvaluatorRecord", &evaluatorServiceProcessorUpdateEvaluatorRecord{handler: handler}) - self.AddToProcessorMap("GetEvaluatorRecord", &evaluatorServiceProcessorGetEvaluatorRecord{handler: handler}) - self.AddToProcessorMap("BatchGetEvaluatorRecords", &evaluatorServiceProcessorBatchGetEvaluatorRecords{handler: handler}) - self.AddToProcessorMap("ValidateEvaluator", &evaluatorServiceProcessorValidateEvaluator{handler: handler}) - return self -} -func (p *EvaluatorServiceProcessor) Process(ctx context.Context, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - name, _, seqId, err := iprot.ReadMessageBegin() - if err != nil { - return false, err +func (p *EvaluatorServiceCreateEvaluatorResult) GetSuccess() (v *CreateEvaluatorResponse) { + if p == nil { + return } - if processor, ok := p.GetProcessorFunction(name); ok { - return processor.Process(ctx, seqId, iprot, oprot) + if !p.IsSetSuccess() { + return EvaluatorServiceCreateEvaluatorResult_Success_DEFAULT } - iprot.Skip(thrift.STRUCT) - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, "Unknown function "+name) - oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, x + return p.Success } - -type evaluatorServiceProcessorListEvaluators struct { - handler EvaluatorService +func (p *EvaluatorServiceCreateEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*CreateEvaluatorResponse) } -func (p *evaluatorServiceProcessorListEvaluators) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceListEvaluatorsArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("ListEvaluators", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err - } - - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceListEvaluatorsResult{} - var retval *ListEvaluatorsResponse - if retval, err2 = p.handler.ListEvaluators(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing ListEvaluators: "+err2.Error()) - oprot.WriteMessageBegin("ListEvaluators", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("ListEvaluators", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 - } - if err != nil { - return - } - return true, err +var fieldIDToName_EvaluatorServiceCreateEvaluatorResult = map[int16]string{ + 0: "success", } -type evaluatorServiceProcessorBatchGetEvaluators struct { - handler EvaluatorService +func (p *EvaluatorServiceCreateEvaluatorResult) IsSetSuccess() bool { + return p.Success != nil } -func (p *evaluatorServiceProcessorBatchGetEvaluators) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceBatchGetEvaluatorsArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("BatchGetEvaluators", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err - } +func (p *EvaluatorServiceCreateEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceBatchGetEvaluatorsResult{} - var retval *BatchGetEvaluatorsResponse - if retval, err2 = p.handler.BatchGetEvaluators(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing BatchGetEvaluators: "+err2.Error()) - oprot.WriteMessageBegin("BatchGetEvaluators", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("BatchGetEvaluators", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField0(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } } - if err != nil { - return + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError } - return true, err -} -type evaluatorServiceProcessorGetEvaluator struct { - handler EvaluatorService + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorResult[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *evaluatorServiceProcessorGetEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceGetEvaluatorArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("GetEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceCreateEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewCreateEvaluatorResponse() + if err := _field.Read(iprot); err != nil { + return err } + p.Success = _field + return nil +} - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceGetEvaluatorResult{} - var retval *GetEvaluatorResponse - if retval, err2 = p.handler.GetEvaluator(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetEvaluator: "+err2.Error()) - oprot.WriteMessageBegin("GetEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("GetEvaluator", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 +func (p *EvaluatorServiceCreateEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("CreateEvaluator_result"); err != nil { + goto WriteStructBeginError } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + if p != nil { + if err = p.writeField0(oprot); err != nil { + fieldId = 0 + goto WriteFieldError + } } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError } - if err != nil { - return + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError } - return true, err + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -type evaluatorServiceProcessorCreateEvaluator struct { - handler EvaluatorService +func (p *EvaluatorServiceCreateEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { + if p.IsSetSuccess() { + if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { + goto WriteFieldBeginError + } + if err := p.Success.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *evaluatorServiceProcessorCreateEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceCreateEvaluatorArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("CreateEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceCreateEvaluatorResult) String() string { + if p == nil { + return "" } + return fmt.Sprintf("EvaluatorServiceCreateEvaluatorResult(%+v)", *p) - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceCreateEvaluatorResult{} - var retval *CreateEvaluatorResponse - if retval, err2 = p.handler.CreateEvaluator(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing CreateEvaluator: "+err2.Error()) - oprot.WriteMessageBegin("CreateEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("CreateEvaluator", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 +} + +func (p *EvaluatorServiceCreateEvaluatorResult) DeepEqual(ano *EvaluatorServiceCreateEvaluatorResult) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if !p.Field0DeepEqual(ano.Success) { + return false } - if err != nil { - return + return true +} + +func (p *EvaluatorServiceCreateEvaluatorResult) Field0DeepEqual(src *CreateEvaluatorResponse) bool { + + if !p.Success.DeepEqual(src) { + return false } - return true, err + return true } -type evaluatorServiceProcessorUpdateEvaluator struct { - handler EvaluatorService +type EvaluatorServiceUpdateEvaluatorArgs struct { + Request *UpdateEvaluatorRequest `thrift:"request,1" frugal:"1,default,UpdateEvaluatorRequest"` } -func (p *evaluatorServiceProcessorUpdateEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceUpdateEvaluatorArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("UpdateEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err - } +func NewEvaluatorServiceUpdateEvaluatorArgs() *EvaluatorServiceUpdateEvaluatorArgs { + return &EvaluatorServiceUpdateEvaluatorArgs{} +} - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceUpdateEvaluatorResult{} - var retval *UpdateEvaluatorResponse - if retval, err2 = p.handler.UpdateEvaluator(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing UpdateEvaluator: "+err2.Error()) - oprot.WriteMessageBegin("UpdateEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("UpdateEvaluator", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 - } - if err != nil { +func (p *EvaluatorServiceUpdateEvaluatorArgs) InitDefault() { +} + +var EvaluatorServiceUpdateEvaluatorArgs_Request_DEFAULT *UpdateEvaluatorRequest + +func (p *EvaluatorServiceUpdateEvaluatorArgs) GetRequest() (v *UpdateEvaluatorRequest) { + if p == nil { return } - return true, err + if !p.IsSetRequest() { + return EvaluatorServiceUpdateEvaluatorArgs_Request_DEFAULT + } + return p.Request +} +func (p *EvaluatorServiceUpdateEvaluatorArgs) SetRequest(val *UpdateEvaluatorRequest) { + p.Request = val } -type evaluatorServiceProcessorUpdateEvaluatorDraft struct { - handler EvaluatorService +var fieldIDToName_EvaluatorServiceUpdateEvaluatorArgs = map[int16]string{ + 1: "request", } -func (p *evaluatorServiceProcessorUpdateEvaluatorDraft) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceUpdateEvaluatorDraftArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("UpdateEvaluatorDraft", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceUpdateEvaluatorArgs) IsSetRequest() bool { + return p.Request != nil +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError } - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceUpdateEvaluatorDraftResult{} - var retval *UpdateEvaluatorDraftResponse - if retval, err2 = p.handler.UpdateEvaluatorDraft(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing UpdateEvaluatorDraft: "+err2.Error()) - oprot.WriteMessageBegin("UpdateEvaluatorDraft", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } } - if err2 = oprot.WriteMessageBegin("UpdateEvaluatorDraft", thrift.REPLY, seqId); err2 != nil { - err = err2 + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorArgs[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewUpdateEvaluatorRequest() + if err := _field.Read(iprot); err != nil { + return err } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + p.Request = _field + return nil +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("UpdateEvaluator_args"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError } - if err != nil { - return + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError } - return true, err -} - -type evaluatorServiceProcessorDeleteEvaluator struct { - handler EvaluatorService + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *evaluatorServiceProcessorDeleteEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceDeleteEvaluatorArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("DeleteEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceUpdateEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError } - - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceDeleteEvaluatorResult{} - var retval *DeleteEvaluatorResponse - if retval, err2 = p.handler.DeleteEvaluator(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing DeleteEvaluator: "+err2.Error()) - oprot.WriteMessageBegin("DeleteEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval + if err := p.Request.Write(oprot); err != nil { + return err } - if err2 = oprot.WriteMessageBegin("DeleteEvaluator", thrift.REPLY, seqId); err2 != nil { - err = err2 + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) String() string { + if p == nil { + return "" } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorArgs(%+v)", *p) + +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorArgs) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if !p.Field1DeepEqual(ano.Request) { + return false } - if err != nil { - return + return true +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) Field1DeepEqual(src *UpdateEvaluatorRequest) bool { + + if !p.Request.DeepEqual(src) { + return false } - return true, err + return true } -type evaluatorServiceProcessorCheckEvaluatorName struct { - handler EvaluatorService +type EvaluatorServiceUpdateEvaluatorResult struct { + Success *UpdateEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,UpdateEvaluatorResponse"` } -func (p *evaluatorServiceProcessorCheckEvaluatorName) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceCheckEvaluatorNameArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("CheckEvaluatorName", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err - } +func NewEvaluatorServiceUpdateEvaluatorResult() *EvaluatorServiceUpdateEvaluatorResult { + return &EvaluatorServiceUpdateEvaluatorResult{} +} - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceCheckEvaluatorNameResult{} - var retval *CheckEvaluatorNameResponse - if retval, err2 = p.handler.CheckEvaluatorName(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing CheckEvaluatorName: "+err2.Error()) - oprot.WriteMessageBegin("CheckEvaluatorName", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("CheckEvaluatorName", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 - } - if err != nil { +func (p *EvaluatorServiceUpdateEvaluatorResult) InitDefault() { +} + +var EvaluatorServiceUpdateEvaluatorResult_Success_DEFAULT *UpdateEvaluatorResponse + +func (p *EvaluatorServiceUpdateEvaluatorResult) GetSuccess() (v *UpdateEvaluatorResponse) { + if p == nil { return } - return true, err + if !p.IsSetSuccess() { + return EvaluatorServiceUpdateEvaluatorResult_Success_DEFAULT + } + return p.Success +} +func (p *EvaluatorServiceUpdateEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*UpdateEvaluatorResponse) } -type evaluatorServiceProcessorListEvaluatorVersions struct { - handler EvaluatorService +var fieldIDToName_EvaluatorServiceUpdateEvaluatorResult = map[int16]string{ + 0: "success", } -func (p *evaluatorServiceProcessorListEvaluatorVersions) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceListEvaluatorVersionsArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("ListEvaluatorVersions", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceUpdateEvaluatorResult) IsSetSuccess() bool { + return p.Success != nil +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError } - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceListEvaluatorVersionsResult{} - var retval *ListEvaluatorVersionsResponse - if retval, err2 = p.handler.ListEvaluatorVersions(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing ListEvaluatorVersions: "+err2.Error()) - oprot.WriteMessageBegin("ListEvaluatorVersions", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField0(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } } - if err2 = oprot.WriteMessageBegin("ListEvaluatorVersions", thrift.REPLY, seqId); err2 != nil { - err = err2 + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorResult[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewUpdateEvaluatorResponse() + if err := _field.Read(iprot); err != nil { + return err + } + p.Success = _field + return nil +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("UpdateEvaluator_result"); err != nil { + goto WriteStructBeginError } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + if p != nil { + if err = p.writeField0(oprot); err != nil { + fieldId = 0 + goto WriteFieldError + } } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError } - if err != nil { - return + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError } - return true, err + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -type evaluatorServiceProcessorGetEvaluatorVersion struct { - handler EvaluatorService +func (p *EvaluatorServiceUpdateEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { + if p.IsSetSuccess() { + if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { + goto WriteFieldBeginError + } + if err := p.Success.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *evaluatorServiceProcessorGetEvaluatorVersion) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceGetEvaluatorVersionArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("GetEvaluatorVersion", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceUpdateEvaluatorResult) String() string { + if p == nil { + return "" } + return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorResult(%+v)", *p) - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceGetEvaluatorVersionResult{} - var retval *GetEvaluatorVersionResponse - if retval, err2 = p.handler.GetEvaluatorVersion(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetEvaluatorVersion: "+err2.Error()) - oprot.WriteMessageBegin("GetEvaluatorVersion", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("GetEvaluatorVersion", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorResult) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if !p.Field0DeepEqual(ano.Success) { + return false } - if err != nil { - return + return true +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) Field0DeepEqual(src *UpdateEvaluatorResponse) bool { + + if !p.Success.DeepEqual(src) { + return false } - return true, err + return true } -type evaluatorServiceProcessorBatchGetEvaluatorVersions struct { - handler EvaluatorService +type EvaluatorServiceUpdateEvaluatorDraftArgs struct { + Request *UpdateEvaluatorDraftRequest `thrift:"request,1" frugal:"1,default,UpdateEvaluatorDraftRequest"` } -func (p *evaluatorServiceProcessorBatchGetEvaluatorVersions) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceBatchGetEvaluatorVersionsArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("BatchGetEvaluatorVersions", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err - } +func NewEvaluatorServiceUpdateEvaluatorDraftArgs() *EvaluatorServiceUpdateEvaluatorDraftArgs { + return &EvaluatorServiceUpdateEvaluatorDraftArgs{} +} - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceBatchGetEvaluatorVersionsResult{} - var retval *BatchGetEvaluatorVersionsResponse - if retval, err2 = p.handler.BatchGetEvaluatorVersions(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing BatchGetEvaluatorVersions: "+err2.Error()) - oprot.WriteMessageBegin("BatchGetEvaluatorVersions", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("BatchGetEvaluatorVersions", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 - } - if err != nil { +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) InitDefault() { +} + +var EvaluatorServiceUpdateEvaluatorDraftArgs_Request_DEFAULT *UpdateEvaluatorDraftRequest + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) GetRequest() (v *UpdateEvaluatorDraftRequest) { + if p == nil { return } - return true, err + if !p.IsSetRequest() { + return EvaluatorServiceUpdateEvaluatorDraftArgs_Request_DEFAULT + } + return p.Request +} +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) SetRequest(val *UpdateEvaluatorDraftRequest) { + p.Request = val } -type evaluatorServiceProcessorSubmitEvaluatorVersion struct { - handler EvaluatorService +var fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftArgs = map[int16]string{ + 1: "request", } -func (p *evaluatorServiceProcessorSubmitEvaluatorVersion) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceSubmitEvaluatorVersionArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("SubmitEvaluatorVersion", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err - } +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) IsSetRequest() bool { + return p.Request != nil +} - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceSubmitEvaluatorVersionResult{} - var retval *SubmitEvaluatorVersionResponse - if retval, err2 = p.handler.SubmitEvaluatorVersion(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing SubmitEvaluatorVersion: "+err2.Error()) - oprot.WriteMessageBegin("SubmitEvaluatorVersion", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("SubmitEvaluatorVersion", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } } - if err != nil { - return + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError } - return true, err + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftArgs[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -type evaluatorServiceProcessorListTemplates struct { - handler EvaluatorService +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewUpdateEvaluatorDraftRequest() + if err := _field.Read(iprot); err != nil { + return err + } + p.Request = _field + return nil } -func (p *evaluatorServiceProcessorListTemplates) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceListTemplatesArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("ListTemplates", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("UpdateEvaluatorDraft_args"); err != nil { + goto WriteStructBeginError } - - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceListTemplatesResult{} - var retval *ListTemplatesResponse - if retval, err2 = p.handler.ListTemplates(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing ListTemplates: "+err2.Error()) - oprot.WriteMessageBegin("ListTemplates", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } } - if err2 = oprot.WriteMessageBegin("ListTemplates", thrift.REPLY, seqId); err2 != nil { - err = err2 + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if err := p.Request.Write(oprot); err != nil { + return err } - if err != nil { - return + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError } - return true, err -} - -type evaluatorServiceProcessorGetTemplateInfo struct { - handler EvaluatorService + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *evaluatorServiceProcessorGetTemplateInfo) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceGetTemplateInfoArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("GetTemplateInfo", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) String() string { + if p == nil { + return "" } + return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorDraftArgs(%+v)", *p) - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceGetTemplateInfoResult{} - var retval *GetTemplateInfoResponse - if retval, err2 = p.handler.GetTemplateInfo(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetTemplateInfo: "+err2.Error()) - oprot.WriteMessageBegin("GetTemplateInfo", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("GetTemplateInfo", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorDraftArgs) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if !p.Field1DeepEqual(ano.Request) { + return false } - if err != nil { - return + return true +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) Field1DeepEqual(src *UpdateEvaluatorDraftRequest) bool { + + if !p.Request.DeepEqual(src) { + return false } - return true, err + return true } -type evaluatorServiceProcessorGetDefaultPromptEvaluatorTools struct { - handler EvaluatorService +type EvaluatorServiceUpdateEvaluatorDraftResult struct { + Success *UpdateEvaluatorDraftResponse `thrift:"success,0,optional" frugal:"0,optional,UpdateEvaluatorDraftResponse"` } -func (p *evaluatorServiceProcessorGetDefaultPromptEvaluatorTools) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("GetDefaultPromptEvaluatorTools", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err - } +func NewEvaluatorServiceUpdateEvaluatorDraftResult() *EvaluatorServiceUpdateEvaluatorDraftResult { + return &EvaluatorServiceUpdateEvaluatorDraftResult{} +} - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceGetDefaultPromptEvaluatorToolsResult{} - var retval *GetDefaultPromptEvaluatorToolsResponse - if retval, err2 = p.handler.GetDefaultPromptEvaluatorTools(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetDefaultPromptEvaluatorTools: "+err2.Error()) - oprot.WriteMessageBegin("GetDefaultPromptEvaluatorTools", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("GetDefaultPromptEvaluatorTools", thrift.REPLY, seqId); err2 != nil { - err = err2 +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) InitDefault() { +} + +var EvaluatorServiceUpdateEvaluatorDraftResult_Success_DEFAULT *UpdateEvaluatorDraftResponse + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) GetSuccess() (v *UpdateEvaluatorDraftResponse) { + if p == nil { + return } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + if !p.IsSetSuccess() { + return EvaluatorServiceUpdateEvaluatorDraftResult_Success_DEFAULT } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + return p.Success +} +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) SetSuccess(x interface{}) { + p.Success = x.(*UpdateEvaluatorDraftResponse) +} + +var fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftResult = map[int16]string{ + 0: "success", +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) IsSetSuccess() bool { + return p.Success != nil +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField0(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } } - if err != nil { - return + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError } - return true, err -} -type evaluatorServiceProcessorRunEvaluator struct { - handler EvaluatorService + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftResult[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *evaluatorServiceProcessorRunEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceRunEvaluatorArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("RunEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewUpdateEvaluatorDraftResponse() + if err := _field.Read(iprot); err != nil { + return err } + p.Success = _field + return nil +} - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceRunEvaluatorResult{} - var retval *RunEvaluatorResponse - if retval, err2 = p.handler.RunEvaluator(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing RunEvaluator: "+err2.Error()) - oprot.WriteMessageBegin("RunEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("RunEvaluator", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("UpdateEvaluatorDraft_result"); err != nil { + goto WriteStructBeginError } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + if p != nil { + if err = p.writeField0(oprot); err != nil { + fieldId = 0 + goto WriteFieldError + } } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError } - if err != nil { - return + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError } - return true, err + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -type evaluatorServiceProcessorDebugEvaluator struct { - handler EvaluatorService +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) writeField0(oprot thrift.TProtocol) (err error) { + if p.IsSetSuccess() { + if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { + goto WriteFieldBeginError + } + if err := p.Success.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *evaluatorServiceProcessorDebugEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceDebugEvaluatorArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("DebugEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) String() string { + if p == nil { + return "" } + return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorDraftResult(%+v)", *p) - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceDebugEvaluatorResult{} - var retval *DebugEvaluatorResponse - if retval, err2 = p.handler.DebugEvaluator(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing DebugEvaluator: "+err2.Error()) - oprot.WriteMessageBegin("DebugEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("DebugEvaluator", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorDraftResult) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + if !p.Field0DeepEqual(ano.Success) { + return false } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + return true +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) Field0DeepEqual(src *UpdateEvaluatorDraftResponse) bool { + + if !p.Success.DeepEqual(src) { + return false } - if err != nil { + return true +} + +type EvaluatorServiceDeleteEvaluatorArgs struct { + Request *DeleteEvaluatorRequest `thrift:"request,1" frugal:"1,default,DeleteEvaluatorRequest"` +} + +func NewEvaluatorServiceDeleteEvaluatorArgs() *EvaluatorServiceDeleteEvaluatorArgs { + return &EvaluatorServiceDeleteEvaluatorArgs{} +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) InitDefault() { +} + +var EvaluatorServiceDeleteEvaluatorArgs_Request_DEFAULT *DeleteEvaluatorRequest + +func (p *EvaluatorServiceDeleteEvaluatorArgs) GetRequest() (v *DeleteEvaluatorRequest) { + if p == nil { return } - return true, err + if !p.IsSetRequest() { + return EvaluatorServiceDeleteEvaluatorArgs_Request_DEFAULT + } + return p.Request +} +func (p *EvaluatorServiceDeleteEvaluatorArgs) SetRequest(val *DeleteEvaluatorRequest) { + p.Request = val } -type evaluatorServiceProcessorBatchDebugEvaluator struct { - handler EvaluatorService +var fieldIDToName_EvaluatorServiceDeleteEvaluatorArgs = map[int16]string{ + 1: "request", } -func (p *evaluatorServiceProcessorBatchDebugEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceBatchDebugEvaluatorArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("BatchDebugEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceDeleteEvaluatorArgs) IsSetRequest() bool { + return p.Request != nil +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError } - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceBatchDebugEvaluatorResult{} - var retval *BatchDebugEvaluatorResponse - if retval, err2 = p.handler.BatchDebugEvaluator(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing BatchDebugEvaluator: "+err2.Error()) - oprot.WriteMessageBegin("BatchDebugEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } } - if err2 = oprot.WriteMessageBegin("BatchDebugEvaluator", thrift.REPLY, seqId); err2 != nil { - err = err2 + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorArgs[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewDeleteEvaluatorRequest() + if err := _field.Read(iprot); err != nil { + return err } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + p.Request = _field + return nil +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("DeleteEvaluator_args"); err != nil { + goto WriteStructBeginError } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError } - if err != nil { - return + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError } - return true, err -} - -type evaluatorServiceProcessorUpdateEvaluatorRecord struct { - handler EvaluatorService + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *evaluatorServiceProcessorUpdateEvaluatorRecord) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceUpdateEvaluatorRecordArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("UpdateEvaluatorRecord", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceDeleteEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError } - - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceUpdateEvaluatorRecordResult{} - var retval *UpdateEvaluatorRecordResponse - if retval, err2 = p.handler.UpdateEvaluatorRecord(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing UpdateEvaluatorRecord: "+err2.Error()) - oprot.WriteMessageBegin("UpdateEvaluatorRecord", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval + if err := p.Request.Write(oprot); err != nil { + return err } - if err2 = oprot.WriteMessageBegin("UpdateEvaluatorRecord", thrift.REPLY, seqId); err2 != nil { - err = err2 + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) String() string { + if p == nil { + return "" } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + return fmt.Sprintf("EvaluatorServiceDeleteEvaluatorArgs(%+v)", *p) + +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) DeepEqual(ano *EvaluatorServiceDeleteEvaluatorArgs) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if !p.Field1DeepEqual(ano.Request) { + return false } - if err != nil { - return + return true +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) Field1DeepEqual(src *DeleteEvaluatorRequest) bool { + + if !p.Request.DeepEqual(src) { + return false } - return true, err + return true } -type evaluatorServiceProcessorGetEvaluatorRecord struct { - handler EvaluatorService +type EvaluatorServiceDeleteEvaluatorResult struct { + Success *DeleteEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,DeleteEvaluatorResponse"` } -func (p *evaluatorServiceProcessorGetEvaluatorRecord) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceGetEvaluatorRecordArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("GetEvaluatorRecord", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err - } +func NewEvaluatorServiceDeleteEvaluatorResult() *EvaluatorServiceDeleteEvaluatorResult { + return &EvaluatorServiceDeleteEvaluatorResult{} +} - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceGetEvaluatorRecordResult{} - var retval *GetEvaluatorRecordResponse - if retval, err2 = p.handler.GetEvaluatorRecord(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetEvaluatorRecord: "+err2.Error()) - oprot.WriteMessageBegin("GetEvaluatorRecord", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("GetEvaluatorRecord", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 - } - if err != nil { +func (p *EvaluatorServiceDeleteEvaluatorResult) InitDefault() { +} + +var EvaluatorServiceDeleteEvaluatorResult_Success_DEFAULT *DeleteEvaluatorResponse + +func (p *EvaluatorServiceDeleteEvaluatorResult) GetSuccess() (v *DeleteEvaluatorResponse) { + if p == nil { return } - return true, err + if !p.IsSetSuccess() { + return EvaluatorServiceDeleteEvaluatorResult_Success_DEFAULT + } + return p.Success +} +func (p *EvaluatorServiceDeleteEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*DeleteEvaluatorResponse) } -type evaluatorServiceProcessorBatchGetEvaluatorRecords struct { - handler EvaluatorService +var fieldIDToName_EvaluatorServiceDeleteEvaluatorResult = map[int16]string{ + 0: "success", } -func (p *evaluatorServiceProcessorBatchGetEvaluatorRecords) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceBatchGetEvaluatorRecordsArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("BatchGetEvaluatorRecords", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceDeleteEvaluatorResult) IsSetSuccess() bool { + return p.Success != nil +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError } - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceBatchGetEvaluatorRecordsResult{} - var retval *BatchGetEvaluatorRecordsResponse - if retval, err2 = p.handler.BatchGetEvaluatorRecords(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing BatchGetEvaluatorRecords: "+err2.Error()) - oprot.WriteMessageBegin("BatchGetEvaluatorRecords", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField0(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } } - if err2 = oprot.WriteMessageBegin("BatchGetEvaluatorRecords", thrift.REPLY, seqId); err2 != nil { - err = err2 + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorResult[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewDeleteEvaluatorResponse() + if err := _field.Read(iprot); err != nil { + return err } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + p.Success = _field + return nil +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("DeleteEvaluator_result"); err != nil { + goto WriteStructBeginError } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + if p != nil { + if err = p.writeField0(oprot); err != nil { + fieldId = 0 + goto WriteFieldError + } } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError } - if err != nil { - return + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError } - return true, err + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -type evaluatorServiceProcessorValidateEvaluator struct { - handler EvaluatorService +func (p *EvaluatorServiceDeleteEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { + if p.IsSetSuccess() { + if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { + goto WriteFieldBeginError + } + if err := p.Success.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *evaluatorServiceProcessorValidateEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServiceValidateEvaluatorArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("ValidateEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *EvaluatorServiceDeleteEvaluatorResult) String() string { + if p == nil { + return "" } + return fmt.Sprintf("EvaluatorServiceDeleteEvaluatorResult(%+v)", *p) - iprot.ReadMessageEnd() - var err2 error - result := EvaluatorServiceValidateEvaluatorResult{} - var retval *ValidateEvaluatorResponse - if retval, err2 = p.handler.ValidateEvaluator(ctx, args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing ValidateEvaluator: "+err2.Error()) - oprot.WriteMessageBegin("ValidateEvaluator", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("ValidateEvaluator", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) DeepEqual(ano *EvaluatorServiceDeleteEvaluatorResult) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if !p.Field0DeepEqual(ano.Success) { + return false } - if err != nil { - return + return true +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) Field0DeepEqual(src *DeleteEvaluatorResponse) bool { + + if !p.Success.DeepEqual(src) { + return false } - return true, err + return true } -type EvaluatorServiceListEvaluatorsArgs struct { - Request *ListEvaluatorsRequest `thrift:"request,1" frugal:"1,default,ListEvaluatorsRequest"` +type EvaluatorServiceCheckEvaluatorNameArgs struct { + Request *CheckEvaluatorNameRequest `thrift:"request,1" frugal:"1,default,CheckEvaluatorNameRequest"` } -func NewEvaluatorServiceListEvaluatorsArgs() *EvaluatorServiceListEvaluatorsArgs { - return &EvaluatorServiceListEvaluatorsArgs{} +func NewEvaluatorServiceCheckEvaluatorNameArgs() *EvaluatorServiceCheckEvaluatorNameArgs { + return &EvaluatorServiceCheckEvaluatorNameArgs{} } -func (p *EvaluatorServiceListEvaluatorsArgs) InitDefault() { +func (p *EvaluatorServiceCheckEvaluatorNameArgs) InitDefault() { } -var EvaluatorServiceListEvaluatorsArgs_Request_DEFAULT *ListEvaluatorsRequest +var EvaluatorServiceCheckEvaluatorNameArgs_Request_DEFAULT *CheckEvaluatorNameRequest -func (p *EvaluatorServiceListEvaluatorsArgs) GetRequest() (v *ListEvaluatorsRequest) { +func (p *EvaluatorServiceCheckEvaluatorNameArgs) GetRequest() (v *CheckEvaluatorNameRequest) { if p == nil { return } if !p.IsSetRequest() { - return EvaluatorServiceListEvaluatorsArgs_Request_DEFAULT + return EvaluatorServiceCheckEvaluatorNameArgs_Request_DEFAULT } return p.Request } -func (p *EvaluatorServiceListEvaluatorsArgs) SetRequest(val *ListEvaluatorsRequest) { +func (p *EvaluatorServiceCheckEvaluatorNameArgs) SetRequest(val *CheckEvaluatorNameRequest) { p.Request = val } -var fieldIDToName_EvaluatorServiceListEvaluatorsArgs = map[int16]string{ +var fieldIDToName_EvaluatorServiceCheckEvaluatorNameArgs = map[int16]string{ 1: "request", } -func (p *EvaluatorServiceListEvaluatorsArgs) IsSetRequest() bool { +func (p *EvaluatorServiceCheckEvaluatorNameArgs) IsSetRequest() bool { return p.Request != nil } -func (p *EvaluatorServiceListEvaluatorsArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCheckEvaluatorNameArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -18536,7 +26753,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorsArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCheckEvaluatorNameArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -18546,8 +26763,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorsArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewListEvaluatorsRequest() +func (p *EvaluatorServiceCheckEvaluatorNameArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewCheckEvaluatorNameRequest() if err := _field.Read(iprot); err != nil { return err } @@ -18555,9 +26772,9 @@ func (p *EvaluatorServiceListEvaluatorsArgs) ReadField1(iprot thrift.TProtocol) return nil } -func (p *EvaluatorServiceListEvaluatorsArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCheckEvaluatorNameArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("ListEvaluators_args"); err != nil { + if err = oprot.WriteStructBegin("CheckEvaluatorName_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -18583,7 +26800,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorsArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCheckEvaluatorNameArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -18600,15 +26817,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorsArgs) String() string { +func (p *EvaluatorServiceCheckEvaluatorNameArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceListEvaluatorsArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceCheckEvaluatorNameArgs(%+v)", *p) } -func (p *EvaluatorServiceListEvaluatorsArgs) DeepEqual(ano *EvaluatorServiceListEvaluatorsArgs) bool { +func (p *EvaluatorServiceCheckEvaluatorNameArgs) DeepEqual(ano *EvaluatorServiceCheckEvaluatorNameArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -18620,7 +26837,7 @@ func (p *EvaluatorServiceListEvaluatorsArgs) DeepEqual(ano *EvaluatorServiceList return true } -func (p *EvaluatorServiceListEvaluatorsArgs) Field1DeepEqual(src *ListEvaluatorsRequest) bool { +func (p *EvaluatorServiceCheckEvaluatorNameArgs) Field1DeepEqual(src *CheckEvaluatorNameRequest) bool { if !p.Request.DeepEqual(src) { return false @@ -18628,41 +26845,41 @@ func (p *EvaluatorServiceListEvaluatorsArgs) Field1DeepEqual(src *ListEvaluators return true } -type EvaluatorServiceListEvaluatorsResult struct { - Success *ListEvaluatorsResponse `thrift:"success,0,optional" frugal:"0,optional,ListEvaluatorsResponse"` +type EvaluatorServiceCheckEvaluatorNameResult struct { + Success *CheckEvaluatorNameResponse `thrift:"success,0,optional" frugal:"0,optional,CheckEvaluatorNameResponse"` } -func NewEvaluatorServiceListEvaluatorsResult() *EvaluatorServiceListEvaluatorsResult { - return &EvaluatorServiceListEvaluatorsResult{} +func NewEvaluatorServiceCheckEvaluatorNameResult() *EvaluatorServiceCheckEvaluatorNameResult { + return &EvaluatorServiceCheckEvaluatorNameResult{} } -func (p *EvaluatorServiceListEvaluatorsResult) InitDefault() { +func (p *EvaluatorServiceCheckEvaluatorNameResult) InitDefault() { } -var EvaluatorServiceListEvaluatorsResult_Success_DEFAULT *ListEvaluatorsResponse +var EvaluatorServiceCheckEvaluatorNameResult_Success_DEFAULT *CheckEvaluatorNameResponse -func (p *EvaluatorServiceListEvaluatorsResult) GetSuccess() (v *ListEvaluatorsResponse) { +func (p *EvaluatorServiceCheckEvaluatorNameResult) GetSuccess() (v *CheckEvaluatorNameResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceListEvaluatorsResult_Success_DEFAULT + return EvaluatorServiceCheckEvaluatorNameResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceListEvaluatorsResult) SetSuccess(x interface{}) { - p.Success = x.(*ListEvaluatorsResponse) +func (p *EvaluatorServiceCheckEvaluatorNameResult) SetSuccess(x interface{}) { + p.Success = x.(*CheckEvaluatorNameResponse) } -var fieldIDToName_EvaluatorServiceListEvaluatorsResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceCheckEvaluatorNameResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceListEvaluatorsResult) IsSetSuccess() bool { +func (p *EvaluatorServiceCheckEvaluatorNameResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceListEvaluatorsResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCheckEvaluatorNameResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -18707,7 +26924,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorsResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCheckEvaluatorNameResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -18717,8 +26934,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorsResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewListEvaluatorsResponse() +func (p *EvaluatorServiceCheckEvaluatorNameResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewCheckEvaluatorNameResponse() if err := _field.Read(iprot); err != nil { return err } @@ -18726,9 +26943,9 @@ func (p *EvaluatorServiceListEvaluatorsResult) ReadField0(iprot thrift.TProtocol return nil } -func (p *EvaluatorServiceListEvaluatorsResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCheckEvaluatorNameResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("ListEvaluators_result"); err != nil { + if err = oprot.WriteStructBegin("CheckEvaluatorName_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -18754,7 +26971,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorsResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCheckEvaluatorNameResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -18773,15 +26990,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorsResult) String() string { +func (p *EvaluatorServiceCheckEvaluatorNameResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceListEvaluatorsResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceCheckEvaluatorNameResult(%+v)", *p) } -func (p *EvaluatorServiceListEvaluatorsResult) DeepEqual(ano *EvaluatorServiceListEvaluatorsResult) bool { +func (p *EvaluatorServiceCheckEvaluatorNameResult) DeepEqual(ano *EvaluatorServiceCheckEvaluatorNameResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -18793,7 +27010,7 @@ func (p *EvaluatorServiceListEvaluatorsResult) DeepEqual(ano *EvaluatorServiceLi return true } -func (p *EvaluatorServiceListEvaluatorsResult) Field0DeepEqual(src *ListEvaluatorsResponse) bool { +func (p *EvaluatorServiceCheckEvaluatorNameResult) Field0DeepEqual(src *CheckEvaluatorNameResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -18801,41 +27018,41 @@ func (p *EvaluatorServiceListEvaluatorsResult) Field0DeepEqual(src *ListEvaluato return true } -type EvaluatorServiceBatchGetEvaluatorsArgs struct { - Request *BatchGetEvaluatorsRequest `thrift:"request,1" frugal:"1,default,BatchGetEvaluatorsRequest"` +type EvaluatorServiceListEvaluatorVersionsArgs struct { + Request *ListEvaluatorVersionsRequest `thrift:"request,1" frugal:"1,default,ListEvaluatorVersionsRequest"` } -func NewEvaluatorServiceBatchGetEvaluatorsArgs() *EvaluatorServiceBatchGetEvaluatorsArgs { - return &EvaluatorServiceBatchGetEvaluatorsArgs{} +func NewEvaluatorServiceListEvaluatorVersionsArgs() *EvaluatorServiceListEvaluatorVersionsArgs { + return &EvaluatorServiceListEvaluatorVersionsArgs{} } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) InitDefault() { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) InitDefault() { } -var EvaluatorServiceBatchGetEvaluatorsArgs_Request_DEFAULT *BatchGetEvaluatorsRequest +var EvaluatorServiceListEvaluatorVersionsArgs_Request_DEFAULT *ListEvaluatorVersionsRequest -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) GetRequest() (v *BatchGetEvaluatorsRequest) { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) GetRequest() (v *ListEvaluatorVersionsRequest) { if p == nil { return } if !p.IsSetRequest() { - return EvaluatorServiceBatchGetEvaluatorsArgs_Request_DEFAULT + return EvaluatorServiceListEvaluatorVersionsArgs_Request_DEFAULT } return p.Request } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) SetRequest(val *BatchGetEvaluatorsRequest) { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) SetRequest(val *ListEvaluatorVersionsRequest) { p.Request = val } -var fieldIDToName_EvaluatorServiceBatchGetEvaluatorsArgs = map[int16]string{ +var fieldIDToName_EvaluatorServiceListEvaluatorVersionsArgs = map[int16]string{ 1: "request", } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) IsSetRequest() bool { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) IsSetRequest() bool { return p.Request != nil } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -18880,7 +27097,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorsArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorVersionsArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -18890,8 +27107,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewBatchGetEvaluatorsRequest() +func (p *EvaluatorServiceListEvaluatorVersionsArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewListEvaluatorVersionsRequest() if err := _field.Read(iprot); err != nil { return err } @@ -18899,9 +27116,9 @@ func (p *EvaluatorServiceBatchGetEvaluatorsArgs) ReadField1(iprot thrift.TProtoc return nil } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("BatchGetEvaluators_args"); err != nil { + if err = oprot.WriteStructBegin("ListEvaluatorVersions_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -18927,7 +27144,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -18944,15 +27161,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) String() string { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorsArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceListEvaluatorVersionsArgs(%+v)", *p) } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorsArgs) bool { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) DeepEqual(ano *EvaluatorServiceListEvaluatorVersionsArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -18964,49 +27181,49 @@ func (p *EvaluatorServiceBatchGetEvaluatorsArgs) DeepEqual(ano *EvaluatorService return true } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) Field1DeepEqual(src *BatchGetEvaluatorsRequest) bool { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) Field1DeepEqual(src *ListEvaluatorVersionsRequest) bool { if !p.Request.DeepEqual(src) { return false } return true } - -type EvaluatorServiceBatchGetEvaluatorsResult struct { - Success *BatchGetEvaluatorsResponse `thrift:"success,0,optional" frugal:"0,optional,BatchGetEvaluatorsResponse"` + +type EvaluatorServiceListEvaluatorVersionsResult struct { + Success *ListEvaluatorVersionsResponse `thrift:"success,0,optional" frugal:"0,optional,ListEvaluatorVersionsResponse"` } -func NewEvaluatorServiceBatchGetEvaluatorsResult() *EvaluatorServiceBatchGetEvaluatorsResult { - return &EvaluatorServiceBatchGetEvaluatorsResult{} +func NewEvaluatorServiceListEvaluatorVersionsResult() *EvaluatorServiceListEvaluatorVersionsResult { + return &EvaluatorServiceListEvaluatorVersionsResult{} } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) InitDefault() { +func (p *EvaluatorServiceListEvaluatorVersionsResult) InitDefault() { } -var EvaluatorServiceBatchGetEvaluatorsResult_Success_DEFAULT *BatchGetEvaluatorsResponse +var EvaluatorServiceListEvaluatorVersionsResult_Success_DEFAULT *ListEvaluatorVersionsResponse -func (p *EvaluatorServiceBatchGetEvaluatorsResult) GetSuccess() (v *BatchGetEvaluatorsResponse) { +func (p *EvaluatorServiceListEvaluatorVersionsResult) GetSuccess() (v *ListEvaluatorVersionsResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceBatchGetEvaluatorsResult_Success_DEFAULT + return EvaluatorServiceListEvaluatorVersionsResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) SetSuccess(x interface{}) { - p.Success = x.(*BatchGetEvaluatorsResponse) +func (p *EvaluatorServiceListEvaluatorVersionsResult) SetSuccess(x interface{}) { + p.Success = x.(*ListEvaluatorVersionsResponse) } -var fieldIDToName_EvaluatorServiceBatchGetEvaluatorsResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceListEvaluatorVersionsResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) IsSetSuccess() bool { +func (p *EvaluatorServiceListEvaluatorVersionsResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorVersionsResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -19051,7 +27268,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorsResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorVersionsResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -19061,8 +27278,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewBatchGetEvaluatorsResponse() +func (p *EvaluatorServiceListEvaluatorVersionsResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewListEvaluatorVersionsResponse() if err := _field.Read(iprot); err != nil { return err } @@ -19070,9 +27287,9 @@ func (p *EvaluatorServiceBatchGetEvaluatorsResult) ReadField0(iprot thrift.TProt return nil } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorVersionsResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("BatchGetEvaluators_result"); err != nil { + if err = oprot.WriteStructBegin("ListEvaluatorVersions_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -19098,7 +27315,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorVersionsResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -19117,15 +27334,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) String() string { +func (p *EvaluatorServiceListEvaluatorVersionsResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorsResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceListEvaluatorVersionsResult(%+v)", *p) } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorsResult) bool { +func (p *EvaluatorServiceListEvaluatorVersionsResult) DeepEqual(ano *EvaluatorServiceListEvaluatorVersionsResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -19137,7 +27354,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorsResult) DeepEqual(ano *EvaluatorServi return true } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) Field0DeepEqual(src *BatchGetEvaluatorsResponse) bool { +func (p *EvaluatorServiceListEvaluatorVersionsResult) Field0DeepEqual(src *ListEvaluatorVersionsResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -19145,41 +27362,41 @@ func (p *EvaluatorServiceBatchGetEvaluatorsResult) Field0DeepEqual(src *BatchGet return true } -type EvaluatorServiceGetEvaluatorArgs struct { - Request *GetEvaluatorRequest `thrift:"request,1" frugal:"1,default,GetEvaluatorRequest"` +type EvaluatorServiceGetEvaluatorVersionArgs struct { + Request *GetEvaluatorVersionRequest `thrift:"request,1" frugal:"1,default,GetEvaluatorVersionRequest"` } -func NewEvaluatorServiceGetEvaluatorArgs() *EvaluatorServiceGetEvaluatorArgs { - return &EvaluatorServiceGetEvaluatorArgs{} +func NewEvaluatorServiceGetEvaluatorVersionArgs() *EvaluatorServiceGetEvaluatorVersionArgs { + return &EvaluatorServiceGetEvaluatorVersionArgs{} } -func (p *EvaluatorServiceGetEvaluatorArgs) InitDefault() { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) InitDefault() { } -var EvaluatorServiceGetEvaluatorArgs_Request_DEFAULT *GetEvaluatorRequest +var EvaluatorServiceGetEvaluatorVersionArgs_Request_DEFAULT *GetEvaluatorVersionRequest -func (p *EvaluatorServiceGetEvaluatorArgs) GetRequest() (v *GetEvaluatorRequest) { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) GetRequest() (v *GetEvaluatorVersionRequest) { if p == nil { return } if !p.IsSetRequest() { - return EvaluatorServiceGetEvaluatorArgs_Request_DEFAULT + return EvaluatorServiceGetEvaluatorVersionArgs_Request_DEFAULT } return p.Request } -func (p *EvaluatorServiceGetEvaluatorArgs) SetRequest(val *GetEvaluatorRequest) { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) SetRequest(val *GetEvaluatorVersionRequest) { p.Request = val } -var fieldIDToName_EvaluatorServiceGetEvaluatorArgs = map[int16]string{ +var fieldIDToName_EvaluatorServiceGetEvaluatorVersionArgs = map[int16]string{ 1: "request", } -func (p *EvaluatorServiceGetEvaluatorArgs) IsSetRequest() bool { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) IsSetRequest() bool { return p.Request != nil } -func (p *EvaluatorServiceGetEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -19224,7 +27441,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorVersionArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -19234,8 +27451,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewGetEvaluatorRequest() +func (p *EvaluatorServiceGetEvaluatorVersionArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewGetEvaluatorVersionRequest() if err := _field.Read(iprot); err != nil { return err } @@ -19243,9 +27460,9 @@ func (p *EvaluatorServiceGetEvaluatorArgs) ReadField1(iprot thrift.TProtocol) er return nil } -func (p *EvaluatorServiceGetEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetEvaluator_args"); err != nil { + if err = oprot.WriteStructBegin("GetEvaluatorVersion_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -19271,7 +27488,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -19288,15 +27505,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorArgs) String() string { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceGetEvaluatorArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceGetEvaluatorVersionArgs(%+v)", *p) } -func (p *EvaluatorServiceGetEvaluatorArgs) DeepEqual(ano *EvaluatorServiceGetEvaluatorArgs) bool { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) DeepEqual(ano *EvaluatorServiceGetEvaluatorVersionArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -19308,7 +27525,7 @@ func (p *EvaluatorServiceGetEvaluatorArgs) DeepEqual(ano *EvaluatorServiceGetEva return true } -func (p *EvaluatorServiceGetEvaluatorArgs) Field1DeepEqual(src *GetEvaluatorRequest) bool { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) Field1DeepEqual(src *GetEvaluatorVersionRequest) bool { if !p.Request.DeepEqual(src) { return false @@ -19316,41 +27533,41 @@ func (p *EvaluatorServiceGetEvaluatorArgs) Field1DeepEqual(src *GetEvaluatorRequ return true } -type EvaluatorServiceGetEvaluatorResult struct { - Success *GetEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,GetEvaluatorResponse"` +type EvaluatorServiceGetEvaluatorVersionResult struct { + Success *GetEvaluatorVersionResponse `thrift:"success,0,optional" frugal:"0,optional,GetEvaluatorVersionResponse"` } -func NewEvaluatorServiceGetEvaluatorResult() *EvaluatorServiceGetEvaluatorResult { - return &EvaluatorServiceGetEvaluatorResult{} +func NewEvaluatorServiceGetEvaluatorVersionResult() *EvaluatorServiceGetEvaluatorVersionResult { + return &EvaluatorServiceGetEvaluatorVersionResult{} } -func (p *EvaluatorServiceGetEvaluatorResult) InitDefault() { +func (p *EvaluatorServiceGetEvaluatorVersionResult) InitDefault() { } -var EvaluatorServiceGetEvaluatorResult_Success_DEFAULT *GetEvaluatorResponse +var EvaluatorServiceGetEvaluatorVersionResult_Success_DEFAULT *GetEvaluatorVersionResponse -func (p *EvaluatorServiceGetEvaluatorResult) GetSuccess() (v *GetEvaluatorResponse) { +func (p *EvaluatorServiceGetEvaluatorVersionResult) GetSuccess() (v *GetEvaluatorVersionResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceGetEvaluatorResult_Success_DEFAULT + return EvaluatorServiceGetEvaluatorVersionResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceGetEvaluatorResult) SetSuccess(x interface{}) { - p.Success = x.(*GetEvaluatorResponse) +func (p *EvaluatorServiceGetEvaluatorVersionResult) SetSuccess(x interface{}) { + p.Success = x.(*GetEvaluatorVersionResponse) } -var fieldIDToName_EvaluatorServiceGetEvaluatorResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceGetEvaluatorVersionResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceGetEvaluatorResult) IsSetSuccess() bool { +func (p *EvaluatorServiceGetEvaluatorVersionResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceGetEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorVersionResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -19395,7 +27612,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorVersionResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -19405,8 +27622,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewGetEvaluatorResponse() +func (p *EvaluatorServiceGetEvaluatorVersionResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewGetEvaluatorVersionResponse() if err := _field.Read(iprot); err != nil { return err } @@ -19414,9 +27631,9 @@ func (p *EvaluatorServiceGetEvaluatorResult) ReadField0(iprot thrift.TProtocol) return nil } -func (p *EvaluatorServiceGetEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorVersionResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetEvaluator_result"); err != nil { + if err = oprot.WriteStructBegin("GetEvaluatorVersion_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -19442,7 +27659,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorVersionResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -19461,15 +27678,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorResult) String() string { +func (p *EvaluatorServiceGetEvaluatorVersionResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceGetEvaluatorResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceGetEvaluatorVersionResult(%+v)", *p) } -func (p *EvaluatorServiceGetEvaluatorResult) DeepEqual(ano *EvaluatorServiceGetEvaluatorResult) bool { +func (p *EvaluatorServiceGetEvaluatorVersionResult) DeepEqual(ano *EvaluatorServiceGetEvaluatorVersionResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -19481,7 +27698,7 @@ func (p *EvaluatorServiceGetEvaluatorResult) DeepEqual(ano *EvaluatorServiceGetE return true } -func (p *EvaluatorServiceGetEvaluatorResult) Field0DeepEqual(src *GetEvaluatorResponse) bool { +func (p *EvaluatorServiceGetEvaluatorVersionResult) Field0DeepEqual(src *GetEvaluatorVersionResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -19489,41 +27706,41 @@ func (p *EvaluatorServiceGetEvaluatorResult) Field0DeepEqual(src *GetEvaluatorRe return true } -type EvaluatorServiceCreateEvaluatorArgs struct { - Request *CreateEvaluatorRequest `thrift:"request,1" frugal:"1,default,CreateEvaluatorRequest"` +type EvaluatorServiceBatchGetEvaluatorVersionsArgs struct { + Request *BatchGetEvaluatorVersionsRequest `thrift:"request,1" frugal:"1,default,BatchGetEvaluatorVersionsRequest"` } -func NewEvaluatorServiceCreateEvaluatorArgs() *EvaluatorServiceCreateEvaluatorArgs { - return &EvaluatorServiceCreateEvaluatorArgs{} +func NewEvaluatorServiceBatchGetEvaluatorVersionsArgs() *EvaluatorServiceBatchGetEvaluatorVersionsArgs { + return &EvaluatorServiceBatchGetEvaluatorVersionsArgs{} } -func (p *EvaluatorServiceCreateEvaluatorArgs) InitDefault() { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) InitDefault() { } -var EvaluatorServiceCreateEvaluatorArgs_Request_DEFAULT *CreateEvaluatorRequest +var EvaluatorServiceBatchGetEvaluatorVersionsArgs_Request_DEFAULT *BatchGetEvaluatorVersionsRequest -func (p *EvaluatorServiceCreateEvaluatorArgs) GetRequest() (v *CreateEvaluatorRequest) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) GetRequest() (v *BatchGetEvaluatorVersionsRequest) { if p == nil { return } if !p.IsSetRequest() { - return EvaluatorServiceCreateEvaluatorArgs_Request_DEFAULT + return EvaluatorServiceBatchGetEvaluatorVersionsArgs_Request_DEFAULT } return p.Request } -func (p *EvaluatorServiceCreateEvaluatorArgs) SetRequest(val *CreateEvaluatorRequest) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) SetRequest(val *BatchGetEvaluatorVersionsRequest) { p.Request = val } -var fieldIDToName_EvaluatorServiceCreateEvaluatorArgs = map[int16]string{ +var fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsArgs = map[int16]string{ 1: "request", } -func (p *EvaluatorServiceCreateEvaluatorArgs) IsSetRequest() bool { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) IsSetRequest() bool { return p.Request != nil } -func (p *EvaluatorServiceCreateEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -19568,7 +27785,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -19578,8 +27795,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceCreateEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewCreateEvaluatorRequest() +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewBatchGetEvaluatorVersionsRequest() if err := _field.Read(iprot); err != nil { return err } @@ -19587,9 +27804,9 @@ func (p *EvaluatorServiceCreateEvaluatorArgs) ReadField1(iprot thrift.TProtocol) return nil } -func (p *EvaluatorServiceCreateEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("CreateEvaluator_args"); err != nil { + if err = oprot.WriteStructBegin("BatchGetEvaluatorVersions_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -19615,7 +27832,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceCreateEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -19632,15 +27849,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceCreateEvaluatorArgs) String() string { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceCreateEvaluatorArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorVersionsArgs(%+v)", *p) } -func (p *EvaluatorServiceCreateEvaluatorArgs) DeepEqual(ano *EvaluatorServiceCreateEvaluatorArgs) bool { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorVersionsArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -19652,7 +27869,7 @@ func (p *EvaluatorServiceCreateEvaluatorArgs) DeepEqual(ano *EvaluatorServiceCre return true } -func (p *EvaluatorServiceCreateEvaluatorArgs) Field1DeepEqual(src *CreateEvaluatorRequest) bool { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) Field1DeepEqual(src *BatchGetEvaluatorVersionsRequest) bool { if !p.Request.DeepEqual(src) { return false @@ -19660,41 +27877,41 @@ func (p *EvaluatorServiceCreateEvaluatorArgs) Field1DeepEqual(src *CreateEvaluat return true } -type EvaluatorServiceCreateEvaluatorResult struct { - Success *CreateEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,CreateEvaluatorResponse"` +type EvaluatorServiceBatchGetEvaluatorVersionsResult struct { + Success *BatchGetEvaluatorVersionsResponse `thrift:"success,0,optional" frugal:"0,optional,BatchGetEvaluatorVersionsResponse"` } -func NewEvaluatorServiceCreateEvaluatorResult() *EvaluatorServiceCreateEvaluatorResult { - return &EvaluatorServiceCreateEvaluatorResult{} +func NewEvaluatorServiceBatchGetEvaluatorVersionsResult() *EvaluatorServiceBatchGetEvaluatorVersionsResult { + return &EvaluatorServiceBatchGetEvaluatorVersionsResult{} } -func (p *EvaluatorServiceCreateEvaluatorResult) InitDefault() { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) InitDefault() { } -var EvaluatorServiceCreateEvaluatorResult_Success_DEFAULT *CreateEvaluatorResponse +var EvaluatorServiceBatchGetEvaluatorVersionsResult_Success_DEFAULT *BatchGetEvaluatorVersionsResponse -func (p *EvaluatorServiceCreateEvaluatorResult) GetSuccess() (v *CreateEvaluatorResponse) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) GetSuccess() (v *BatchGetEvaluatorVersionsResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceCreateEvaluatorResult_Success_DEFAULT + return EvaluatorServiceBatchGetEvaluatorVersionsResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceCreateEvaluatorResult) SetSuccess(x interface{}) { - p.Success = x.(*CreateEvaluatorResponse) +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) SetSuccess(x interface{}) { + p.Success = x.(*BatchGetEvaluatorVersionsResponse) } -var fieldIDToName_EvaluatorServiceCreateEvaluatorResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceCreateEvaluatorResult) IsSetSuccess() bool { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceCreateEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -19739,7 +27956,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -19749,8 +27966,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceCreateEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewCreateEvaluatorResponse() +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewBatchGetEvaluatorVersionsResponse() if err := _field.Read(iprot); err != nil { return err } @@ -19758,9 +27975,9 @@ func (p *EvaluatorServiceCreateEvaluatorResult) ReadField0(iprot thrift.TProtoco return nil } -func (p *EvaluatorServiceCreateEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("CreateEvaluator_result"); err != nil { + if err = oprot.WriteStructBegin("BatchGetEvaluatorVersions_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -19786,7 +28003,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceCreateEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -19805,15 +28022,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceCreateEvaluatorResult) String() string { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceCreateEvaluatorResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorVersionsResult(%+v)", *p) } -func (p *EvaluatorServiceCreateEvaluatorResult) DeepEqual(ano *EvaluatorServiceCreateEvaluatorResult) bool { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorVersionsResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -19825,7 +28042,7 @@ func (p *EvaluatorServiceCreateEvaluatorResult) DeepEqual(ano *EvaluatorServiceC return true } -func (p *EvaluatorServiceCreateEvaluatorResult) Field0DeepEqual(src *CreateEvaluatorResponse) bool { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) Field0DeepEqual(src *BatchGetEvaluatorVersionsResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -19833,41 +28050,41 @@ func (p *EvaluatorServiceCreateEvaluatorResult) Field0DeepEqual(src *CreateEvalu return true } -type EvaluatorServiceUpdateEvaluatorArgs struct { - Request *UpdateEvaluatorRequest `thrift:"request,1" frugal:"1,default,UpdateEvaluatorRequest"` +type EvaluatorServiceSubmitEvaluatorVersionArgs struct { + Request *SubmitEvaluatorVersionRequest `thrift:"request,1" frugal:"1,default,SubmitEvaluatorVersionRequest"` } -func NewEvaluatorServiceUpdateEvaluatorArgs() *EvaluatorServiceUpdateEvaluatorArgs { - return &EvaluatorServiceUpdateEvaluatorArgs{} +func NewEvaluatorServiceSubmitEvaluatorVersionArgs() *EvaluatorServiceSubmitEvaluatorVersionArgs { + return &EvaluatorServiceSubmitEvaluatorVersionArgs{} } -func (p *EvaluatorServiceUpdateEvaluatorArgs) InitDefault() { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) InitDefault() { } -var EvaluatorServiceUpdateEvaluatorArgs_Request_DEFAULT *UpdateEvaluatorRequest +var EvaluatorServiceSubmitEvaluatorVersionArgs_Request_DEFAULT *SubmitEvaluatorVersionRequest -func (p *EvaluatorServiceUpdateEvaluatorArgs) GetRequest() (v *UpdateEvaluatorRequest) { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) GetRequest() (v *SubmitEvaluatorVersionRequest) { if p == nil { return } if !p.IsSetRequest() { - return EvaluatorServiceUpdateEvaluatorArgs_Request_DEFAULT + return EvaluatorServiceSubmitEvaluatorVersionArgs_Request_DEFAULT } return p.Request } -func (p *EvaluatorServiceUpdateEvaluatorArgs) SetRequest(val *UpdateEvaluatorRequest) { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) SetRequest(val *SubmitEvaluatorVersionRequest) { p.Request = val } -var fieldIDToName_EvaluatorServiceUpdateEvaluatorArgs = map[int16]string{ +var fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionArgs = map[int16]string{ 1: "request", } -func (p *EvaluatorServiceUpdateEvaluatorArgs) IsSetRequest() bool { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) IsSetRequest() bool { return p.Request != nil } -func (p *EvaluatorServiceUpdateEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -19912,7 +28129,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -19922,8 +28139,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewUpdateEvaluatorRequest() +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewSubmitEvaluatorVersionRequest() if err := _field.Read(iprot); err != nil { return err } @@ -19931,9 +28148,9 @@ func (p *EvaluatorServiceUpdateEvaluatorArgs) ReadField1(iprot thrift.TProtocol) return nil } -func (p *EvaluatorServiceUpdateEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("UpdateEvaluator_args"); err != nil { + if err = oprot.WriteStructBegin("SubmitEvaluatorVersion_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -19959,7 +28176,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -19976,15 +28193,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorArgs) String() string { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceSubmitEvaluatorVersionArgs(%+v)", *p) } -func (p *EvaluatorServiceUpdateEvaluatorArgs) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorArgs) bool { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) DeepEqual(ano *EvaluatorServiceSubmitEvaluatorVersionArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -19996,7 +28213,7 @@ func (p *EvaluatorServiceUpdateEvaluatorArgs) DeepEqual(ano *EvaluatorServiceUpd return true } -func (p *EvaluatorServiceUpdateEvaluatorArgs) Field1DeepEqual(src *UpdateEvaluatorRequest) bool { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) Field1DeepEqual(src *SubmitEvaluatorVersionRequest) bool { if !p.Request.DeepEqual(src) { return false @@ -20004,41 +28221,41 @@ func (p *EvaluatorServiceUpdateEvaluatorArgs) Field1DeepEqual(src *UpdateEvaluat return true } -type EvaluatorServiceUpdateEvaluatorResult struct { - Success *UpdateEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,UpdateEvaluatorResponse"` +type EvaluatorServiceSubmitEvaluatorVersionResult struct { + Success *SubmitEvaluatorVersionResponse `thrift:"success,0,optional" frugal:"0,optional,SubmitEvaluatorVersionResponse"` } -func NewEvaluatorServiceUpdateEvaluatorResult() *EvaluatorServiceUpdateEvaluatorResult { - return &EvaluatorServiceUpdateEvaluatorResult{} +func NewEvaluatorServiceSubmitEvaluatorVersionResult() *EvaluatorServiceSubmitEvaluatorVersionResult { + return &EvaluatorServiceSubmitEvaluatorVersionResult{} } -func (p *EvaluatorServiceUpdateEvaluatorResult) InitDefault() { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) InitDefault() { } -var EvaluatorServiceUpdateEvaluatorResult_Success_DEFAULT *UpdateEvaluatorResponse +var EvaluatorServiceSubmitEvaluatorVersionResult_Success_DEFAULT *SubmitEvaluatorVersionResponse -func (p *EvaluatorServiceUpdateEvaluatorResult) GetSuccess() (v *UpdateEvaluatorResponse) { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) GetSuccess() (v *SubmitEvaluatorVersionResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceUpdateEvaluatorResult_Success_DEFAULT + return EvaluatorServiceSubmitEvaluatorVersionResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceUpdateEvaluatorResult) SetSuccess(x interface{}) { - p.Success = x.(*UpdateEvaluatorResponse) +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) SetSuccess(x interface{}) { + p.Success = x.(*SubmitEvaluatorVersionResponse) } -var fieldIDToName_EvaluatorServiceUpdateEvaluatorResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceUpdateEvaluatorResult) IsSetSuccess() bool { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceUpdateEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -20083,7 +28300,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -20093,8 +28310,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewUpdateEvaluatorResponse() +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewSubmitEvaluatorVersionResponse() if err := _field.Read(iprot); err != nil { return err } @@ -20102,9 +28319,9 @@ func (p *EvaluatorServiceUpdateEvaluatorResult) ReadField0(iprot thrift.TProtoco return nil } -func (p *EvaluatorServiceUpdateEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("UpdateEvaluator_result"); err != nil { + if err = oprot.WriteStructBegin("SubmitEvaluatorVersion_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -20130,7 +28347,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -20149,15 +28366,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorResult) String() string { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceSubmitEvaluatorVersionResult(%+v)", *p) } -func (p *EvaluatorServiceUpdateEvaluatorResult) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorResult) bool { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) DeepEqual(ano *EvaluatorServiceSubmitEvaluatorVersionResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -20169,7 +28386,7 @@ func (p *EvaluatorServiceUpdateEvaluatorResult) DeepEqual(ano *EvaluatorServiceU return true } -func (p *EvaluatorServiceUpdateEvaluatorResult) Field0DeepEqual(src *UpdateEvaluatorResponse) bool { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) Field0DeepEqual(src *SubmitEvaluatorVersionResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -20177,41 +28394,41 @@ func (p *EvaluatorServiceUpdateEvaluatorResult) Field0DeepEqual(src *UpdateEvalu return true } -type EvaluatorServiceUpdateEvaluatorDraftArgs struct { - Request *UpdateEvaluatorDraftRequest `thrift:"request,1" frugal:"1,default,UpdateEvaluatorDraftRequest"` +type EvaluatorServiceListTemplatesArgs struct { + Request *ListTemplatesRequest `thrift:"request,1" frugal:"1,default,ListTemplatesRequest"` } -func NewEvaluatorServiceUpdateEvaluatorDraftArgs() *EvaluatorServiceUpdateEvaluatorDraftArgs { - return &EvaluatorServiceUpdateEvaluatorDraftArgs{} +func NewEvaluatorServiceListTemplatesArgs() *EvaluatorServiceListTemplatesArgs { + return &EvaluatorServiceListTemplatesArgs{} } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) InitDefault() { +func (p *EvaluatorServiceListTemplatesArgs) InitDefault() { } -var EvaluatorServiceUpdateEvaluatorDraftArgs_Request_DEFAULT *UpdateEvaluatorDraftRequest +var EvaluatorServiceListTemplatesArgs_Request_DEFAULT *ListTemplatesRequest -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) GetRequest() (v *UpdateEvaluatorDraftRequest) { +func (p *EvaluatorServiceListTemplatesArgs) GetRequest() (v *ListTemplatesRequest) { if p == nil { return } if !p.IsSetRequest() { - return EvaluatorServiceUpdateEvaluatorDraftArgs_Request_DEFAULT + return EvaluatorServiceListTemplatesArgs_Request_DEFAULT } return p.Request } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) SetRequest(val *UpdateEvaluatorDraftRequest) { +func (p *EvaluatorServiceListTemplatesArgs) SetRequest(val *ListTemplatesRequest) { p.Request = val } -var fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftArgs = map[int16]string{ +var fieldIDToName_EvaluatorServiceListTemplatesArgs = map[int16]string{ 1: "request", } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) IsSetRequest() bool { +func (p *EvaluatorServiceListTemplatesArgs) IsSetRequest() bool { return p.Request != nil } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -20256,7 +28473,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -20266,8 +28483,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewUpdateEvaluatorDraftRequest() +func (p *EvaluatorServiceListTemplatesArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewListTemplatesRequest() if err := _field.Read(iprot); err != nil { return err } @@ -20275,9 +28492,9 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) ReadField1(iprot thrift.TProt return nil } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("UpdateEvaluatorDraft_args"); err != nil { + if err = oprot.WriteStructBegin("ListTemplates_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -20303,7 +28520,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -20320,15 +28537,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) String() string { +func (p *EvaluatorServiceListTemplatesArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorDraftArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceListTemplatesArgs(%+v)", *p) } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorDraftArgs) bool { +func (p *EvaluatorServiceListTemplatesArgs) DeepEqual(ano *EvaluatorServiceListTemplatesArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -20340,7 +28557,7 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) DeepEqual(ano *EvaluatorServi return true } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) Field1DeepEqual(src *UpdateEvaluatorDraftRequest) bool { +func (p *EvaluatorServiceListTemplatesArgs) Field1DeepEqual(src *ListTemplatesRequest) bool { if !p.Request.DeepEqual(src) { return false @@ -20348,41 +28565,41 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) Field1DeepEqual(src *UpdateEv return true } -type EvaluatorServiceUpdateEvaluatorDraftResult struct { - Success *UpdateEvaluatorDraftResponse `thrift:"success,0,optional" frugal:"0,optional,UpdateEvaluatorDraftResponse"` +type EvaluatorServiceListTemplatesResult struct { + Success *ListTemplatesResponse `thrift:"success,0,optional" frugal:"0,optional,ListTemplatesResponse"` } -func NewEvaluatorServiceUpdateEvaluatorDraftResult() *EvaluatorServiceUpdateEvaluatorDraftResult { - return &EvaluatorServiceUpdateEvaluatorDraftResult{} +func NewEvaluatorServiceListTemplatesResult() *EvaluatorServiceListTemplatesResult { + return &EvaluatorServiceListTemplatesResult{} } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) InitDefault() { +func (p *EvaluatorServiceListTemplatesResult) InitDefault() { } -var EvaluatorServiceUpdateEvaluatorDraftResult_Success_DEFAULT *UpdateEvaluatorDraftResponse +var EvaluatorServiceListTemplatesResult_Success_DEFAULT *ListTemplatesResponse -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) GetSuccess() (v *UpdateEvaluatorDraftResponse) { +func (p *EvaluatorServiceListTemplatesResult) GetSuccess() (v *ListTemplatesResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceUpdateEvaluatorDraftResult_Success_DEFAULT + return EvaluatorServiceListTemplatesResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) SetSuccess(x interface{}) { - p.Success = x.(*UpdateEvaluatorDraftResponse) +func (p *EvaluatorServiceListTemplatesResult) SetSuccess(x interface{}) { + p.Success = x.(*ListTemplatesResponse) } -var fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceListTemplatesResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) IsSetSuccess() bool { +func (p *EvaluatorServiceListTemplatesResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -20427,7 +28644,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -20437,8 +28654,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewUpdateEvaluatorDraftResponse() +func (p *EvaluatorServiceListTemplatesResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewListTemplatesResponse() if err := _field.Read(iprot); err != nil { return err } @@ -20446,9 +28663,9 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftResult) ReadField0(iprot thrift.TPr return nil } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("UpdateEvaluatorDraft_result"); err != nil { + if err = oprot.WriteStructBegin("ListTemplates_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -20474,7 +28691,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -20493,15 +28710,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) String() string { +func (p *EvaluatorServiceListTemplatesResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorDraftResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceListTemplatesResult(%+v)", *p) } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorDraftResult) bool { +func (p *EvaluatorServiceListTemplatesResult) DeepEqual(ano *EvaluatorServiceListTemplatesResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -20513,7 +28730,7 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftResult) DeepEqual(ano *EvaluatorSer return true } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) Field0DeepEqual(src *UpdateEvaluatorDraftResponse) bool { +func (p *EvaluatorServiceListTemplatesResult) Field0DeepEqual(src *ListTemplatesResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -20521,41 +28738,41 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftResult) Field0DeepEqual(src *Update return true } -type EvaluatorServiceDeleteEvaluatorArgs struct { - Request *DeleteEvaluatorRequest `thrift:"request,1" frugal:"1,default,DeleteEvaluatorRequest"` +type EvaluatorServiceGetTemplateInfoArgs struct { + Request *GetTemplateInfoRequest `thrift:"request,1" frugal:"1,default,GetTemplateInfoRequest"` } -func NewEvaluatorServiceDeleteEvaluatorArgs() *EvaluatorServiceDeleteEvaluatorArgs { - return &EvaluatorServiceDeleteEvaluatorArgs{} +func NewEvaluatorServiceGetTemplateInfoArgs() *EvaluatorServiceGetTemplateInfoArgs { + return &EvaluatorServiceGetTemplateInfoArgs{} } -func (p *EvaluatorServiceDeleteEvaluatorArgs) InitDefault() { +func (p *EvaluatorServiceGetTemplateInfoArgs) InitDefault() { } -var EvaluatorServiceDeleteEvaluatorArgs_Request_DEFAULT *DeleteEvaluatorRequest +var EvaluatorServiceGetTemplateInfoArgs_Request_DEFAULT *GetTemplateInfoRequest -func (p *EvaluatorServiceDeleteEvaluatorArgs) GetRequest() (v *DeleteEvaluatorRequest) { +func (p *EvaluatorServiceGetTemplateInfoArgs) GetRequest() (v *GetTemplateInfoRequest) { if p == nil { return } if !p.IsSetRequest() { - return EvaluatorServiceDeleteEvaluatorArgs_Request_DEFAULT + return EvaluatorServiceGetTemplateInfoArgs_Request_DEFAULT } return p.Request } -func (p *EvaluatorServiceDeleteEvaluatorArgs) SetRequest(val *DeleteEvaluatorRequest) { +func (p *EvaluatorServiceGetTemplateInfoArgs) SetRequest(val *GetTemplateInfoRequest) { p.Request = val } -var fieldIDToName_EvaluatorServiceDeleteEvaluatorArgs = map[int16]string{ +var fieldIDToName_EvaluatorServiceGetTemplateInfoArgs = map[int16]string{ 1: "request", } -func (p *EvaluatorServiceDeleteEvaluatorArgs) IsSetRequest() bool { +func (p *EvaluatorServiceGetTemplateInfoArgs) IsSetRequest() bool { return p.Request != nil } -func (p *EvaluatorServiceDeleteEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetTemplateInfoArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -20600,7 +28817,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateInfoArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -20610,8 +28827,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceDeleteEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewDeleteEvaluatorRequest() +func (p *EvaluatorServiceGetTemplateInfoArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewGetTemplateInfoRequest() if err := _field.Read(iprot); err != nil { return err } @@ -20619,9 +28836,9 @@ func (p *EvaluatorServiceDeleteEvaluatorArgs) ReadField1(iprot thrift.TProtocol) return nil } -func (p *EvaluatorServiceDeleteEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetTemplateInfoArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("DeleteEvaluator_args"); err != nil { + if err = oprot.WriteStructBegin("GetTemplateInfo_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -20647,7 +28864,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceDeleteEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetTemplateInfoArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -20664,15 +28881,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceDeleteEvaluatorArgs) String() string { +func (p *EvaluatorServiceGetTemplateInfoArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceDeleteEvaluatorArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceGetTemplateInfoArgs(%+v)", *p) } -func (p *EvaluatorServiceDeleteEvaluatorArgs) DeepEqual(ano *EvaluatorServiceDeleteEvaluatorArgs) bool { +func (p *EvaluatorServiceGetTemplateInfoArgs) DeepEqual(ano *EvaluatorServiceGetTemplateInfoArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -20684,7 +28901,7 @@ func (p *EvaluatorServiceDeleteEvaluatorArgs) DeepEqual(ano *EvaluatorServiceDel return true } -func (p *EvaluatorServiceDeleteEvaluatorArgs) Field1DeepEqual(src *DeleteEvaluatorRequest) bool { +func (p *EvaluatorServiceGetTemplateInfoArgs) Field1DeepEqual(src *GetTemplateInfoRequest) bool { if !p.Request.DeepEqual(src) { return false @@ -20692,41 +28909,41 @@ func (p *EvaluatorServiceDeleteEvaluatorArgs) Field1DeepEqual(src *DeleteEvaluat return true } -type EvaluatorServiceDeleteEvaluatorResult struct { - Success *DeleteEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,DeleteEvaluatorResponse"` +type EvaluatorServiceGetTemplateInfoResult struct { + Success *GetTemplateInfoResponse `thrift:"success,0,optional" frugal:"0,optional,GetTemplateInfoResponse"` } -func NewEvaluatorServiceDeleteEvaluatorResult() *EvaluatorServiceDeleteEvaluatorResult { - return &EvaluatorServiceDeleteEvaluatorResult{} +func NewEvaluatorServiceGetTemplateInfoResult() *EvaluatorServiceGetTemplateInfoResult { + return &EvaluatorServiceGetTemplateInfoResult{} } -func (p *EvaluatorServiceDeleteEvaluatorResult) InitDefault() { +func (p *EvaluatorServiceGetTemplateInfoResult) InitDefault() { } -var EvaluatorServiceDeleteEvaluatorResult_Success_DEFAULT *DeleteEvaluatorResponse +var EvaluatorServiceGetTemplateInfoResult_Success_DEFAULT *GetTemplateInfoResponse -func (p *EvaluatorServiceDeleteEvaluatorResult) GetSuccess() (v *DeleteEvaluatorResponse) { +func (p *EvaluatorServiceGetTemplateInfoResult) GetSuccess() (v *GetTemplateInfoResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceDeleteEvaluatorResult_Success_DEFAULT + return EvaluatorServiceGetTemplateInfoResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceDeleteEvaluatorResult) SetSuccess(x interface{}) { - p.Success = x.(*DeleteEvaluatorResponse) +func (p *EvaluatorServiceGetTemplateInfoResult) SetSuccess(x interface{}) { + p.Success = x.(*GetTemplateInfoResponse) } -var fieldIDToName_EvaluatorServiceDeleteEvaluatorResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceGetTemplateInfoResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceDeleteEvaluatorResult) IsSetSuccess() bool { +func (p *EvaluatorServiceGetTemplateInfoResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceDeleteEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetTemplateInfoResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -20771,7 +28988,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateInfoResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -20781,8 +28998,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceDeleteEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewDeleteEvaluatorResponse() +func (p *EvaluatorServiceGetTemplateInfoResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewGetTemplateInfoResponse() if err := _field.Read(iprot); err != nil { return err } @@ -20790,9 +29007,9 @@ func (p *EvaluatorServiceDeleteEvaluatorResult) ReadField0(iprot thrift.TProtoco return nil } -func (p *EvaluatorServiceDeleteEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetTemplateInfoResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("DeleteEvaluator_result"); err != nil { + if err = oprot.WriteStructBegin("GetTemplateInfo_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -20818,7 +29035,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceDeleteEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetTemplateInfoResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -20837,15 +29054,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceDeleteEvaluatorResult) String() string { +func (p *EvaluatorServiceGetTemplateInfoResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceDeleteEvaluatorResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceGetTemplateInfoResult(%+v)", *p) } -func (p *EvaluatorServiceDeleteEvaluatorResult) DeepEqual(ano *EvaluatorServiceDeleteEvaluatorResult) bool { +func (p *EvaluatorServiceGetTemplateInfoResult) DeepEqual(ano *EvaluatorServiceGetTemplateInfoResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -20857,7 +29074,7 @@ func (p *EvaluatorServiceDeleteEvaluatorResult) DeepEqual(ano *EvaluatorServiceD return true } -func (p *EvaluatorServiceDeleteEvaluatorResult) Field0DeepEqual(src *DeleteEvaluatorResponse) bool { +func (p *EvaluatorServiceGetTemplateInfoResult) Field0DeepEqual(src *GetTemplateInfoResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -20865,41 +29082,41 @@ func (p *EvaluatorServiceDeleteEvaluatorResult) Field0DeepEqual(src *DeleteEvalu return true } -type EvaluatorServiceCheckEvaluatorNameArgs struct { - Request *CheckEvaluatorNameRequest `thrift:"request,1" frugal:"1,default,CheckEvaluatorNameRequest"` +type EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs struct { + Req *GetDefaultPromptEvaluatorToolsRequest `thrift:"req,1" frugal:"1,default,GetDefaultPromptEvaluatorToolsRequest"` } -func NewEvaluatorServiceCheckEvaluatorNameArgs() *EvaluatorServiceCheckEvaluatorNameArgs { - return &EvaluatorServiceCheckEvaluatorNameArgs{} +func NewEvaluatorServiceGetDefaultPromptEvaluatorToolsArgs() *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs { + return &EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs{} } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) InitDefault() { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) InitDefault() { } -var EvaluatorServiceCheckEvaluatorNameArgs_Request_DEFAULT *CheckEvaluatorNameRequest +var EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs_Req_DEFAULT *GetDefaultPromptEvaluatorToolsRequest -func (p *EvaluatorServiceCheckEvaluatorNameArgs) GetRequest() (v *CheckEvaluatorNameRequest) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) GetReq() (v *GetDefaultPromptEvaluatorToolsRequest) { if p == nil { return } - if !p.IsSetRequest() { - return EvaluatorServiceCheckEvaluatorNameArgs_Request_DEFAULT - } - return p.Request + if !p.IsSetReq() { + return EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs_Req_DEFAULT + } + return p.Req } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) SetRequest(val *CheckEvaluatorNameRequest) { - p.Request = val +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) SetReq(val *GetDefaultPromptEvaluatorToolsRequest) { + p.Req = val } -var fieldIDToName_EvaluatorServiceCheckEvaluatorNameArgs = map[int16]string{ - 1: "request", +var fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs = map[int16]string{ + 1: "req", } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) IsSetRequest() bool { - return p.Request != nil +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) IsSetReq() bool { + return p.Req != nil } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -20944,7 +29161,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCheckEvaluatorNameArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -20954,18 +29171,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewCheckEvaluatorNameRequest() +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewGetDefaultPromptEvaluatorToolsRequest() if err := _field.Read(iprot); err != nil { return err } - p.Request = _field + p.Req = _field return nil } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("CheckEvaluatorName_args"); err != nil { + if err = oprot.WriteStructBegin("GetDefaultPromptEvaluatorTools_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -20991,11 +29208,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Request.Write(oprot); err != nil { + if err := p.Req.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -21008,69 +29225,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) String() string { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceCheckEvaluatorNameArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs(%+v)", *p) } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) DeepEqual(ano *EvaluatorServiceCheckEvaluatorNameArgs) bool { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) DeepEqual(ano *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Request) { + if !p.Field1DeepEqual(ano.Req) { return false } return true } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) Field1DeepEqual(src *CheckEvaluatorNameRequest) bool { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) Field1DeepEqual(src *GetDefaultPromptEvaluatorToolsRequest) bool { - if !p.Request.DeepEqual(src) { + if !p.Req.DeepEqual(src) { return false } return true } -type EvaluatorServiceCheckEvaluatorNameResult struct { - Success *CheckEvaluatorNameResponse `thrift:"success,0,optional" frugal:"0,optional,CheckEvaluatorNameResponse"` +type EvaluatorServiceGetDefaultPromptEvaluatorToolsResult struct { + Success *GetDefaultPromptEvaluatorToolsResponse `thrift:"success,0,optional" frugal:"0,optional,GetDefaultPromptEvaluatorToolsResponse"` } -func NewEvaluatorServiceCheckEvaluatorNameResult() *EvaluatorServiceCheckEvaluatorNameResult { - return &EvaluatorServiceCheckEvaluatorNameResult{} +func NewEvaluatorServiceGetDefaultPromptEvaluatorToolsResult() *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult { + return &EvaluatorServiceGetDefaultPromptEvaluatorToolsResult{} } -func (p *EvaluatorServiceCheckEvaluatorNameResult) InitDefault() { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) InitDefault() { } -var EvaluatorServiceCheckEvaluatorNameResult_Success_DEFAULT *CheckEvaluatorNameResponse +var EvaluatorServiceGetDefaultPromptEvaluatorToolsResult_Success_DEFAULT *GetDefaultPromptEvaluatorToolsResponse -func (p *EvaluatorServiceCheckEvaluatorNameResult) GetSuccess() (v *CheckEvaluatorNameResponse) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) GetSuccess() (v *GetDefaultPromptEvaluatorToolsResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceCheckEvaluatorNameResult_Success_DEFAULT + return EvaluatorServiceGetDefaultPromptEvaluatorToolsResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceCheckEvaluatorNameResult) SetSuccess(x interface{}) { - p.Success = x.(*CheckEvaluatorNameResponse) +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) SetSuccess(x interface{}) { + p.Success = x.(*GetDefaultPromptEvaluatorToolsResponse) } -var fieldIDToName_EvaluatorServiceCheckEvaluatorNameResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceCheckEvaluatorNameResult) IsSetSuccess() bool { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceCheckEvaluatorNameResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -21115,7 +29332,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCheckEvaluatorNameResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -21125,8 +29342,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceCheckEvaluatorNameResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewCheckEvaluatorNameResponse() +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewGetDefaultPromptEvaluatorToolsResponse() if err := _field.Read(iprot); err != nil { return err } @@ -21134,9 +29351,9 @@ func (p *EvaluatorServiceCheckEvaluatorNameResult) ReadField0(iprot thrift.TProt return nil } -func (p *EvaluatorServiceCheckEvaluatorNameResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("CheckEvaluatorName_result"); err != nil { + if err = oprot.WriteStructBegin("GetDefaultPromptEvaluatorTools_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -21162,7 +29379,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceCheckEvaluatorNameResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -21181,15 +29398,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceCheckEvaluatorNameResult) String() string { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceCheckEvaluatorNameResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceGetDefaultPromptEvaluatorToolsResult(%+v)", *p) } -func (p *EvaluatorServiceCheckEvaluatorNameResult) DeepEqual(ano *EvaluatorServiceCheckEvaluatorNameResult) bool { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) DeepEqual(ano *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -21201,7 +29418,7 @@ func (p *EvaluatorServiceCheckEvaluatorNameResult) DeepEqual(ano *EvaluatorServi return true } -func (p *EvaluatorServiceCheckEvaluatorNameResult) Field0DeepEqual(src *CheckEvaluatorNameResponse) bool { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) Field0DeepEqual(src *GetDefaultPromptEvaluatorToolsResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -21209,41 +29426,41 @@ func (p *EvaluatorServiceCheckEvaluatorNameResult) Field0DeepEqual(src *CheckEva return true } -type EvaluatorServiceListEvaluatorVersionsArgs struct { - Request *ListEvaluatorVersionsRequest `thrift:"request,1" frugal:"1,default,ListEvaluatorVersionsRequest"` +type EvaluatorServiceRunEvaluatorArgs struct { + Req *RunEvaluatorRequest `thrift:"req,1" frugal:"1,default,RunEvaluatorRequest"` } -func NewEvaluatorServiceListEvaluatorVersionsArgs() *EvaluatorServiceListEvaluatorVersionsArgs { - return &EvaluatorServiceListEvaluatorVersionsArgs{} +func NewEvaluatorServiceRunEvaluatorArgs() *EvaluatorServiceRunEvaluatorArgs { + return &EvaluatorServiceRunEvaluatorArgs{} } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) InitDefault() { +func (p *EvaluatorServiceRunEvaluatorArgs) InitDefault() { } -var EvaluatorServiceListEvaluatorVersionsArgs_Request_DEFAULT *ListEvaluatorVersionsRequest +var EvaluatorServiceRunEvaluatorArgs_Req_DEFAULT *RunEvaluatorRequest -func (p *EvaluatorServiceListEvaluatorVersionsArgs) GetRequest() (v *ListEvaluatorVersionsRequest) { +func (p *EvaluatorServiceRunEvaluatorArgs) GetReq() (v *RunEvaluatorRequest) { if p == nil { return } - if !p.IsSetRequest() { - return EvaluatorServiceListEvaluatorVersionsArgs_Request_DEFAULT + if !p.IsSetReq() { + return EvaluatorServiceRunEvaluatorArgs_Req_DEFAULT } - return p.Request + return p.Req } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) SetRequest(val *ListEvaluatorVersionsRequest) { - p.Request = val +func (p *EvaluatorServiceRunEvaluatorArgs) SetReq(val *RunEvaluatorRequest) { + p.Req = val } -var fieldIDToName_EvaluatorServiceListEvaluatorVersionsArgs = map[int16]string{ - 1: "request", +var fieldIDToName_EvaluatorServiceRunEvaluatorArgs = map[int16]string{ + 1: "req", } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) IsSetRequest() bool { - return p.Request != nil +func (p *EvaluatorServiceRunEvaluatorArgs) IsSetReq() bool { + return p.Req != nil } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceRunEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -21288,7 +29505,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorVersionsArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceRunEvaluatorArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -21298,18 +29515,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewListEvaluatorVersionsRequest() +func (p *EvaluatorServiceRunEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewRunEvaluatorRequest() if err := _field.Read(iprot); err != nil { return err } - p.Request = _field + p.Req = _field return nil } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceRunEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("ListEvaluatorVersions_args"); err != nil { + if err = oprot.WriteStructBegin("RunEvaluator_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -21335,11 +29552,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceRunEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Request.Write(oprot); err != nil { + if err := p.Req.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -21352,69 +29569,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) String() string { +func (p *EvaluatorServiceRunEvaluatorArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceListEvaluatorVersionsArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceRunEvaluatorArgs(%+v)", *p) } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) DeepEqual(ano *EvaluatorServiceListEvaluatorVersionsArgs) bool { +func (p *EvaluatorServiceRunEvaluatorArgs) DeepEqual(ano *EvaluatorServiceRunEvaluatorArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Request) { + if !p.Field1DeepEqual(ano.Req) { return false } return true } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) Field1DeepEqual(src *ListEvaluatorVersionsRequest) bool { +func (p *EvaluatorServiceRunEvaluatorArgs) Field1DeepEqual(src *RunEvaluatorRequest) bool { - if !p.Request.DeepEqual(src) { + if !p.Req.DeepEqual(src) { return false } return true } -type EvaluatorServiceListEvaluatorVersionsResult struct { - Success *ListEvaluatorVersionsResponse `thrift:"success,0,optional" frugal:"0,optional,ListEvaluatorVersionsResponse"` +type EvaluatorServiceRunEvaluatorResult struct { + Success *RunEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,RunEvaluatorResponse"` } -func NewEvaluatorServiceListEvaluatorVersionsResult() *EvaluatorServiceListEvaluatorVersionsResult { - return &EvaluatorServiceListEvaluatorVersionsResult{} +func NewEvaluatorServiceRunEvaluatorResult() *EvaluatorServiceRunEvaluatorResult { + return &EvaluatorServiceRunEvaluatorResult{} } -func (p *EvaluatorServiceListEvaluatorVersionsResult) InitDefault() { +func (p *EvaluatorServiceRunEvaluatorResult) InitDefault() { } -var EvaluatorServiceListEvaluatorVersionsResult_Success_DEFAULT *ListEvaluatorVersionsResponse +var EvaluatorServiceRunEvaluatorResult_Success_DEFAULT *RunEvaluatorResponse -func (p *EvaluatorServiceListEvaluatorVersionsResult) GetSuccess() (v *ListEvaluatorVersionsResponse) { +func (p *EvaluatorServiceRunEvaluatorResult) GetSuccess() (v *RunEvaluatorResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceListEvaluatorVersionsResult_Success_DEFAULT + return EvaluatorServiceRunEvaluatorResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceListEvaluatorVersionsResult) SetSuccess(x interface{}) { - p.Success = x.(*ListEvaluatorVersionsResponse) +func (p *EvaluatorServiceRunEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*RunEvaluatorResponse) } -var fieldIDToName_EvaluatorServiceListEvaluatorVersionsResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceRunEvaluatorResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceListEvaluatorVersionsResult) IsSetSuccess() bool { +func (p *EvaluatorServiceRunEvaluatorResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceListEvaluatorVersionsResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceRunEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -21459,7 +29676,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorVersionsResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceRunEvaluatorResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -21469,8 +29686,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorVersionsResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewListEvaluatorVersionsResponse() +func (p *EvaluatorServiceRunEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewRunEvaluatorResponse() if err := _field.Read(iprot); err != nil { return err } @@ -21478,9 +29695,9 @@ func (p *EvaluatorServiceListEvaluatorVersionsResult) ReadField0(iprot thrift.TP return nil } -func (p *EvaluatorServiceListEvaluatorVersionsResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceRunEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("ListEvaluatorVersions_result"); err != nil { + if err = oprot.WriteStructBegin("RunEvaluator_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -21506,7 +29723,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorVersionsResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceRunEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -21525,15 +29742,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceListEvaluatorVersionsResult) String() string { +func (p *EvaluatorServiceRunEvaluatorResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceListEvaluatorVersionsResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceRunEvaluatorResult(%+v)", *p) } -func (p *EvaluatorServiceListEvaluatorVersionsResult) DeepEqual(ano *EvaluatorServiceListEvaluatorVersionsResult) bool { +func (p *EvaluatorServiceRunEvaluatorResult) DeepEqual(ano *EvaluatorServiceRunEvaluatorResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -21545,7 +29762,7 @@ func (p *EvaluatorServiceListEvaluatorVersionsResult) DeepEqual(ano *EvaluatorSe return true } -func (p *EvaluatorServiceListEvaluatorVersionsResult) Field0DeepEqual(src *ListEvaluatorVersionsResponse) bool { +func (p *EvaluatorServiceRunEvaluatorResult) Field0DeepEqual(src *RunEvaluatorResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -21553,41 +29770,41 @@ func (p *EvaluatorServiceListEvaluatorVersionsResult) Field0DeepEqual(src *ListE return true } -type EvaluatorServiceGetEvaluatorVersionArgs struct { - Request *GetEvaluatorVersionRequest `thrift:"request,1" frugal:"1,default,GetEvaluatorVersionRequest"` +type EvaluatorServiceDebugEvaluatorArgs struct { + Req *DebugEvaluatorRequest `thrift:"req,1" frugal:"1,default,DebugEvaluatorRequest"` } -func NewEvaluatorServiceGetEvaluatorVersionArgs() *EvaluatorServiceGetEvaluatorVersionArgs { - return &EvaluatorServiceGetEvaluatorVersionArgs{} +func NewEvaluatorServiceDebugEvaluatorArgs() *EvaluatorServiceDebugEvaluatorArgs { + return &EvaluatorServiceDebugEvaluatorArgs{} } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) InitDefault() { +func (p *EvaluatorServiceDebugEvaluatorArgs) InitDefault() { } -var EvaluatorServiceGetEvaluatorVersionArgs_Request_DEFAULT *GetEvaluatorVersionRequest +var EvaluatorServiceDebugEvaluatorArgs_Req_DEFAULT *DebugEvaluatorRequest -func (p *EvaluatorServiceGetEvaluatorVersionArgs) GetRequest() (v *GetEvaluatorVersionRequest) { +func (p *EvaluatorServiceDebugEvaluatorArgs) GetReq() (v *DebugEvaluatorRequest) { if p == nil { return } - if !p.IsSetRequest() { - return EvaluatorServiceGetEvaluatorVersionArgs_Request_DEFAULT + if !p.IsSetReq() { + return EvaluatorServiceDebugEvaluatorArgs_Req_DEFAULT } - return p.Request + return p.Req } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) SetRequest(val *GetEvaluatorVersionRequest) { - p.Request = val +func (p *EvaluatorServiceDebugEvaluatorArgs) SetReq(val *DebugEvaluatorRequest) { + p.Req = val } -var fieldIDToName_EvaluatorServiceGetEvaluatorVersionArgs = map[int16]string{ - 1: "request", +var fieldIDToName_EvaluatorServiceDebugEvaluatorArgs = map[int16]string{ + 1: "req", } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) IsSetRequest() bool { - return p.Request != nil +func (p *EvaluatorServiceDebugEvaluatorArgs) IsSetReq() bool { + return p.Req != nil } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -21632,7 +29849,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorVersionArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugEvaluatorArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -21642,18 +29859,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewGetEvaluatorVersionRequest() +func (p *EvaluatorServiceDebugEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewDebugEvaluatorRequest() if err := _field.Read(iprot); err != nil { return err } - p.Request = _field + p.Req = _field return nil } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetEvaluatorVersion_args"); err != nil { + if err = oprot.WriteStructBegin("DebugEvaluator_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -21679,11 +29896,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceDebugEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Request.Write(oprot); err != nil { + if err := p.Req.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -21696,69 +29913,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) String() string { +func (p *EvaluatorServiceDebugEvaluatorArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceGetEvaluatorVersionArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceDebugEvaluatorArgs(%+v)", *p) } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) DeepEqual(ano *EvaluatorServiceGetEvaluatorVersionArgs) bool { +func (p *EvaluatorServiceDebugEvaluatorArgs) DeepEqual(ano *EvaluatorServiceDebugEvaluatorArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Request) { + if !p.Field1DeepEqual(ano.Req) { return false } return true } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) Field1DeepEqual(src *GetEvaluatorVersionRequest) bool { +func (p *EvaluatorServiceDebugEvaluatorArgs) Field1DeepEqual(src *DebugEvaluatorRequest) bool { - if !p.Request.DeepEqual(src) { + if !p.Req.DeepEqual(src) { return false } return true } -type EvaluatorServiceGetEvaluatorVersionResult struct { - Success *GetEvaluatorVersionResponse `thrift:"success,0,optional" frugal:"0,optional,GetEvaluatorVersionResponse"` +type EvaluatorServiceDebugEvaluatorResult struct { + Success *DebugEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,DebugEvaluatorResponse"` } -func NewEvaluatorServiceGetEvaluatorVersionResult() *EvaluatorServiceGetEvaluatorVersionResult { - return &EvaluatorServiceGetEvaluatorVersionResult{} +func NewEvaluatorServiceDebugEvaluatorResult() *EvaluatorServiceDebugEvaluatorResult { + return &EvaluatorServiceDebugEvaluatorResult{} } -func (p *EvaluatorServiceGetEvaluatorVersionResult) InitDefault() { +func (p *EvaluatorServiceDebugEvaluatorResult) InitDefault() { } -var EvaluatorServiceGetEvaluatorVersionResult_Success_DEFAULT *GetEvaluatorVersionResponse +var EvaluatorServiceDebugEvaluatorResult_Success_DEFAULT *DebugEvaluatorResponse -func (p *EvaluatorServiceGetEvaluatorVersionResult) GetSuccess() (v *GetEvaluatorVersionResponse) { +func (p *EvaluatorServiceDebugEvaluatorResult) GetSuccess() (v *DebugEvaluatorResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceGetEvaluatorVersionResult_Success_DEFAULT + return EvaluatorServiceDebugEvaluatorResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceGetEvaluatorVersionResult) SetSuccess(x interface{}) { - p.Success = x.(*GetEvaluatorVersionResponse) +func (p *EvaluatorServiceDebugEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*DebugEvaluatorResponse) } -var fieldIDToName_EvaluatorServiceGetEvaluatorVersionResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceDebugEvaluatorResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceGetEvaluatorVersionResult) IsSetSuccess() bool { +func (p *EvaluatorServiceDebugEvaluatorResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceGetEvaluatorVersionResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -21803,7 +30020,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorVersionResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugEvaluatorResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -21813,8 +30030,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorVersionResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewGetEvaluatorVersionResponse() +func (p *EvaluatorServiceDebugEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewDebugEvaluatorResponse() if err := _field.Read(iprot); err != nil { return err } @@ -21822,9 +30039,9 @@ func (p *EvaluatorServiceGetEvaluatorVersionResult) ReadField0(iprot thrift.TPro return nil } -func (p *EvaluatorServiceGetEvaluatorVersionResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetEvaluatorVersion_result"); err != nil { + if err = oprot.WriteStructBegin("DebugEvaluator_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -21850,7 +30067,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorVersionResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -21869,15 +30086,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorVersionResult) String() string { +func (p *EvaluatorServiceDebugEvaluatorResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceGetEvaluatorVersionResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceDebugEvaluatorResult(%+v)", *p) } -func (p *EvaluatorServiceGetEvaluatorVersionResult) DeepEqual(ano *EvaluatorServiceGetEvaluatorVersionResult) bool { +func (p *EvaluatorServiceDebugEvaluatorResult) DeepEqual(ano *EvaluatorServiceDebugEvaluatorResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -21889,7 +30106,7 @@ func (p *EvaluatorServiceGetEvaluatorVersionResult) DeepEqual(ano *EvaluatorServ return true } -func (p *EvaluatorServiceGetEvaluatorVersionResult) Field0DeepEqual(src *GetEvaluatorVersionResponse) bool { +func (p *EvaluatorServiceDebugEvaluatorResult) Field0DeepEqual(src *DebugEvaluatorResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -21897,41 +30114,41 @@ func (p *EvaluatorServiceGetEvaluatorVersionResult) Field0DeepEqual(src *GetEval return true } -type EvaluatorServiceBatchGetEvaluatorVersionsArgs struct { - Request *BatchGetEvaluatorVersionsRequest `thrift:"request,1" frugal:"1,default,BatchGetEvaluatorVersionsRequest"` +type EvaluatorServiceBatchDebugEvaluatorArgs struct { + Req *BatchDebugEvaluatorRequest `thrift:"req,1" frugal:"1,default,BatchDebugEvaluatorRequest"` } -func NewEvaluatorServiceBatchGetEvaluatorVersionsArgs() *EvaluatorServiceBatchGetEvaluatorVersionsArgs { - return &EvaluatorServiceBatchGetEvaluatorVersionsArgs{} +func NewEvaluatorServiceBatchDebugEvaluatorArgs() *EvaluatorServiceBatchDebugEvaluatorArgs { + return &EvaluatorServiceBatchDebugEvaluatorArgs{} } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) InitDefault() { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) InitDefault() { } -var EvaluatorServiceBatchGetEvaluatorVersionsArgs_Request_DEFAULT *BatchGetEvaluatorVersionsRequest +var EvaluatorServiceBatchDebugEvaluatorArgs_Req_DEFAULT *BatchDebugEvaluatorRequest -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) GetRequest() (v *BatchGetEvaluatorVersionsRequest) { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) GetReq() (v *BatchDebugEvaluatorRequest) { if p == nil { return } - if !p.IsSetRequest() { - return EvaluatorServiceBatchGetEvaluatorVersionsArgs_Request_DEFAULT + if !p.IsSetReq() { + return EvaluatorServiceBatchDebugEvaluatorArgs_Req_DEFAULT } - return p.Request + return p.Req } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) SetRequest(val *BatchGetEvaluatorVersionsRequest) { - p.Request = val +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) SetReq(val *BatchDebugEvaluatorRequest) { + p.Req = val } -var fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsArgs = map[int16]string{ - 1: "request", +var fieldIDToName_EvaluatorServiceBatchDebugEvaluatorArgs = map[int16]string{ + 1: "req", } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) IsSetRequest() bool { - return p.Request != nil +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) IsSetReq() bool { + return p.Req != nil } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -21976,7 +30193,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchDebugEvaluatorArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -21986,18 +30203,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewBatchGetEvaluatorVersionsRequest() +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewBatchDebugEvaluatorRequest() if err := _field.Read(iprot); err != nil { return err } - p.Request = _field + p.Req = _field return nil } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("BatchGetEvaluatorVersions_args"); err != nil { + if err = oprot.WriteStructBegin("BatchDebugEvaluator_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -22023,11 +30240,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Request.Write(oprot); err != nil { + if err := p.Req.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -22040,69 +30257,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) String() string { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorVersionsArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceBatchDebugEvaluatorArgs(%+v)", *p) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorVersionsArgs) bool { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) DeepEqual(ano *EvaluatorServiceBatchDebugEvaluatorArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Request) { + if !p.Field1DeepEqual(ano.Req) { return false } return true } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) Field1DeepEqual(src *BatchGetEvaluatorVersionsRequest) bool { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) Field1DeepEqual(src *BatchDebugEvaluatorRequest) bool { - if !p.Request.DeepEqual(src) { + if !p.Req.DeepEqual(src) { return false } return true } -type EvaluatorServiceBatchGetEvaluatorVersionsResult struct { - Success *BatchGetEvaluatorVersionsResponse `thrift:"success,0,optional" frugal:"0,optional,BatchGetEvaluatorVersionsResponse"` +type EvaluatorServiceBatchDebugEvaluatorResult struct { + Success *BatchDebugEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,BatchDebugEvaluatorResponse"` } -func NewEvaluatorServiceBatchGetEvaluatorVersionsResult() *EvaluatorServiceBatchGetEvaluatorVersionsResult { - return &EvaluatorServiceBatchGetEvaluatorVersionsResult{} +func NewEvaluatorServiceBatchDebugEvaluatorResult() *EvaluatorServiceBatchDebugEvaluatorResult { + return &EvaluatorServiceBatchDebugEvaluatorResult{} } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) InitDefault() { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) InitDefault() { } -var EvaluatorServiceBatchGetEvaluatorVersionsResult_Success_DEFAULT *BatchGetEvaluatorVersionsResponse +var EvaluatorServiceBatchDebugEvaluatorResult_Success_DEFAULT *BatchDebugEvaluatorResponse -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) GetSuccess() (v *BatchGetEvaluatorVersionsResponse) { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) GetSuccess() (v *BatchDebugEvaluatorResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceBatchGetEvaluatorVersionsResult_Success_DEFAULT + return EvaluatorServiceBatchDebugEvaluatorResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) SetSuccess(x interface{}) { - p.Success = x.(*BatchGetEvaluatorVersionsResponse) +func (p *EvaluatorServiceBatchDebugEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*BatchDebugEvaluatorResponse) } -var fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceBatchDebugEvaluatorResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) IsSetSuccess() bool { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -22147,7 +30364,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchDebugEvaluatorResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -22157,8 +30374,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewBatchGetEvaluatorVersionsResponse() +func (p *EvaluatorServiceBatchDebugEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewBatchDebugEvaluatorResponse() if err := _field.Read(iprot); err != nil { return err } @@ -22166,9 +30383,9 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) ReadField0(iprot thrif return nil } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("BatchGetEvaluatorVersions_result"); err != nil { + if err = oprot.WriteStructBegin("BatchDebugEvaluator_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -22194,7 +30411,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -22213,15 +30430,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) String() string { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorVersionsResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceBatchDebugEvaluatorResult(%+v)", *p) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorVersionsResult) bool { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) DeepEqual(ano *EvaluatorServiceBatchDebugEvaluatorResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -22233,7 +30450,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) DeepEqual(ano *Evaluat return true } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) Field0DeepEqual(src *BatchGetEvaluatorVersionsResponse) bool { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) Field0DeepEqual(src *BatchDebugEvaluatorResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -22241,41 +30458,41 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) Field0DeepEqual(src *B return true } -type EvaluatorServiceSubmitEvaluatorVersionArgs struct { - Request *SubmitEvaluatorVersionRequest `thrift:"request,1" frugal:"1,default,SubmitEvaluatorVersionRequest"` +type EvaluatorServiceUpdateEvaluatorRecordArgs struct { + Req *UpdateEvaluatorRecordRequest `thrift:"req,1" frugal:"1,default,UpdateEvaluatorRecordRequest"` } -func NewEvaluatorServiceSubmitEvaluatorVersionArgs() *EvaluatorServiceSubmitEvaluatorVersionArgs { - return &EvaluatorServiceSubmitEvaluatorVersionArgs{} +func NewEvaluatorServiceUpdateEvaluatorRecordArgs() *EvaluatorServiceUpdateEvaluatorRecordArgs { + return &EvaluatorServiceUpdateEvaluatorRecordArgs{} } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) InitDefault() { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) InitDefault() { } -var EvaluatorServiceSubmitEvaluatorVersionArgs_Request_DEFAULT *SubmitEvaluatorVersionRequest +var EvaluatorServiceUpdateEvaluatorRecordArgs_Req_DEFAULT *UpdateEvaluatorRecordRequest -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) GetRequest() (v *SubmitEvaluatorVersionRequest) { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) GetReq() (v *UpdateEvaluatorRecordRequest) { if p == nil { return } - if !p.IsSetRequest() { - return EvaluatorServiceSubmitEvaluatorVersionArgs_Request_DEFAULT + if !p.IsSetReq() { + return EvaluatorServiceUpdateEvaluatorRecordArgs_Req_DEFAULT } - return p.Request + return p.Req } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) SetRequest(val *SubmitEvaluatorVersionRequest) { - p.Request = val +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) SetReq(val *UpdateEvaluatorRecordRequest) { + p.Req = val } -var fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionArgs = map[int16]string{ - 1: "request", +var fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordArgs = map[int16]string{ + 1: "req", } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) IsSetRequest() bool { - return p.Request != nil +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) IsSetReq() bool { + return p.Req != nil } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -22320,7 +30537,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -22330,18 +30547,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewSubmitEvaluatorVersionRequest() +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewUpdateEvaluatorRecordRequest() if err := _field.Read(iprot); err != nil { return err } - p.Request = _field + p.Req = _field return nil } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("SubmitEvaluatorVersion_args"); err != nil { + if err = oprot.WriteStructBegin("UpdateEvaluatorRecord_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -22367,11 +30584,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Request.Write(oprot); err != nil { + if err := p.Req.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -22384,69 +30601,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) String() string { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceSubmitEvaluatorVersionArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorRecordArgs(%+v)", *p) } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) DeepEqual(ano *EvaluatorServiceSubmitEvaluatorVersionArgs) bool { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorRecordArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Request) { + if !p.Field1DeepEqual(ano.Req) { return false } return true } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) Field1DeepEqual(src *SubmitEvaluatorVersionRequest) bool { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) Field1DeepEqual(src *UpdateEvaluatorRecordRequest) bool { - if !p.Request.DeepEqual(src) { + if !p.Req.DeepEqual(src) { return false } return true } -type EvaluatorServiceSubmitEvaluatorVersionResult struct { - Success *SubmitEvaluatorVersionResponse `thrift:"success,0,optional" frugal:"0,optional,SubmitEvaluatorVersionResponse"` +type EvaluatorServiceUpdateEvaluatorRecordResult struct { + Success *UpdateEvaluatorRecordResponse `thrift:"success,0,optional" frugal:"0,optional,UpdateEvaluatorRecordResponse"` } -func NewEvaluatorServiceSubmitEvaluatorVersionResult() *EvaluatorServiceSubmitEvaluatorVersionResult { - return &EvaluatorServiceSubmitEvaluatorVersionResult{} +func NewEvaluatorServiceUpdateEvaluatorRecordResult() *EvaluatorServiceUpdateEvaluatorRecordResult { + return &EvaluatorServiceUpdateEvaluatorRecordResult{} } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) InitDefault() { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) InitDefault() { } -var EvaluatorServiceSubmitEvaluatorVersionResult_Success_DEFAULT *SubmitEvaluatorVersionResponse +var EvaluatorServiceUpdateEvaluatorRecordResult_Success_DEFAULT *UpdateEvaluatorRecordResponse -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) GetSuccess() (v *SubmitEvaluatorVersionResponse) { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) GetSuccess() (v *UpdateEvaluatorRecordResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceSubmitEvaluatorVersionResult_Success_DEFAULT + return EvaluatorServiceUpdateEvaluatorRecordResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) SetSuccess(x interface{}) { - p.Success = x.(*SubmitEvaluatorVersionResponse) +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) SetSuccess(x interface{}) { + p.Success = x.(*UpdateEvaluatorRecordResponse) } -var fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) IsSetSuccess() bool { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -22491,7 +30708,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -22501,8 +30718,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewSubmitEvaluatorVersionResponse() +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewUpdateEvaluatorRecordResponse() if err := _field.Read(iprot); err != nil { return err } @@ -22510,9 +30727,9 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionResult) ReadField0(iprot thrift.T return nil } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("SubmitEvaluatorVersion_result"); err != nil { + if err = oprot.WriteStructBegin("UpdateEvaluatorRecord_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -22538,7 +30755,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -22557,15 +30774,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) String() string { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceSubmitEvaluatorVersionResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorRecordResult(%+v)", *p) } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) DeepEqual(ano *EvaluatorServiceSubmitEvaluatorVersionResult) bool { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorRecordResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -22577,7 +30794,7 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionResult) DeepEqual(ano *EvaluatorS return true } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) Field0DeepEqual(src *SubmitEvaluatorVersionResponse) bool { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) Field0DeepEqual(src *UpdateEvaluatorRecordResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -22585,41 +30802,41 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionResult) Field0DeepEqual(src *Subm return true } -type EvaluatorServiceListTemplatesArgs struct { - Request *ListTemplatesRequest `thrift:"request,1" frugal:"1,default,ListTemplatesRequest"` +type EvaluatorServiceGetEvaluatorRecordArgs struct { + Req *GetEvaluatorRecordRequest `thrift:"req,1" frugal:"1,default,GetEvaluatorRecordRequest"` } -func NewEvaluatorServiceListTemplatesArgs() *EvaluatorServiceListTemplatesArgs { - return &EvaluatorServiceListTemplatesArgs{} +func NewEvaluatorServiceGetEvaluatorRecordArgs() *EvaluatorServiceGetEvaluatorRecordArgs { + return &EvaluatorServiceGetEvaluatorRecordArgs{} } -func (p *EvaluatorServiceListTemplatesArgs) InitDefault() { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) InitDefault() { } -var EvaluatorServiceListTemplatesArgs_Request_DEFAULT *ListTemplatesRequest +var EvaluatorServiceGetEvaluatorRecordArgs_Req_DEFAULT *GetEvaluatorRecordRequest -func (p *EvaluatorServiceListTemplatesArgs) GetRequest() (v *ListTemplatesRequest) { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) GetReq() (v *GetEvaluatorRecordRequest) { if p == nil { return } - if !p.IsSetRequest() { - return EvaluatorServiceListTemplatesArgs_Request_DEFAULT + if !p.IsSetReq() { + return EvaluatorServiceGetEvaluatorRecordArgs_Req_DEFAULT } - return p.Request + return p.Req } -func (p *EvaluatorServiceListTemplatesArgs) SetRequest(val *ListTemplatesRequest) { - p.Request = val +func (p *EvaluatorServiceGetEvaluatorRecordArgs) SetReq(val *GetEvaluatorRecordRequest) { + p.Req = val } -var fieldIDToName_EvaluatorServiceListTemplatesArgs = map[int16]string{ - 1: "request", +var fieldIDToName_EvaluatorServiceGetEvaluatorRecordArgs = map[int16]string{ + 1: "req", } -func (p *EvaluatorServiceListTemplatesArgs) IsSetRequest() bool { - return p.Request != nil +func (p *EvaluatorServiceGetEvaluatorRecordArgs) IsSetReq() bool { + return p.Req != nil } -func (p *EvaluatorServiceListTemplatesArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -22664,7 +30881,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorRecordArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -22674,18 +30891,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceListTemplatesArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewListTemplatesRequest() +func (p *EvaluatorServiceGetEvaluatorRecordArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewGetEvaluatorRecordRequest() if err := _field.Read(iprot); err != nil { return err } - p.Request = _field + p.Req = _field return nil } -func (p *EvaluatorServiceListTemplatesArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("ListTemplates_args"); err != nil { + if err = oprot.WriteStructBegin("GetEvaluatorRecord_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -22711,11 +30928,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceListTemplatesArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Request.Write(oprot); err != nil { + if err := p.Req.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -22728,69 +30945,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceListTemplatesArgs) String() string { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceListTemplatesArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceGetEvaluatorRecordArgs(%+v)", *p) } -func (p *EvaluatorServiceListTemplatesArgs) DeepEqual(ano *EvaluatorServiceListTemplatesArgs) bool { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) DeepEqual(ano *EvaluatorServiceGetEvaluatorRecordArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Request) { + if !p.Field1DeepEqual(ano.Req) { return false } return true } -func (p *EvaluatorServiceListTemplatesArgs) Field1DeepEqual(src *ListTemplatesRequest) bool { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) Field1DeepEqual(src *GetEvaluatorRecordRequest) bool { - if !p.Request.DeepEqual(src) { + if !p.Req.DeepEqual(src) { return false } return true } -type EvaluatorServiceListTemplatesResult struct { - Success *ListTemplatesResponse `thrift:"success,0,optional" frugal:"0,optional,ListTemplatesResponse"` +type EvaluatorServiceGetEvaluatorRecordResult struct { + Success *GetEvaluatorRecordResponse `thrift:"success,0,optional" frugal:"0,optional,GetEvaluatorRecordResponse"` } -func NewEvaluatorServiceListTemplatesResult() *EvaluatorServiceListTemplatesResult { - return &EvaluatorServiceListTemplatesResult{} +func NewEvaluatorServiceGetEvaluatorRecordResult() *EvaluatorServiceGetEvaluatorRecordResult { + return &EvaluatorServiceGetEvaluatorRecordResult{} } -func (p *EvaluatorServiceListTemplatesResult) InitDefault() { +func (p *EvaluatorServiceGetEvaluatorRecordResult) InitDefault() { } -var EvaluatorServiceListTemplatesResult_Success_DEFAULT *ListTemplatesResponse +var EvaluatorServiceGetEvaluatorRecordResult_Success_DEFAULT *GetEvaluatorRecordResponse -func (p *EvaluatorServiceListTemplatesResult) GetSuccess() (v *ListTemplatesResponse) { +func (p *EvaluatorServiceGetEvaluatorRecordResult) GetSuccess() (v *GetEvaluatorRecordResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceListTemplatesResult_Success_DEFAULT + return EvaluatorServiceGetEvaluatorRecordResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceListTemplatesResult) SetSuccess(x interface{}) { - p.Success = x.(*ListTemplatesResponse) +func (p *EvaluatorServiceGetEvaluatorRecordResult) SetSuccess(x interface{}) { + p.Success = x.(*GetEvaluatorRecordResponse) } -var fieldIDToName_EvaluatorServiceListTemplatesResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceGetEvaluatorRecordResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceListTemplatesResult) IsSetSuccess() bool { +func (p *EvaluatorServiceGetEvaluatorRecordResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceListTemplatesResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorRecordResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -22835,7 +31052,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorRecordResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -22845,8 +31062,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceListTemplatesResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewListTemplatesResponse() +func (p *EvaluatorServiceGetEvaluatorRecordResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewGetEvaluatorRecordResponse() if err := _field.Read(iprot); err != nil { return err } @@ -22854,9 +31071,9 @@ func (p *EvaluatorServiceListTemplatesResult) ReadField0(iprot thrift.TProtocol) return nil } -func (p *EvaluatorServiceListTemplatesResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorRecordResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("ListTemplates_result"); err != nil { + if err = oprot.WriteStructBegin("GetEvaluatorRecord_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -22882,7 +31099,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceListTemplatesResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceGetEvaluatorRecordResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -22901,15 +31118,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceListTemplatesResult) String() string { +func (p *EvaluatorServiceGetEvaluatorRecordResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceListTemplatesResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceGetEvaluatorRecordResult(%+v)", *p) } -func (p *EvaluatorServiceListTemplatesResult) DeepEqual(ano *EvaluatorServiceListTemplatesResult) bool { +func (p *EvaluatorServiceGetEvaluatorRecordResult) DeepEqual(ano *EvaluatorServiceGetEvaluatorRecordResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -22921,7 +31138,7 @@ func (p *EvaluatorServiceListTemplatesResult) DeepEqual(ano *EvaluatorServiceLis return true } -func (p *EvaluatorServiceListTemplatesResult) Field0DeepEqual(src *ListTemplatesResponse) bool { +func (p *EvaluatorServiceGetEvaluatorRecordResult) Field0DeepEqual(src *GetEvaluatorRecordResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -22929,41 +31146,41 @@ func (p *EvaluatorServiceListTemplatesResult) Field0DeepEqual(src *ListTemplates return true } -type EvaluatorServiceGetTemplateInfoArgs struct { - Request *GetTemplateInfoRequest `thrift:"request,1" frugal:"1,default,GetTemplateInfoRequest"` +type EvaluatorServiceBatchGetEvaluatorRecordsArgs struct { + Req *BatchGetEvaluatorRecordsRequest `thrift:"req,1" frugal:"1,default,BatchGetEvaluatorRecordsRequest"` } -func NewEvaluatorServiceGetTemplateInfoArgs() *EvaluatorServiceGetTemplateInfoArgs { - return &EvaluatorServiceGetTemplateInfoArgs{} +func NewEvaluatorServiceBatchGetEvaluatorRecordsArgs() *EvaluatorServiceBatchGetEvaluatorRecordsArgs { + return &EvaluatorServiceBatchGetEvaluatorRecordsArgs{} } -func (p *EvaluatorServiceGetTemplateInfoArgs) InitDefault() { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) InitDefault() { } -var EvaluatorServiceGetTemplateInfoArgs_Request_DEFAULT *GetTemplateInfoRequest +var EvaluatorServiceBatchGetEvaluatorRecordsArgs_Req_DEFAULT *BatchGetEvaluatorRecordsRequest -func (p *EvaluatorServiceGetTemplateInfoArgs) GetRequest() (v *GetTemplateInfoRequest) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) GetReq() (v *BatchGetEvaluatorRecordsRequest) { if p == nil { return } - if !p.IsSetRequest() { - return EvaluatorServiceGetTemplateInfoArgs_Request_DEFAULT + if !p.IsSetReq() { + return EvaluatorServiceBatchGetEvaluatorRecordsArgs_Req_DEFAULT } - return p.Request + return p.Req } -func (p *EvaluatorServiceGetTemplateInfoArgs) SetRequest(val *GetTemplateInfoRequest) { - p.Request = val +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) SetReq(val *BatchGetEvaluatorRecordsRequest) { + p.Req = val } -var fieldIDToName_EvaluatorServiceGetTemplateInfoArgs = map[int16]string{ - 1: "request", +var fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsArgs = map[int16]string{ + 1: "req", } -func (p *EvaluatorServiceGetTemplateInfoArgs) IsSetRequest() bool { - return p.Request != nil +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) IsSetReq() bool { + return p.Req != nil } -func (p *EvaluatorServiceGetTemplateInfoArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -23008,7 +31225,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateInfoArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -23018,18 +31235,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceGetTemplateInfoArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewGetTemplateInfoRequest() +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewBatchGetEvaluatorRecordsRequest() if err := _field.Read(iprot); err != nil { return err } - p.Request = _field + p.Req = _field return nil } -func (p *EvaluatorServiceGetTemplateInfoArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetTemplateInfo_args"); err != nil { + if err = oprot.WriteStructBegin("BatchGetEvaluatorRecords_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -23055,11 +31272,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceGetTemplateInfoArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Request.Write(oprot); err != nil { + if err := p.Req.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -23072,69 +31289,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceGetTemplateInfoArgs) String() string { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceGetTemplateInfoArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorRecordsArgs(%+v)", *p) } -func (p *EvaluatorServiceGetTemplateInfoArgs) DeepEqual(ano *EvaluatorServiceGetTemplateInfoArgs) bool { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorRecordsArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Request) { + if !p.Field1DeepEqual(ano.Req) { return false } return true } -func (p *EvaluatorServiceGetTemplateInfoArgs) Field1DeepEqual(src *GetTemplateInfoRequest) bool { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) Field1DeepEqual(src *BatchGetEvaluatorRecordsRequest) bool { - if !p.Request.DeepEqual(src) { + if !p.Req.DeepEqual(src) { return false } return true } -type EvaluatorServiceGetTemplateInfoResult struct { - Success *GetTemplateInfoResponse `thrift:"success,0,optional" frugal:"0,optional,GetTemplateInfoResponse"` +type EvaluatorServiceBatchGetEvaluatorRecordsResult struct { + Success *BatchGetEvaluatorRecordsResponse `thrift:"success,0,optional" frugal:"0,optional,BatchGetEvaluatorRecordsResponse"` } -func NewEvaluatorServiceGetTemplateInfoResult() *EvaluatorServiceGetTemplateInfoResult { - return &EvaluatorServiceGetTemplateInfoResult{} +func NewEvaluatorServiceBatchGetEvaluatorRecordsResult() *EvaluatorServiceBatchGetEvaluatorRecordsResult { + return &EvaluatorServiceBatchGetEvaluatorRecordsResult{} } -func (p *EvaluatorServiceGetTemplateInfoResult) InitDefault() { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) InitDefault() { } -var EvaluatorServiceGetTemplateInfoResult_Success_DEFAULT *GetTemplateInfoResponse +var EvaluatorServiceBatchGetEvaluatorRecordsResult_Success_DEFAULT *BatchGetEvaluatorRecordsResponse -func (p *EvaluatorServiceGetTemplateInfoResult) GetSuccess() (v *GetTemplateInfoResponse) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) GetSuccess() (v *BatchGetEvaluatorRecordsResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceGetTemplateInfoResult_Success_DEFAULT + return EvaluatorServiceBatchGetEvaluatorRecordsResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceGetTemplateInfoResult) SetSuccess(x interface{}) { - p.Success = x.(*GetTemplateInfoResponse) +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) SetSuccess(x interface{}) { + p.Success = x.(*BatchGetEvaluatorRecordsResponse) } -var fieldIDToName_EvaluatorServiceGetTemplateInfoResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceGetTemplateInfoResult) IsSetSuccess() bool { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceGetTemplateInfoResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -23179,7 +31396,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateInfoResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -23189,8 +31406,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceGetTemplateInfoResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewGetTemplateInfoResponse() +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewBatchGetEvaluatorRecordsResponse() if err := _field.Read(iprot); err != nil { return err } @@ -23198,9 +31415,9 @@ func (p *EvaluatorServiceGetTemplateInfoResult) ReadField0(iprot thrift.TProtoco return nil } -func (p *EvaluatorServiceGetTemplateInfoResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetTemplateInfo_result"); err != nil { + if err = oprot.WriteStructBegin("BatchGetEvaluatorRecords_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -23226,7 +31443,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceGetTemplateInfoResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -23245,15 +31462,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceGetTemplateInfoResult) String() string { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceGetTemplateInfoResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorRecordsResult(%+v)", *p) } -func (p *EvaluatorServiceGetTemplateInfoResult) DeepEqual(ano *EvaluatorServiceGetTemplateInfoResult) bool { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorRecordsResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -23265,7 +31482,7 @@ func (p *EvaluatorServiceGetTemplateInfoResult) DeepEqual(ano *EvaluatorServiceG return true } -func (p *EvaluatorServiceGetTemplateInfoResult) Field0DeepEqual(src *GetTemplateInfoResponse) bool { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) Field0DeepEqual(src *BatchGetEvaluatorRecordsResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -23273,41 +31490,41 @@ func (p *EvaluatorServiceGetTemplateInfoResult) Field0DeepEqual(src *GetTemplate return true } -type EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs struct { - Req *GetDefaultPromptEvaluatorToolsRequest `thrift:"req,1" frugal:"1,default,GetDefaultPromptEvaluatorToolsRequest"` +type EvaluatorServiceValidateEvaluatorArgs struct { + Request *ValidateEvaluatorRequest `thrift:"request,1" frugal:"1,default,ValidateEvaluatorRequest"` } -func NewEvaluatorServiceGetDefaultPromptEvaluatorToolsArgs() *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs { - return &EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs{} +func NewEvaluatorServiceValidateEvaluatorArgs() *EvaluatorServiceValidateEvaluatorArgs { + return &EvaluatorServiceValidateEvaluatorArgs{} } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) InitDefault() { +func (p *EvaluatorServiceValidateEvaluatorArgs) InitDefault() { } -var EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs_Req_DEFAULT *GetDefaultPromptEvaluatorToolsRequest +var EvaluatorServiceValidateEvaluatorArgs_Request_DEFAULT *ValidateEvaluatorRequest -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) GetReq() (v *GetDefaultPromptEvaluatorToolsRequest) { +func (p *EvaluatorServiceValidateEvaluatorArgs) GetRequest() (v *ValidateEvaluatorRequest) { if p == nil { return } - if !p.IsSetReq() { - return EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs_Req_DEFAULT + if !p.IsSetRequest() { + return EvaluatorServiceValidateEvaluatorArgs_Request_DEFAULT } - return p.Req + return p.Request } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) SetReq(val *GetDefaultPromptEvaluatorToolsRequest) { - p.Req = val +func (p *EvaluatorServiceValidateEvaluatorArgs) SetRequest(val *ValidateEvaluatorRequest) { + p.Request = val } -var fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs = map[int16]string{ - 1: "req", +var fieldIDToName_EvaluatorServiceValidateEvaluatorArgs = map[int16]string{ + 1: "request", } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) IsSetReq() bool { - return p.Req != nil +func (p *EvaluatorServiceValidateEvaluatorArgs) IsSetRequest() bool { + return p.Request != nil } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceValidateEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -23352,7 +31569,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceValidateEvaluatorArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -23362,18 +31579,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewGetDefaultPromptEvaluatorToolsRequest() +func (p *EvaluatorServiceValidateEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewValidateEvaluatorRequest() if err := _field.Read(iprot); err != nil { return err } - p.Req = _field + p.Request = _field return nil } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceValidateEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetDefaultPromptEvaluatorTools_args"); err != nil { + if err = oprot.WriteStructBegin("ValidateEvaluator_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -23399,11 +31616,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceValidateEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Req.Write(oprot); err != nil { + if err := p.Request.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -23416,69 +31633,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) String() string { +func (p *EvaluatorServiceValidateEvaluatorArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceValidateEvaluatorArgs(%+v)", *p) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) DeepEqual(ano *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) bool { +func (p *EvaluatorServiceValidateEvaluatorArgs) DeepEqual(ano *EvaluatorServiceValidateEvaluatorArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Req) { + if !p.Field1DeepEqual(ano.Request) { return false } return true } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) Field1DeepEqual(src *GetDefaultPromptEvaluatorToolsRequest) bool { +func (p *EvaluatorServiceValidateEvaluatorArgs) Field1DeepEqual(src *ValidateEvaluatorRequest) bool { - if !p.Req.DeepEqual(src) { + if !p.Request.DeepEqual(src) { return false } return true } -type EvaluatorServiceGetDefaultPromptEvaluatorToolsResult struct { - Success *GetDefaultPromptEvaluatorToolsResponse `thrift:"success,0,optional" frugal:"0,optional,GetDefaultPromptEvaluatorToolsResponse"` +type EvaluatorServiceValidateEvaluatorResult struct { + Success *ValidateEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,ValidateEvaluatorResponse"` } -func NewEvaluatorServiceGetDefaultPromptEvaluatorToolsResult() *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult { - return &EvaluatorServiceGetDefaultPromptEvaluatorToolsResult{} +func NewEvaluatorServiceValidateEvaluatorResult() *EvaluatorServiceValidateEvaluatorResult { + return &EvaluatorServiceValidateEvaluatorResult{} } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) InitDefault() { +func (p *EvaluatorServiceValidateEvaluatorResult) InitDefault() { } -var EvaluatorServiceGetDefaultPromptEvaluatorToolsResult_Success_DEFAULT *GetDefaultPromptEvaluatorToolsResponse +var EvaluatorServiceValidateEvaluatorResult_Success_DEFAULT *ValidateEvaluatorResponse -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) GetSuccess() (v *GetDefaultPromptEvaluatorToolsResponse) { +func (p *EvaluatorServiceValidateEvaluatorResult) GetSuccess() (v *ValidateEvaluatorResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceGetDefaultPromptEvaluatorToolsResult_Success_DEFAULT + return EvaluatorServiceValidateEvaluatorResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) SetSuccess(x interface{}) { - p.Success = x.(*GetDefaultPromptEvaluatorToolsResponse) +func (p *EvaluatorServiceValidateEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*ValidateEvaluatorResponse) } -var fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceValidateEvaluatorResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) IsSetSuccess() bool { +func (p *EvaluatorServiceValidateEvaluatorResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceValidateEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -23523,7 +31740,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceValidateEvaluatorResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -23533,8 +31750,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewGetDefaultPromptEvaluatorToolsResponse() +func (p *EvaluatorServiceValidateEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewValidateEvaluatorResponse() if err := _field.Read(iprot); err != nil { return err } @@ -23542,9 +31759,9 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) ReadField0(iprot return nil } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceValidateEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetDefaultPromptEvaluatorTools_result"); err != nil { + if err = oprot.WriteStructBegin("ValidateEvaluator_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -23570,7 +31787,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceValidateEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -23589,15 +31806,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) String() string { +func (p *EvaluatorServiceValidateEvaluatorResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceGetDefaultPromptEvaluatorToolsResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceValidateEvaluatorResult(%+v)", *p) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) DeepEqual(ano *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) bool { +func (p *EvaluatorServiceValidateEvaluatorResult) DeepEqual(ano *EvaluatorServiceValidateEvaluatorResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -23609,7 +31826,7 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) DeepEqual(ano *Ev return true } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) Field0DeepEqual(src *GetDefaultPromptEvaluatorToolsResponse) bool { +func (p *EvaluatorServiceValidateEvaluatorResult) Field0DeepEqual(src *ValidateEvaluatorResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -23617,41 +31834,41 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) Field0DeepEqual(s return true } -type EvaluatorServiceRunEvaluatorArgs struct { - Req *RunEvaluatorRequest `thrift:"req,1" frugal:"1,default,RunEvaluatorRequest"` +type EvaluatorServiceListTemplatesV2Args struct { + Request *ListTemplatesV2Request `thrift:"request,1" frugal:"1,default,ListTemplatesV2Request"` } -func NewEvaluatorServiceRunEvaluatorArgs() *EvaluatorServiceRunEvaluatorArgs { - return &EvaluatorServiceRunEvaluatorArgs{} +func NewEvaluatorServiceListTemplatesV2Args() *EvaluatorServiceListTemplatesV2Args { + return &EvaluatorServiceListTemplatesV2Args{} } -func (p *EvaluatorServiceRunEvaluatorArgs) InitDefault() { +func (p *EvaluatorServiceListTemplatesV2Args) InitDefault() { } -var EvaluatorServiceRunEvaluatorArgs_Req_DEFAULT *RunEvaluatorRequest +var EvaluatorServiceListTemplatesV2Args_Request_DEFAULT *ListTemplatesV2Request -func (p *EvaluatorServiceRunEvaluatorArgs) GetReq() (v *RunEvaluatorRequest) { +func (p *EvaluatorServiceListTemplatesV2Args) GetRequest() (v *ListTemplatesV2Request) { if p == nil { return } - if !p.IsSetReq() { - return EvaluatorServiceRunEvaluatorArgs_Req_DEFAULT + if !p.IsSetRequest() { + return EvaluatorServiceListTemplatesV2Args_Request_DEFAULT } - return p.Req + return p.Request } -func (p *EvaluatorServiceRunEvaluatorArgs) SetReq(val *RunEvaluatorRequest) { - p.Req = val +func (p *EvaluatorServiceListTemplatesV2Args) SetRequest(val *ListTemplatesV2Request) { + p.Request = val } -var fieldIDToName_EvaluatorServiceRunEvaluatorArgs = map[int16]string{ - 1: "req", +var fieldIDToName_EvaluatorServiceListTemplatesV2Args = map[int16]string{ + 1: "request", } -func (p *EvaluatorServiceRunEvaluatorArgs) IsSetReq() bool { - return p.Req != nil +func (p *EvaluatorServiceListTemplatesV2Args) IsSetRequest() bool { + return p.Request != nil } -func (p *EvaluatorServiceRunEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesV2Args) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -23696,7 +31913,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceRunEvaluatorArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesV2Args[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -23706,18 +31923,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceRunEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewRunEvaluatorRequest() +func (p *EvaluatorServiceListTemplatesV2Args) ReadField1(iprot thrift.TProtocol) error { + _field := NewListTemplatesV2Request() if err := _field.Read(iprot); err != nil { return err } - p.Req = _field + p.Request = _field return nil } -func (p *EvaluatorServiceRunEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesV2Args) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("RunEvaluator_args"); err != nil { + if err = oprot.WriteStructBegin("ListTemplatesV2_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -23743,11 +31960,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceRunEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceListTemplatesV2Args) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Req.Write(oprot); err != nil { + if err := p.Request.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -23760,69 +31977,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceRunEvaluatorArgs) String() string { +func (p *EvaluatorServiceListTemplatesV2Args) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceRunEvaluatorArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceListTemplatesV2Args(%+v)", *p) } -func (p *EvaluatorServiceRunEvaluatorArgs) DeepEqual(ano *EvaluatorServiceRunEvaluatorArgs) bool { +func (p *EvaluatorServiceListTemplatesV2Args) DeepEqual(ano *EvaluatorServiceListTemplatesV2Args) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Req) { + if !p.Field1DeepEqual(ano.Request) { return false } return true } -func (p *EvaluatorServiceRunEvaluatorArgs) Field1DeepEqual(src *RunEvaluatorRequest) bool { +func (p *EvaluatorServiceListTemplatesV2Args) Field1DeepEqual(src *ListTemplatesV2Request) bool { - if !p.Req.DeepEqual(src) { + if !p.Request.DeepEqual(src) { return false } return true } -type EvaluatorServiceRunEvaluatorResult struct { - Success *RunEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,RunEvaluatorResponse"` +type EvaluatorServiceListTemplatesV2Result struct { + Success *ListTemplatesV2Response `thrift:"success,0,optional" frugal:"0,optional,ListTemplatesV2Response"` } -func NewEvaluatorServiceRunEvaluatorResult() *EvaluatorServiceRunEvaluatorResult { - return &EvaluatorServiceRunEvaluatorResult{} +func NewEvaluatorServiceListTemplatesV2Result() *EvaluatorServiceListTemplatesV2Result { + return &EvaluatorServiceListTemplatesV2Result{} } -func (p *EvaluatorServiceRunEvaluatorResult) InitDefault() { +func (p *EvaluatorServiceListTemplatesV2Result) InitDefault() { } -var EvaluatorServiceRunEvaluatorResult_Success_DEFAULT *RunEvaluatorResponse +var EvaluatorServiceListTemplatesV2Result_Success_DEFAULT *ListTemplatesV2Response -func (p *EvaluatorServiceRunEvaluatorResult) GetSuccess() (v *RunEvaluatorResponse) { +func (p *EvaluatorServiceListTemplatesV2Result) GetSuccess() (v *ListTemplatesV2Response) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceRunEvaluatorResult_Success_DEFAULT + return EvaluatorServiceListTemplatesV2Result_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceRunEvaluatorResult) SetSuccess(x interface{}) { - p.Success = x.(*RunEvaluatorResponse) +func (p *EvaluatorServiceListTemplatesV2Result) SetSuccess(x interface{}) { + p.Success = x.(*ListTemplatesV2Response) } -var fieldIDToName_EvaluatorServiceRunEvaluatorResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceListTemplatesV2Result = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceRunEvaluatorResult) IsSetSuccess() bool { +func (p *EvaluatorServiceListTemplatesV2Result) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceRunEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesV2Result) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -23867,7 +32084,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceRunEvaluatorResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesV2Result[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -23877,8 +32094,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceRunEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewRunEvaluatorResponse() +func (p *EvaluatorServiceListTemplatesV2Result) ReadField0(iprot thrift.TProtocol) error { + _field := NewListTemplatesV2Response() if err := _field.Read(iprot); err != nil { return err } @@ -23886,9 +32103,9 @@ func (p *EvaluatorServiceRunEvaluatorResult) ReadField0(iprot thrift.TProtocol) return nil } -func (p *EvaluatorServiceRunEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesV2Result) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("RunEvaluator_result"); err != nil { + if err = oprot.WriteStructBegin("ListTemplatesV2_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -23914,7 +32131,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceRunEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListTemplatesV2Result) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -23933,15 +32150,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceRunEvaluatorResult) String() string { +func (p *EvaluatorServiceListTemplatesV2Result) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceRunEvaluatorResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceListTemplatesV2Result(%+v)", *p) } -func (p *EvaluatorServiceRunEvaluatorResult) DeepEqual(ano *EvaluatorServiceRunEvaluatorResult) bool { +func (p *EvaluatorServiceListTemplatesV2Result) DeepEqual(ano *EvaluatorServiceListTemplatesV2Result) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -23953,7 +32170,7 @@ func (p *EvaluatorServiceRunEvaluatorResult) DeepEqual(ano *EvaluatorServiceRunE return true } -func (p *EvaluatorServiceRunEvaluatorResult) Field0DeepEqual(src *RunEvaluatorResponse) bool { +func (p *EvaluatorServiceListTemplatesV2Result) Field0DeepEqual(src *ListTemplatesV2Response) bool { if !p.Success.DeepEqual(src) { return false @@ -23961,41 +32178,41 @@ func (p *EvaluatorServiceRunEvaluatorResult) Field0DeepEqual(src *RunEvaluatorRe return true } -type EvaluatorServiceDebugEvaluatorArgs struct { - Req *DebugEvaluatorRequest `thrift:"req,1" frugal:"1,default,DebugEvaluatorRequest"` +type EvaluatorServiceCreateEvaluatorTemplateArgs struct { + Request *CreateEvaluatorTemplateRequest `thrift:"request,1" frugal:"1,default,CreateEvaluatorTemplateRequest"` } -func NewEvaluatorServiceDebugEvaluatorArgs() *EvaluatorServiceDebugEvaluatorArgs { - return &EvaluatorServiceDebugEvaluatorArgs{} +func NewEvaluatorServiceCreateEvaluatorTemplateArgs() *EvaluatorServiceCreateEvaluatorTemplateArgs { + return &EvaluatorServiceCreateEvaluatorTemplateArgs{} } -func (p *EvaluatorServiceDebugEvaluatorArgs) InitDefault() { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) InitDefault() { } -var EvaluatorServiceDebugEvaluatorArgs_Req_DEFAULT *DebugEvaluatorRequest +var EvaluatorServiceCreateEvaluatorTemplateArgs_Request_DEFAULT *CreateEvaluatorTemplateRequest -func (p *EvaluatorServiceDebugEvaluatorArgs) GetReq() (v *DebugEvaluatorRequest) { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) GetRequest() (v *CreateEvaluatorTemplateRequest) { if p == nil { return } - if !p.IsSetReq() { - return EvaluatorServiceDebugEvaluatorArgs_Req_DEFAULT + if !p.IsSetRequest() { + return EvaluatorServiceCreateEvaluatorTemplateArgs_Request_DEFAULT } - return p.Req + return p.Request } -func (p *EvaluatorServiceDebugEvaluatorArgs) SetReq(val *DebugEvaluatorRequest) { - p.Req = val +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) SetRequest(val *CreateEvaluatorTemplateRequest) { + p.Request = val } -var fieldIDToName_EvaluatorServiceDebugEvaluatorArgs = map[int16]string{ - 1: "req", +var fieldIDToName_EvaluatorServiceCreateEvaluatorTemplateArgs = map[int16]string{ + 1: "request", } -func (p *EvaluatorServiceDebugEvaluatorArgs) IsSetReq() bool { - return p.Req != nil +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) IsSetRequest() bool { + return p.Request != nil } -func (p *EvaluatorServiceDebugEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -24040,7 +32257,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugEvaluatorArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorTemplateArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -24050,18 +32267,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceDebugEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewDebugEvaluatorRequest() +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewCreateEvaluatorTemplateRequest() if err := _field.Read(iprot); err != nil { return err } - p.Req = _field + p.Request = _field return nil } -func (p *EvaluatorServiceDebugEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("DebugEvaluator_args"); err != nil { + if err = oprot.WriteStructBegin("CreateEvaluatorTemplate_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -24087,11 +32304,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceDebugEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Req.Write(oprot); err != nil { + if err := p.Request.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -24104,69 +32321,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceDebugEvaluatorArgs) String() string { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceDebugEvaluatorArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceCreateEvaluatorTemplateArgs(%+v)", *p) } -func (p *EvaluatorServiceDebugEvaluatorArgs) DeepEqual(ano *EvaluatorServiceDebugEvaluatorArgs) bool { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) DeepEqual(ano *EvaluatorServiceCreateEvaluatorTemplateArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Req) { + if !p.Field1DeepEqual(ano.Request) { return false } return true } -func (p *EvaluatorServiceDebugEvaluatorArgs) Field1DeepEqual(src *DebugEvaluatorRequest) bool { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) Field1DeepEqual(src *CreateEvaluatorTemplateRequest) bool { - if !p.Req.DeepEqual(src) { + if !p.Request.DeepEqual(src) { return false } return true } -type EvaluatorServiceDebugEvaluatorResult struct { - Success *DebugEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,DebugEvaluatorResponse"` +type EvaluatorServiceCreateEvaluatorTemplateResult struct { + Success *CreateEvaluatorTemplateResponse `thrift:"success,0,optional" frugal:"0,optional,CreateEvaluatorTemplateResponse"` } -func NewEvaluatorServiceDebugEvaluatorResult() *EvaluatorServiceDebugEvaluatorResult { - return &EvaluatorServiceDebugEvaluatorResult{} +func NewEvaluatorServiceCreateEvaluatorTemplateResult() *EvaluatorServiceCreateEvaluatorTemplateResult { + return &EvaluatorServiceCreateEvaluatorTemplateResult{} } -func (p *EvaluatorServiceDebugEvaluatorResult) InitDefault() { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) InitDefault() { } -var EvaluatorServiceDebugEvaluatorResult_Success_DEFAULT *DebugEvaluatorResponse +var EvaluatorServiceCreateEvaluatorTemplateResult_Success_DEFAULT *CreateEvaluatorTemplateResponse -func (p *EvaluatorServiceDebugEvaluatorResult) GetSuccess() (v *DebugEvaluatorResponse) { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) GetSuccess() (v *CreateEvaluatorTemplateResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceDebugEvaluatorResult_Success_DEFAULT + return EvaluatorServiceCreateEvaluatorTemplateResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceDebugEvaluatorResult) SetSuccess(x interface{}) { - p.Success = x.(*DebugEvaluatorResponse) +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) SetSuccess(x interface{}) { + p.Success = x.(*CreateEvaluatorTemplateResponse) } -var fieldIDToName_EvaluatorServiceDebugEvaluatorResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceCreateEvaluatorTemplateResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceDebugEvaluatorResult) IsSetSuccess() bool { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceDebugEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -24211,7 +32428,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugEvaluatorResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorTemplateResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -24221,8 +32438,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceDebugEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewDebugEvaluatorResponse() +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewCreateEvaluatorTemplateResponse() if err := _field.Read(iprot); err != nil { return err } @@ -24230,9 +32447,9 @@ func (p *EvaluatorServiceDebugEvaluatorResult) ReadField0(iprot thrift.TProtocol return nil } -func (p *EvaluatorServiceDebugEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("DebugEvaluator_result"); err != nil { + if err = oprot.WriteStructBegin("CreateEvaluatorTemplate_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -24258,7 +32475,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceDebugEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -24277,15 +32494,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceDebugEvaluatorResult) String() string { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceDebugEvaluatorResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceCreateEvaluatorTemplateResult(%+v)", *p) } -func (p *EvaluatorServiceDebugEvaluatorResult) DeepEqual(ano *EvaluatorServiceDebugEvaluatorResult) bool { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) DeepEqual(ano *EvaluatorServiceCreateEvaluatorTemplateResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -24297,7 +32514,7 @@ func (p *EvaluatorServiceDebugEvaluatorResult) DeepEqual(ano *EvaluatorServiceDe return true } -func (p *EvaluatorServiceDebugEvaluatorResult) Field0DeepEqual(src *DebugEvaluatorResponse) bool { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) Field0DeepEqual(src *CreateEvaluatorTemplateResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -24305,41 +32522,41 @@ func (p *EvaluatorServiceDebugEvaluatorResult) Field0DeepEqual(src *DebugEvaluat return true } -type EvaluatorServiceBatchDebugEvaluatorArgs struct { - Req *BatchDebugEvaluatorRequest `thrift:"req,1" frugal:"1,default,BatchDebugEvaluatorRequest"` +type EvaluatorServiceUpdateEvaluatorTemplateArgs struct { + Request *UpdateEvaluatorTemplateRequest `thrift:"request,1" frugal:"1,default,UpdateEvaluatorTemplateRequest"` } -func NewEvaluatorServiceBatchDebugEvaluatorArgs() *EvaluatorServiceBatchDebugEvaluatorArgs { - return &EvaluatorServiceBatchDebugEvaluatorArgs{} +func NewEvaluatorServiceUpdateEvaluatorTemplateArgs() *EvaluatorServiceUpdateEvaluatorTemplateArgs { + return &EvaluatorServiceUpdateEvaluatorTemplateArgs{} } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) InitDefault() { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) InitDefault() { } -var EvaluatorServiceBatchDebugEvaluatorArgs_Req_DEFAULT *BatchDebugEvaluatorRequest +var EvaluatorServiceUpdateEvaluatorTemplateArgs_Request_DEFAULT *UpdateEvaluatorTemplateRequest -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) GetReq() (v *BatchDebugEvaluatorRequest) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) GetRequest() (v *UpdateEvaluatorTemplateRequest) { if p == nil { return } - if !p.IsSetReq() { - return EvaluatorServiceBatchDebugEvaluatorArgs_Req_DEFAULT + if !p.IsSetRequest() { + return EvaluatorServiceUpdateEvaluatorTemplateArgs_Request_DEFAULT } - return p.Req + return p.Request } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) SetReq(val *BatchDebugEvaluatorRequest) { - p.Req = val +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) SetRequest(val *UpdateEvaluatorTemplateRequest) { + p.Request = val } -var fieldIDToName_EvaluatorServiceBatchDebugEvaluatorArgs = map[int16]string{ - 1: "req", +var fieldIDToName_EvaluatorServiceUpdateEvaluatorTemplateArgs = map[int16]string{ + 1: "request", } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) IsSetReq() bool { - return p.Req != nil +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) IsSetRequest() bool { + return p.Request != nil } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -24384,7 +32601,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchDebugEvaluatorArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorTemplateArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -24394,18 +32611,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewBatchDebugEvaluatorRequest() +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewUpdateEvaluatorTemplateRequest() if err := _field.Read(iprot); err != nil { return err } - p.Req = _field + p.Request = _field return nil } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("BatchDebugEvaluator_args"); err != nil { + if err = oprot.WriteStructBegin("UpdateEvaluatorTemplate_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -24431,11 +32648,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Req.Write(oprot); err != nil { + if err := p.Request.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -24448,69 +32665,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) String() string { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceBatchDebugEvaluatorArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorTemplateArgs(%+v)", *p) } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) DeepEqual(ano *EvaluatorServiceBatchDebugEvaluatorArgs) bool { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorTemplateArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Req) { + if !p.Field1DeepEqual(ano.Request) { return false } return true } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) Field1DeepEqual(src *BatchDebugEvaluatorRequest) bool { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) Field1DeepEqual(src *UpdateEvaluatorTemplateRequest) bool { - if !p.Req.DeepEqual(src) { + if !p.Request.DeepEqual(src) { return false } return true } -type EvaluatorServiceBatchDebugEvaluatorResult struct { - Success *BatchDebugEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,BatchDebugEvaluatorResponse"` +type EvaluatorServiceUpdateEvaluatorTemplateResult struct { + Success *UpdateEvaluatorTemplateResponse `thrift:"success,0,optional" frugal:"0,optional,UpdateEvaluatorTemplateResponse"` } -func NewEvaluatorServiceBatchDebugEvaluatorResult() *EvaluatorServiceBatchDebugEvaluatorResult { - return &EvaluatorServiceBatchDebugEvaluatorResult{} +func NewEvaluatorServiceUpdateEvaluatorTemplateResult() *EvaluatorServiceUpdateEvaluatorTemplateResult { + return &EvaluatorServiceUpdateEvaluatorTemplateResult{} } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) InitDefault() { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) InitDefault() { } -var EvaluatorServiceBatchDebugEvaluatorResult_Success_DEFAULT *BatchDebugEvaluatorResponse +var EvaluatorServiceUpdateEvaluatorTemplateResult_Success_DEFAULT *UpdateEvaluatorTemplateResponse -func (p *EvaluatorServiceBatchDebugEvaluatorResult) GetSuccess() (v *BatchDebugEvaluatorResponse) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) GetSuccess() (v *UpdateEvaluatorTemplateResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceBatchDebugEvaluatorResult_Success_DEFAULT + return EvaluatorServiceUpdateEvaluatorTemplateResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) SetSuccess(x interface{}) { - p.Success = x.(*BatchDebugEvaluatorResponse) +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) SetSuccess(x interface{}) { + p.Success = x.(*UpdateEvaluatorTemplateResponse) } -var fieldIDToName_EvaluatorServiceBatchDebugEvaluatorResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceUpdateEvaluatorTemplateResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) IsSetSuccess() bool { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -24555,7 +32772,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchDebugEvaluatorResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorTemplateResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -24565,8 +32782,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewBatchDebugEvaluatorResponse() +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewUpdateEvaluatorTemplateResponse() if err := _field.Read(iprot); err != nil { return err } @@ -24574,9 +32791,9 @@ func (p *EvaluatorServiceBatchDebugEvaluatorResult) ReadField0(iprot thrift.TPro return nil } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("BatchDebugEvaluator_result"); err != nil { + if err = oprot.WriteStructBegin("UpdateEvaluatorTemplate_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -24602,7 +32819,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -24621,15 +32838,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) String() string { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceBatchDebugEvaluatorResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorTemplateResult(%+v)", *p) } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) DeepEqual(ano *EvaluatorServiceBatchDebugEvaluatorResult) bool { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorTemplateResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -24641,7 +32858,7 @@ func (p *EvaluatorServiceBatchDebugEvaluatorResult) DeepEqual(ano *EvaluatorServ return true } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) Field0DeepEqual(src *BatchDebugEvaluatorResponse) bool { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) Field0DeepEqual(src *UpdateEvaluatorTemplateResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -24649,41 +32866,41 @@ func (p *EvaluatorServiceBatchDebugEvaluatorResult) Field0DeepEqual(src *BatchDe return true } -type EvaluatorServiceUpdateEvaluatorRecordArgs struct { - Req *UpdateEvaluatorRecordRequest `thrift:"req,1" frugal:"1,default,UpdateEvaluatorRecordRequest"` +type EvaluatorServiceDeleteEvaluatorTemplateArgs struct { + Request *DeleteEvaluatorTemplateRequest `thrift:"request,1" frugal:"1,default,DeleteEvaluatorTemplateRequest"` } -func NewEvaluatorServiceUpdateEvaluatorRecordArgs() *EvaluatorServiceUpdateEvaluatorRecordArgs { - return &EvaluatorServiceUpdateEvaluatorRecordArgs{} +func NewEvaluatorServiceDeleteEvaluatorTemplateArgs() *EvaluatorServiceDeleteEvaluatorTemplateArgs { + return &EvaluatorServiceDeleteEvaluatorTemplateArgs{} } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) InitDefault() { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) InitDefault() { } -var EvaluatorServiceUpdateEvaluatorRecordArgs_Req_DEFAULT *UpdateEvaluatorRecordRequest +var EvaluatorServiceDeleteEvaluatorTemplateArgs_Request_DEFAULT *DeleteEvaluatorTemplateRequest -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) GetReq() (v *UpdateEvaluatorRecordRequest) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) GetRequest() (v *DeleteEvaluatorTemplateRequest) { if p == nil { return } - if !p.IsSetReq() { - return EvaluatorServiceUpdateEvaluatorRecordArgs_Req_DEFAULT + if !p.IsSetRequest() { + return EvaluatorServiceDeleteEvaluatorTemplateArgs_Request_DEFAULT } - return p.Req + return p.Request } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) SetReq(val *UpdateEvaluatorRecordRequest) { - p.Req = val +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) SetRequest(val *DeleteEvaluatorTemplateRequest) { + p.Request = val } -var fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordArgs = map[int16]string{ - 1: "req", +var fieldIDToName_EvaluatorServiceDeleteEvaluatorTemplateArgs = map[int16]string{ + 1: "request", } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) IsSetReq() bool { - return p.Req != nil +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) IsSetRequest() bool { + return p.Request != nil } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -24728,7 +32945,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorTemplateArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -24738,18 +32955,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewUpdateEvaluatorRecordRequest() +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewDeleteEvaluatorTemplateRequest() if err := _field.Read(iprot); err != nil { return err } - p.Req = _field + p.Request = _field return nil } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("UpdateEvaluatorRecord_args"); err != nil { + if err = oprot.WriteStructBegin("DeleteEvaluatorTemplate_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -24775,11 +32992,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Req.Write(oprot); err != nil { + if err := p.Request.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -24792,69 +33009,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) String() string { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorRecordArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceDeleteEvaluatorTemplateArgs(%+v)", *p) } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorRecordArgs) bool { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) DeepEqual(ano *EvaluatorServiceDeleteEvaluatorTemplateArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Req) { + if !p.Field1DeepEqual(ano.Request) { return false } return true } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) Field1DeepEqual(src *UpdateEvaluatorRecordRequest) bool { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) Field1DeepEqual(src *DeleteEvaluatorTemplateRequest) bool { - if !p.Req.DeepEqual(src) { + if !p.Request.DeepEqual(src) { return false } return true } -type EvaluatorServiceUpdateEvaluatorRecordResult struct { - Success *UpdateEvaluatorRecordResponse `thrift:"success,0,optional" frugal:"0,optional,UpdateEvaluatorRecordResponse"` +type EvaluatorServiceDeleteEvaluatorTemplateResult struct { + Success *DeleteEvaluatorTemplateResponse `thrift:"success,0,optional" frugal:"0,optional,DeleteEvaluatorTemplateResponse"` } -func NewEvaluatorServiceUpdateEvaluatorRecordResult() *EvaluatorServiceUpdateEvaluatorRecordResult { - return &EvaluatorServiceUpdateEvaluatorRecordResult{} +func NewEvaluatorServiceDeleteEvaluatorTemplateResult() *EvaluatorServiceDeleteEvaluatorTemplateResult { + return &EvaluatorServiceDeleteEvaluatorTemplateResult{} } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) InitDefault() { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) InitDefault() { } -var EvaluatorServiceUpdateEvaluatorRecordResult_Success_DEFAULT *UpdateEvaluatorRecordResponse +var EvaluatorServiceDeleteEvaluatorTemplateResult_Success_DEFAULT *DeleteEvaluatorTemplateResponse -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) GetSuccess() (v *UpdateEvaluatorRecordResponse) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) GetSuccess() (v *DeleteEvaluatorTemplateResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceUpdateEvaluatorRecordResult_Success_DEFAULT + return EvaluatorServiceDeleteEvaluatorTemplateResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) SetSuccess(x interface{}) { - p.Success = x.(*UpdateEvaluatorRecordResponse) +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) SetSuccess(x interface{}) { + p.Success = x.(*DeleteEvaluatorTemplateResponse) } -var fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceDeleteEvaluatorTemplateResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) IsSetSuccess() bool { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -24899,7 +33116,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorTemplateResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -24909,8 +33126,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewUpdateEvaluatorRecordResponse() +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewDeleteEvaluatorTemplateResponse() if err := _field.Read(iprot); err != nil { return err } @@ -24918,9 +33135,9 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordResult) ReadField0(iprot thrift.TP return nil } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("UpdateEvaluatorRecord_result"); err != nil { + if err = oprot.WriteStructBegin("DeleteEvaluatorTemplate_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -24946,7 +33163,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -24965,15 +33182,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) String() string { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceUpdateEvaluatorRecordResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceDeleteEvaluatorTemplateResult(%+v)", *p) } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) DeepEqual(ano *EvaluatorServiceUpdateEvaluatorRecordResult) bool { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) DeepEqual(ano *EvaluatorServiceDeleteEvaluatorTemplateResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -24985,7 +33202,7 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordResult) DeepEqual(ano *EvaluatorSe return true } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) Field0DeepEqual(src *UpdateEvaluatorRecordResponse) bool { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) Field0DeepEqual(src *DeleteEvaluatorTemplateResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -24993,41 +33210,41 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordResult) Field0DeepEqual(src *Updat return true } -type EvaluatorServiceGetEvaluatorRecordArgs struct { - Req *GetEvaluatorRecordRequest `thrift:"req,1" frugal:"1,default,GetEvaluatorRecordRequest"` +type EvaluatorServiceDebugBuiltinEvaluatorArgs struct { + Req *DebugBuiltinEvaluatorRequest `thrift:"req,1" frugal:"1,default,DebugBuiltinEvaluatorRequest"` } -func NewEvaluatorServiceGetEvaluatorRecordArgs() *EvaluatorServiceGetEvaluatorRecordArgs { - return &EvaluatorServiceGetEvaluatorRecordArgs{} +func NewEvaluatorServiceDebugBuiltinEvaluatorArgs() *EvaluatorServiceDebugBuiltinEvaluatorArgs { + return &EvaluatorServiceDebugBuiltinEvaluatorArgs{} } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) InitDefault() { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) InitDefault() { } -var EvaluatorServiceGetEvaluatorRecordArgs_Req_DEFAULT *GetEvaluatorRecordRequest +var EvaluatorServiceDebugBuiltinEvaluatorArgs_Req_DEFAULT *DebugBuiltinEvaluatorRequest -func (p *EvaluatorServiceGetEvaluatorRecordArgs) GetReq() (v *GetEvaluatorRecordRequest) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) GetReq() (v *DebugBuiltinEvaluatorRequest) { if p == nil { return } if !p.IsSetReq() { - return EvaluatorServiceGetEvaluatorRecordArgs_Req_DEFAULT + return EvaluatorServiceDebugBuiltinEvaluatorArgs_Req_DEFAULT } return p.Req } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) SetReq(val *GetEvaluatorRecordRequest) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) SetReq(val *DebugBuiltinEvaluatorRequest) { p.Req = val } -var fieldIDToName_EvaluatorServiceGetEvaluatorRecordArgs = map[int16]string{ +var fieldIDToName_EvaluatorServiceDebugBuiltinEvaluatorArgs = map[int16]string{ 1: "req", } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) IsSetReq() bool { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) IsSetReq() bool { return p.Req != nil } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -25072,7 +33289,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorRecordArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugBuiltinEvaluatorArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -25082,8 +33299,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewGetEvaluatorRecordRequest() +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewDebugBuiltinEvaluatorRequest() if err := _field.Read(iprot); err != nil { return err } @@ -25091,9 +33308,9 @@ func (p *EvaluatorServiceGetEvaluatorRecordArgs) ReadField1(iprot thrift.TProtoc return nil } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetEvaluatorRecord_args"); err != nil { + if err = oprot.WriteStructBegin("DebugBuiltinEvaluator_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -25119,7 +33336,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -25136,15 +33353,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) String() string { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceGetEvaluatorRecordArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceDebugBuiltinEvaluatorArgs(%+v)", *p) } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) DeepEqual(ano *EvaluatorServiceGetEvaluatorRecordArgs) bool { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) DeepEqual(ano *EvaluatorServiceDebugBuiltinEvaluatorArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -25156,7 +33373,7 @@ func (p *EvaluatorServiceGetEvaluatorRecordArgs) DeepEqual(ano *EvaluatorService return true } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) Field1DeepEqual(src *GetEvaluatorRecordRequest) bool { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) Field1DeepEqual(src *DebugBuiltinEvaluatorRequest) bool { if !p.Req.DeepEqual(src) { return false @@ -25164,41 +33381,41 @@ func (p *EvaluatorServiceGetEvaluatorRecordArgs) Field1DeepEqual(src *GetEvaluat return true } -type EvaluatorServiceGetEvaluatorRecordResult struct { - Success *GetEvaluatorRecordResponse `thrift:"success,0,optional" frugal:"0,optional,GetEvaluatorRecordResponse"` +type EvaluatorServiceDebugBuiltinEvaluatorResult struct { + Success *DebugBuiltinEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,DebugBuiltinEvaluatorResponse"` } -func NewEvaluatorServiceGetEvaluatorRecordResult() *EvaluatorServiceGetEvaluatorRecordResult { - return &EvaluatorServiceGetEvaluatorRecordResult{} +func NewEvaluatorServiceDebugBuiltinEvaluatorResult() *EvaluatorServiceDebugBuiltinEvaluatorResult { + return &EvaluatorServiceDebugBuiltinEvaluatorResult{} } -func (p *EvaluatorServiceGetEvaluatorRecordResult) InitDefault() { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) InitDefault() { } -var EvaluatorServiceGetEvaluatorRecordResult_Success_DEFAULT *GetEvaluatorRecordResponse +var EvaluatorServiceDebugBuiltinEvaluatorResult_Success_DEFAULT *DebugBuiltinEvaluatorResponse -func (p *EvaluatorServiceGetEvaluatorRecordResult) GetSuccess() (v *GetEvaluatorRecordResponse) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) GetSuccess() (v *DebugBuiltinEvaluatorResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceGetEvaluatorRecordResult_Success_DEFAULT + return EvaluatorServiceDebugBuiltinEvaluatorResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceGetEvaluatorRecordResult) SetSuccess(x interface{}) { - p.Success = x.(*GetEvaluatorRecordResponse) +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*DebugBuiltinEvaluatorResponse) } -var fieldIDToName_EvaluatorServiceGetEvaluatorRecordResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceDebugBuiltinEvaluatorResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceGetEvaluatorRecordResult) IsSetSuccess() bool { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceGetEvaluatorRecordResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -25243,7 +33460,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorRecordResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugBuiltinEvaluatorResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -25253,8 +33470,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorRecordResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewGetEvaluatorRecordResponse() +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewDebugBuiltinEvaluatorResponse() if err := _field.Read(iprot); err != nil { return err } @@ -25262,9 +33479,9 @@ func (p *EvaluatorServiceGetEvaluatorRecordResult) ReadField0(iprot thrift.TProt return nil } -func (p *EvaluatorServiceGetEvaluatorRecordResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetEvaluatorRecord_result"); err != nil { + if err = oprot.WriteStructBegin("DebugBuiltinEvaluator_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -25290,7 +33507,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorRecordResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -25309,15 +33526,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceGetEvaluatorRecordResult) String() string { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceGetEvaluatorRecordResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceDebugBuiltinEvaluatorResult(%+v)", *p) } -func (p *EvaluatorServiceGetEvaluatorRecordResult) DeepEqual(ano *EvaluatorServiceGetEvaluatorRecordResult) bool { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) DeepEqual(ano *EvaluatorServiceDebugBuiltinEvaluatorResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -25329,7 +33546,7 @@ func (p *EvaluatorServiceGetEvaluatorRecordResult) DeepEqual(ano *EvaluatorServi return true } -func (p *EvaluatorServiceGetEvaluatorRecordResult) Field0DeepEqual(src *GetEvaluatorRecordResponse) bool { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) Field0DeepEqual(src *DebugBuiltinEvaluatorResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -25337,41 +33554,41 @@ func (p *EvaluatorServiceGetEvaluatorRecordResult) Field0DeepEqual(src *GetEvalu return true } -type EvaluatorServiceBatchGetEvaluatorRecordsArgs struct { - Req *BatchGetEvaluatorRecordsRequest `thrift:"req,1" frugal:"1,default,BatchGetEvaluatorRecordsRequest"` +type EvaluatorServicePublishBuiltinEvaluatorArgs struct { + Req *PublishBuiltinEvaluatorRequest `thrift:"req,1" frugal:"1,default,PublishBuiltinEvaluatorRequest"` } -func NewEvaluatorServiceBatchGetEvaluatorRecordsArgs() *EvaluatorServiceBatchGetEvaluatorRecordsArgs { - return &EvaluatorServiceBatchGetEvaluatorRecordsArgs{} +func NewEvaluatorServicePublishBuiltinEvaluatorArgs() *EvaluatorServicePublishBuiltinEvaluatorArgs { + return &EvaluatorServicePublishBuiltinEvaluatorArgs{} } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) InitDefault() { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) InitDefault() { } -var EvaluatorServiceBatchGetEvaluatorRecordsArgs_Req_DEFAULT *BatchGetEvaluatorRecordsRequest +var EvaluatorServicePublishBuiltinEvaluatorArgs_Req_DEFAULT *PublishBuiltinEvaluatorRequest -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) GetReq() (v *BatchGetEvaluatorRecordsRequest) { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) GetReq() (v *PublishBuiltinEvaluatorRequest) { if p == nil { return } if !p.IsSetReq() { - return EvaluatorServiceBatchGetEvaluatorRecordsArgs_Req_DEFAULT + return EvaluatorServicePublishBuiltinEvaluatorArgs_Req_DEFAULT } return p.Req } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) SetReq(val *BatchGetEvaluatorRecordsRequest) { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) SetReq(val *PublishBuiltinEvaluatorRequest) { p.Req = val } -var fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsArgs = map[int16]string{ +var fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorArgs = map[int16]string{ 1: "req", } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) IsSetReq() bool { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) IsSetReq() bool { return p.Req != nil } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -25416,7 +33633,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -25426,8 +33643,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewBatchGetEvaluatorRecordsRequest() +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewPublishBuiltinEvaluatorRequest() if err := _field.Read(iprot); err != nil { return err } @@ -25435,9 +33652,9 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) ReadField1(iprot thrift.T return nil } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("BatchGetEvaluatorRecords_args"); err != nil { + if err = oprot.WriteStructBegin("PublishBuiltinEvaluator_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -25463,7 +33680,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -25480,15 +33697,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) String() string { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorRecordsArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServicePublishBuiltinEvaluatorArgs(%+v)", *p) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorRecordsArgs) bool { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) DeepEqual(ano *EvaluatorServicePublishBuiltinEvaluatorArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -25500,7 +33717,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) DeepEqual(ano *EvaluatorS return true } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) Field1DeepEqual(src *BatchGetEvaluatorRecordsRequest) bool { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) Field1DeepEqual(src *PublishBuiltinEvaluatorRequest) bool { if !p.Req.DeepEqual(src) { return false @@ -25508,41 +33725,41 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) Field1DeepEqual(src *Batc return true } -type EvaluatorServiceBatchGetEvaluatorRecordsResult struct { - Success *BatchGetEvaluatorRecordsResponse `thrift:"success,0,optional" frugal:"0,optional,BatchGetEvaluatorRecordsResponse"` +type EvaluatorServicePublishBuiltinEvaluatorResult struct { + Success *PublishBuiltinEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,PublishBuiltinEvaluatorResponse"` } -func NewEvaluatorServiceBatchGetEvaluatorRecordsResult() *EvaluatorServiceBatchGetEvaluatorRecordsResult { - return &EvaluatorServiceBatchGetEvaluatorRecordsResult{} +func NewEvaluatorServicePublishBuiltinEvaluatorResult() *EvaluatorServicePublishBuiltinEvaluatorResult { + return &EvaluatorServicePublishBuiltinEvaluatorResult{} } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) InitDefault() { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) InitDefault() { } -var EvaluatorServiceBatchGetEvaluatorRecordsResult_Success_DEFAULT *BatchGetEvaluatorRecordsResponse +var EvaluatorServicePublishBuiltinEvaluatorResult_Success_DEFAULT *PublishBuiltinEvaluatorResponse -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) GetSuccess() (v *BatchGetEvaluatorRecordsResponse) { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) GetSuccess() (v *PublishBuiltinEvaluatorResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceBatchGetEvaluatorRecordsResult_Success_DEFAULT + return EvaluatorServicePublishBuiltinEvaluatorResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) SetSuccess(x interface{}) { - p.Success = x.(*BatchGetEvaluatorRecordsResponse) +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*PublishBuiltinEvaluatorResponse) } -var fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsResult = map[int16]string{ +var fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) IsSetSuccess() bool { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -25587,7 +33804,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -25597,8 +33814,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewBatchGetEvaluatorRecordsResponse() +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewPublishBuiltinEvaluatorResponse() if err := _field.Read(iprot); err != nil { return err } @@ -25606,9 +33823,9 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) ReadField0(iprot thrift return nil } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("BatchGetEvaluatorRecords_result"); err != nil { + if err = oprot.WriteStructBegin("PublishBuiltinEvaluator_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -25634,7 +33851,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -25653,15 +33870,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) String() string { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceBatchGetEvaluatorRecordsResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServicePublishBuiltinEvaluatorResult(%+v)", *p) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) DeepEqual(ano *EvaluatorServiceBatchGetEvaluatorRecordsResult) bool { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) DeepEqual(ano *EvaluatorServicePublishBuiltinEvaluatorResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -25673,7 +33890,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) DeepEqual(ano *Evaluato return true } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) Field0DeepEqual(src *BatchGetEvaluatorRecordsResponse) bool { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) Field0DeepEqual(src *PublishBuiltinEvaluatorResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -25681,41 +33898,41 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) Field0DeepEqual(src *Ba return true } -type EvaluatorServiceValidateEvaluatorArgs struct { - Request *ValidateEvaluatorRequest `thrift:"request,1" frugal:"1,default,ValidateEvaluatorRequest"` +type EvaluatorServiceListEvaluatorTagsArgs struct { + Req *ListEvaluatorTagsRequest `thrift:"req,1" frugal:"1,default,ListEvaluatorTagsRequest"` } -func NewEvaluatorServiceValidateEvaluatorArgs() *EvaluatorServiceValidateEvaluatorArgs { - return &EvaluatorServiceValidateEvaluatorArgs{} +func NewEvaluatorServiceListEvaluatorTagsArgs() *EvaluatorServiceListEvaluatorTagsArgs { + return &EvaluatorServiceListEvaluatorTagsArgs{} } -func (p *EvaluatorServiceValidateEvaluatorArgs) InitDefault() { +func (p *EvaluatorServiceListEvaluatorTagsArgs) InitDefault() { } -var EvaluatorServiceValidateEvaluatorArgs_Request_DEFAULT *ValidateEvaluatorRequest +var EvaluatorServiceListEvaluatorTagsArgs_Req_DEFAULT *ListEvaluatorTagsRequest -func (p *EvaluatorServiceValidateEvaluatorArgs) GetRequest() (v *ValidateEvaluatorRequest) { +func (p *EvaluatorServiceListEvaluatorTagsArgs) GetReq() (v *ListEvaluatorTagsRequest) { if p == nil { return } - if !p.IsSetRequest() { - return EvaluatorServiceValidateEvaluatorArgs_Request_DEFAULT + if !p.IsSetReq() { + return EvaluatorServiceListEvaluatorTagsArgs_Req_DEFAULT } - return p.Request + return p.Req } -func (p *EvaluatorServiceValidateEvaluatorArgs) SetRequest(val *ValidateEvaluatorRequest) { - p.Request = val +func (p *EvaluatorServiceListEvaluatorTagsArgs) SetReq(val *ListEvaluatorTagsRequest) { + p.Req = val } -var fieldIDToName_EvaluatorServiceValidateEvaluatorArgs = map[int16]string{ - 1: "request", +var fieldIDToName_EvaluatorServiceListEvaluatorTagsArgs = map[int16]string{ + 1: "req", } -func (p *EvaluatorServiceValidateEvaluatorArgs) IsSetRequest() bool { - return p.Request != nil +func (p *EvaluatorServiceListEvaluatorTagsArgs) IsSetReq() bool { + return p.Req != nil } -func (p *EvaluatorServiceValidateEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorTagsArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -25760,7 +33977,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceValidateEvaluatorArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorTagsArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -25770,18 +33987,18 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceValidateEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewValidateEvaluatorRequest() +func (p *EvaluatorServiceListEvaluatorTagsArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewListEvaluatorTagsRequest() if err := _field.Read(iprot); err != nil { return err } - p.Request = _field + p.Req = _field return nil } -func (p *EvaluatorServiceValidateEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorTagsArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("ValidateEvaluator_args"); err != nil { + if err = oprot.WriteStructBegin("ListEvaluatorTags_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -25807,11 +34024,11 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceValidateEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { +func (p *EvaluatorServiceListEvaluatorTagsArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Request.Write(oprot); err != nil { + if err := p.Req.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -25824,69 +34041,69 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServiceValidateEvaluatorArgs) String() string { +func (p *EvaluatorServiceListEvaluatorTagsArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceValidateEvaluatorArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceListEvaluatorTagsArgs(%+v)", *p) } -func (p *EvaluatorServiceValidateEvaluatorArgs) DeepEqual(ano *EvaluatorServiceValidateEvaluatorArgs) bool { +func (p *EvaluatorServiceListEvaluatorTagsArgs) DeepEqual(ano *EvaluatorServiceListEvaluatorTagsArgs) bool { if p == ano { return true } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Request) { + if !p.Field1DeepEqual(ano.Req) { return false } return true } -func (p *EvaluatorServiceValidateEvaluatorArgs) Field1DeepEqual(src *ValidateEvaluatorRequest) bool { +func (p *EvaluatorServiceListEvaluatorTagsArgs) Field1DeepEqual(src *ListEvaluatorTagsRequest) bool { - if !p.Request.DeepEqual(src) { + if !p.Req.DeepEqual(src) { return false } return true } -type EvaluatorServiceValidateEvaluatorResult struct { - Success *ValidateEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,ValidateEvaluatorResponse"` +type EvaluatorServiceListEvaluatorTagsResult struct { + Success *ListEvaluatorTagsResponse `thrift:"success,0,optional" frugal:"0,optional,ListEvaluatorTagsResponse"` } -func NewEvaluatorServiceValidateEvaluatorResult() *EvaluatorServiceValidateEvaluatorResult { - return &EvaluatorServiceValidateEvaluatorResult{} +func NewEvaluatorServiceListEvaluatorTagsResult() *EvaluatorServiceListEvaluatorTagsResult { + return &EvaluatorServiceListEvaluatorTagsResult{} } -func (p *EvaluatorServiceValidateEvaluatorResult) InitDefault() { +func (p *EvaluatorServiceListEvaluatorTagsResult) InitDefault() { } -var EvaluatorServiceValidateEvaluatorResult_Success_DEFAULT *ValidateEvaluatorResponse +var EvaluatorServiceListEvaluatorTagsResult_Success_DEFAULT *ListEvaluatorTagsResponse -func (p *EvaluatorServiceValidateEvaluatorResult) GetSuccess() (v *ValidateEvaluatorResponse) { +func (p *EvaluatorServiceListEvaluatorTagsResult) GetSuccess() (v *ListEvaluatorTagsResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServiceValidateEvaluatorResult_Success_DEFAULT + return EvaluatorServiceListEvaluatorTagsResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServiceValidateEvaluatorResult) SetSuccess(x interface{}) { - p.Success = x.(*ValidateEvaluatorResponse) +func (p *EvaluatorServiceListEvaluatorTagsResult) SetSuccess(x interface{}) { + p.Success = x.(*ListEvaluatorTagsResponse) } -var fieldIDToName_EvaluatorServiceValidateEvaluatorResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceListEvaluatorTagsResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServiceValidateEvaluatorResult) IsSetSuccess() bool { +func (p *EvaluatorServiceListEvaluatorTagsResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServiceValidateEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorTagsResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -25931,7 +34148,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceValidateEvaluatorResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorTagsResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -25941,8 +34158,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServiceValidateEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewValidateEvaluatorResponse() +func (p *EvaluatorServiceListEvaluatorTagsResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewListEvaluatorTagsResponse() if err := _field.Read(iprot); err != nil { return err } @@ -25950,9 +34167,9 @@ func (p *EvaluatorServiceValidateEvaluatorResult) ReadField0(iprot thrift.TProto return nil } -func (p *EvaluatorServiceValidateEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorTagsResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("ValidateEvaluator_result"); err != nil { + if err = oprot.WriteStructBegin("ListEvaluatorTags_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -25978,7 +34195,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServiceValidateEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceListEvaluatorTagsResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -25997,15 +34214,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServiceValidateEvaluatorResult) String() string { +func (p *EvaluatorServiceListEvaluatorTagsResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServiceValidateEvaluatorResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceListEvaluatorTagsResult(%+v)", *p) } -func (p *EvaluatorServiceValidateEvaluatorResult) DeepEqual(ano *EvaluatorServiceValidateEvaluatorResult) bool { +func (p *EvaluatorServiceListEvaluatorTagsResult) DeepEqual(ano *EvaluatorServiceListEvaluatorTagsResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -26017,7 +34234,7 @@ func (p *EvaluatorServiceValidateEvaluatorResult) DeepEqual(ano *EvaluatorServic return true } -func (p *EvaluatorServiceValidateEvaluatorResult) Field0DeepEqual(src *ValidateEvaluatorResponse) bool { +func (p *EvaluatorServiceListEvaluatorTagsResult) Field0DeepEqual(src *ListEvaluatorTagsResponse) bool { if !p.Success.DeepEqual(src) { return false diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go index 068e7641a..6be6a299d 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go @@ -22,6 +22,11 @@ var ( ) func (p *ListEvaluatorsRequest) IsValid() error { + if p.FilterOption != nil { + if err := p.FilterOption.IsValid(); err != nil { + return fmt.Errorf("field FilterOption not valid, %w", err) + } + } if p.PageSize != nil { if *p.PageSize <= int32(0) { return fmt.Errorf("field PageSize gt rule failed, current value: %v", *p.PageSize) @@ -528,3 +533,192 @@ func (p *ValidateEvaluatorResponse) IsValid() error { } return nil } +func (p *ListTemplatesV2Request) IsValid() error { + if p.FilterOption != nil { + if err := p.FilterOption.IsValid(); err != nil { + return fmt.Errorf("field FilterOption not valid, %w", err) + } + } + return nil +} +func (p *ListTemplatesV2Response) IsValid() error { + if p.BaseResp != nil { + if err := p.BaseResp.IsValid(); err != nil { + return fmt.Errorf("field BaseResp not valid, %w", err) + } + } + return nil +} +func (p *GetTemplateInfoV2Request) IsValid() error { + if p.Base != nil { + if err := p.Base.IsValid(); err != nil { + return fmt.Errorf("field Base not valid, %w", err) + } + } + return nil +} +func (p *GetTemplateInfoV2Response) IsValid() error { + if p.EvaluatorTemplate != nil { + if err := p.EvaluatorTemplate.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorTemplate not valid, %w", err) + } + } + if p.BaseResp != nil { + if err := p.BaseResp.IsValid(); err != nil { + return fmt.Errorf("field BaseResp not valid, %w", err) + } + } + return nil +} +func (p *GetLatestEvaluatorVersionRequest) IsValid() error { + if p.Base != nil { + if err := p.Base.IsValid(); err != nil { + return fmt.Errorf("field Base not valid, %w", err) + } + } + return nil +} +func (p *GetLatestEvaluatorVersionResponse) IsValid() error { + if p.Version != nil { + if err := p.Version.IsValid(); err != nil { + return fmt.Errorf("field Version not valid, %w", err) + } + } + if p.BaseResp != nil { + if err := p.BaseResp.IsValid(); err != nil { + return fmt.Errorf("field BaseResp not valid, %w", err) + } + } + return nil +} +func (p *DebugBuiltinEvaluatorRequest) IsValid() error { + if p.InputData != nil { + if err := p.InputData.IsValid(); err != nil { + return fmt.Errorf("field InputData not valid, %w", err) + } + } + if p.Base != nil { + if err := p.Base.IsValid(); err != nil { + return fmt.Errorf("field Base not valid, %w", err) + } + } + return nil +} +func (p *DebugBuiltinEvaluatorResponse) IsValid() error { + if p.OutputData != nil { + if err := p.OutputData.IsValid(); err != nil { + return fmt.Errorf("field OutputData not valid, %w", err) + } + } + if p.BaseResp != nil { + if err := p.BaseResp.IsValid(); err != nil { + return fmt.Errorf("field BaseResp not valid, %w", err) + } + } + return nil +} +func (p *PublishBuiltinEvaluatorRequest) IsValid() error { + if p.Base != nil { + if err := p.Base.IsValid(); err != nil { + return fmt.Errorf("field Base not valid, %w", err) + } + } + return nil +} +func (p *PublishBuiltinEvaluatorResponse) IsValid() error { + if p.Version != nil { + if err := p.Version.IsValid(); err != nil { + return fmt.Errorf("field Version not valid, %w", err) + } + } + if p.BaseResp != nil { + if err := p.BaseResp.IsValid(); err != nil { + return fmt.Errorf("field BaseResp not valid, %w", err) + } + } + return nil +} +func (p *CreateEvaluatorTemplateRequest) IsValid() error { + if p.EvaluatorTemplate != nil { + if err := p.EvaluatorTemplate.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorTemplate not valid, %w", err) + } + } + if p.Base != nil { + if err := p.Base.IsValid(); err != nil { + return fmt.Errorf("field Base not valid, %w", err) + } + } + return nil +} +func (p *CreateEvaluatorTemplateResponse) IsValid() error { + if p.EvaluatorTemplate != nil { + if err := p.EvaluatorTemplate.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorTemplate not valid, %w", err) + } + } + if p.BaseResp != nil { + if err := p.BaseResp.IsValid(); err != nil { + return fmt.Errorf("field BaseResp not valid, %w", err) + } + } + return nil +} +func (p *UpdateEvaluatorTemplateRequest) IsValid() error { + if p.EvaluatorTemplate != nil { + if err := p.EvaluatorTemplate.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorTemplate not valid, %w", err) + } + } + if p.Base != nil { + if err := p.Base.IsValid(); err != nil { + return fmt.Errorf("field Base not valid, %w", err) + } + } + return nil +} +func (p *UpdateEvaluatorTemplateResponse) IsValid() error { + if p.EvaluatorTemplate != nil { + if err := p.EvaluatorTemplate.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorTemplate not valid, %w", err) + } + } + if p.BaseResp != nil { + if err := p.BaseResp.IsValid(); err != nil { + return fmt.Errorf("field BaseResp not valid, %w", err) + } + } + return nil +} +func (p *DeleteEvaluatorTemplateRequest) IsValid() error { + if p.Base != nil { + if err := p.Base.IsValid(); err != nil { + return fmt.Errorf("field Base not valid, %w", err) + } + } + return nil +} +func (p *DeleteEvaluatorTemplateResponse) IsValid() error { + if p.BaseResp != nil { + if err := p.BaseResp.IsValid(); err != nil { + return fmt.Errorf("field BaseResp not valid, %w", err) + } + } + return nil +} +func (p *ListEvaluatorTagsRequest) IsValid() error { + if p.Base != nil { + if err := p.Base.IsValid(); err != nil { + return fmt.Errorf("field Base not valid, %w", err) + } + } + return nil +} +func (p *ListEvaluatorTagsResponse) IsValid() error { + if p.BaseResp != nil { + if err := p.BaseResp.IsValid(); err != nil { + return fmt.Errorf("field BaseResp not valid, %w", err) + } + } + return nil +} diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go index 4aa1803c0..61edcc981 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go @@ -33,6 +33,13 @@ type Client interface { GetEvaluatorRecord(ctx context.Context, req *evaluator.GetEvaluatorRecordRequest, callOptions ...callopt.Option) (r *evaluator.GetEvaluatorRecordResponse, err error) BatchGetEvaluatorRecords(ctx context.Context, req *evaluator.BatchGetEvaluatorRecordsRequest, callOptions ...callopt.Option) (r *evaluator.BatchGetEvaluatorRecordsResponse, err error) ValidateEvaluator(ctx context.Context, request *evaluator.ValidateEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.ValidateEvaluatorResponse, err error) + ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (r *evaluator.ListTemplatesV2Response, err error) + CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) + UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) + DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) + DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) + PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) + ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) } // NewClient creates a client for the service defined in IDL. @@ -173,3 +180,38 @@ func (p *kEvaluatorServiceClient) ValidateEvaluator(ctx context.Context, request ctx = client.NewCtxWithCallOptions(ctx, callOptions) return p.kClient.ValidateEvaluator(ctx, request) } + +func (p *kEvaluatorServiceClient) ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (r *evaluator.ListTemplatesV2Response, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.ListTemplatesV2(ctx, request) +} + +func (p *kEvaluatorServiceClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.CreateEvaluatorTemplate(ctx, request) +} + +func (p *kEvaluatorServiceClient) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.UpdateEvaluatorTemplate(ctx, request) +} + +func (p *kEvaluatorServiceClient) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.DeleteEvaluatorTemplate(ctx, request) +} + +func (p *kEvaluatorServiceClient) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.DebugBuiltinEvaluator(ctx, req) +} + +func (p *kEvaluatorServiceClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.PublishBuiltinEvaluator(ctx, req) +} + +func (p *kEvaluatorServiceClient) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.ListEvaluatorTags(ctx, req) +} diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go index 76e19f483..525f61528 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go @@ -167,6 +167,55 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), + "ListTemplatesV2": kitex.NewMethodInfo( + listTemplatesV2Handler, + newEvaluatorServiceListTemplatesV2Args, + newEvaluatorServiceListTemplatesV2Result, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "CreateEvaluatorTemplate": kitex.NewMethodInfo( + createEvaluatorTemplateHandler, + newEvaluatorServiceCreateEvaluatorTemplateArgs, + newEvaluatorServiceCreateEvaluatorTemplateResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "UpdateEvaluatorTemplate": kitex.NewMethodInfo( + updateEvaluatorTemplateHandler, + newEvaluatorServiceUpdateEvaluatorTemplateArgs, + newEvaluatorServiceUpdateEvaluatorTemplateResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "DeleteEvaluatorTemplate": kitex.NewMethodInfo( + deleteEvaluatorTemplateHandler, + newEvaluatorServiceDeleteEvaluatorTemplateArgs, + newEvaluatorServiceDeleteEvaluatorTemplateResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "DebugBuiltinEvaluator": kitex.NewMethodInfo( + debugBuiltinEvaluatorHandler, + newEvaluatorServiceDebugBuiltinEvaluatorArgs, + newEvaluatorServiceDebugBuiltinEvaluatorResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "PublishBuiltinEvaluator": kitex.NewMethodInfo( + publishBuiltinEvaluatorHandler, + newEvaluatorServicePublishBuiltinEvaluatorArgs, + newEvaluatorServicePublishBuiltinEvaluatorResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "ListEvaluatorTags": kitex.NewMethodInfo( + listEvaluatorTagsHandler, + newEvaluatorServiceListEvaluatorTagsArgs, + newEvaluatorServiceListEvaluatorTagsResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), } var ( @@ -618,6 +667,139 @@ func newEvaluatorServiceValidateEvaluatorResult() interface{} { return evaluator.NewEvaluatorServiceValidateEvaluatorResult() } +func listTemplatesV2Handler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceListTemplatesV2Args) + realResult := result.(*evaluator.EvaluatorServiceListTemplatesV2Result) + success, err := handler.(evaluator.EvaluatorService).ListTemplatesV2(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceListTemplatesV2Args() interface{} { + return evaluator.NewEvaluatorServiceListTemplatesV2Args() +} + +func newEvaluatorServiceListTemplatesV2Result() interface{} { + return evaluator.NewEvaluatorServiceListTemplatesV2Result() +} + +func createEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs) + realResult := result.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateResult) + success, err := handler.(evaluator.EvaluatorService).CreateEvaluatorTemplate(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceCreateEvaluatorTemplateArgs() interface{} { + return evaluator.NewEvaluatorServiceCreateEvaluatorTemplateArgs() +} + +func newEvaluatorServiceCreateEvaluatorTemplateResult() interface{} { + return evaluator.NewEvaluatorServiceCreateEvaluatorTemplateResult() +} + +func updateEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceUpdateEvaluatorTemplateArgs) + realResult := result.(*evaluator.EvaluatorServiceUpdateEvaluatorTemplateResult) + success, err := handler.(evaluator.EvaluatorService).UpdateEvaluatorTemplate(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceUpdateEvaluatorTemplateArgs() interface{} { + return evaluator.NewEvaluatorServiceUpdateEvaluatorTemplateArgs() +} + +func newEvaluatorServiceUpdateEvaluatorTemplateResult() interface{} { + return evaluator.NewEvaluatorServiceUpdateEvaluatorTemplateResult() +} + +func deleteEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceDeleteEvaluatorTemplateArgs) + realResult := result.(*evaluator.EvaluatorServiceDeleteEvaluatorTemplateResult) + success, err := handler.(evaluator.EvaluatorService).DeleteEvaluatorTemplate(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceDeleteEvaluatorTemplateArgs() interface{} { + return evaluator.NewEvaluatorServiceDeleteEvaluatorTemplateArgs() +} + +func newEvaluatorServiceDeleteEvaluatorTemplateResult() interface{} { + return evaluator.NewEvaluatorServiceDeleteEvaluatorTemplateResult() +} + +func debugBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceDebugBuiltinEvaluatorArgs) + realResult := result.(*evaluator.EvaluatorServiceDebugBuiltinEvaluatorResult) + success, err := handler.(evaluator.EvaluatorService).DebugBuiltinEvaluator(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceDebugBuiltinEvaluatorArgs() interface{} { + return evaluator.NewEvaluatorServiceDebugBuiltinEvaluatorArgs() +} + +func newEvaluatorServiceDebugBuiltinEvaluatorResult() interface{} { + return evaluator.NewEvaluatorServiceDebugBuiltinEvaluatorResult() +} + +func publishBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs) + realResult := result.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorResult) + success, err := handler.(evaluator.EvaluatorService).PublishBuiltinEvaluator(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServicePublishBuiltinEvaluatorArgs() interface{} { + return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorArgs() +} + +func newEvaluatorServicePublishBuiltinEvaluatorResult() interface{} { + return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorResult() +} + +func listEvaluatorTagsHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceListEvaluatorTagsArgs) + realResult := result.(*evaluator.EvaluatorServiceListEvaluatorTagsResult) + success, err := handler.(evaluator.EvaluatorService).ListEvaluatorTags(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceListEvaluatorTagsArgs() interface{} { + return evaluator.NewEvaluatorServiceListEvaluatorTagsArgs() +} + +func newEvaluatorServiceListEvaluatorTagsResult() interface{} { + return evaluator.NewEvaluatorServiceListEvaluatorTagsResult() +} + type kClient struct { c client.Client sc client.Streaming @@ -849,3 +1031,73 @@ func (p *kClient) ValidateEvaluator(ctx context.Context, request *evaluator.Vali } return _result.GetSuccess(), nil } + +func (p *kClient) ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request) (r *evaluator.ListTemplatesV2Response, err error) { + var _args evaluator.EvaluatorServiceListTemplatesV2Args + _args.Request = request + var _result evaluator.EvaluatorServiceListTemplatesV2Result + if err = p.c.Call(ctx, "ListTemplatesV2", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { + var _args evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs + _args.Request = request + var _result evaluator.EvaluatorServiceCreateEvaluatorTemplateResult + if err = p.c.Call(ctx, "CreateEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) { + var _args evaluator.EvaluatorServiceUpdateEvaluatorTemplateArgs + _args.Request = request + var _result evaluator.EvaluatorServiceUpdateEvaluatorTemplateResult + if err = p.c.Call(ctx, "UpdateEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) { + var _args evaluator.EvaluatorServiceDeleteEvaluatorTemplateArgs + _args.Request = request + var _result evaluator.EvaluatorServiceDeleteEvaluatorTemplateResult + if err = p.c.Call(ctx, "DeleteEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) { + var _args evaluator.EvaluatorServiceDebugBuiltinEvaluatorArgs + _args.Req = req + var _result evaluator.EvaluatorServiceDebugBuiltinEvaluatorResult + if err = p.c.Call(ctx, "DebugBuiltinEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { + var _args evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs + _args.Req = req + var _result evaluator.EvaluatorServicePublishBuiltinEvaluatorResult + if err = p.c.Call(ctx, "PublishBuiltinEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest) (r *evaluator.ListEvaluatorTagsResponse, err error) { + var _args evaluator.EvaluatorServiceListEvaluatorTagsArgs + _args.Req = req + var _result evaluator.EvaluatorServiceListEvaluatorTagsResult + if err = p.c.Call(ctx, "ListEvaluatorTags", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go index 29057f724..2e7bc0d10 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go @@ -120,6 +120,34 @@ func (p *ListEvaluatorsRequest) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 11: + if fieldTypeId == thrift.BOOL { + l, err = p.FastReadField11(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 12: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField12(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 101: if fieldTypeId == thrift.I32 { l, err = p.FastReadField101(buf[offset:]) @@ -291,6 +319,32 @@ func (p *ListEvaluatorsRequest) FastReadField5(buf []byte) (int, error) { return offset, nil } +func (p *ListEvaluatorsRequest) FastReadField11(buf []byte) (int, error) { + offset := 0 + + var _field *bool + if v, l, err := thrift.Binary.ReadBool(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Builtin = _field + return offset, nil +} + +func (p *ListEvaluatorsRequest) FastReadField12(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorFilterOption() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.FilterOption = _field + return offset, nil +} + func (p *ListEvaluatorsRequest) FastReadField101(buf []byte) (int, error) { offset := 0 @@ -365,11 +419,13 @@ func (p *ListEvaluatorsRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWrite if p != nil { offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField5(buf[offset:], w) + offset += p.fastWriteField11(buf[offset:], w) offset += p.fastWriteField101(buf[offset:], w) offset += p.fastWriteField102(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField4(buf[offset:], w) + offset += p.fastWriteField12(buf[offset:], w) offset += p.fastWriteField103(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } @@ -385,6 +441,8 @@ func (p *ListEvaluatorsRequest) BLength() int { l += p.field3Length() l += p.field4Length() l += p.field5Length() + l += p.field11Length() + l += p.field12Length() l += p.field101Length() l += p.field102Length() l += p.field103Length() @@ -451,6 +509,24 @@ func (p *ListEvaluatorsRequest) fastWriteField5(buf []byte, w thrift.NocopyWrite return offset } +func (p *ListEvaluatorsRequest) fastWriteField11(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBuiltin() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.BOOL, 11) + offset += thrift.Binary.WriteBool(buf[offset:], *p.Builtin) + } + return offset +} + +func (p *ListEvaluatorsRequest) fastWriteField12(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetFilterOption() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 12) + offset += p.FilterOption.FastWriteNocopy(buf[offset:], w) + } + return offset +} + func (p *ListEvaluatorsRequest) fastWriteField101(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetPageSize() { @@ -543,6 +619,24 @@ func (p *ListEvaluatorsRequest) field5Length() int { return l } +func (p *ListEvaluatorsRequest) field11Length() int { + l := 0 + if p.IsSetBuiltin() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.BoolLength() + } + return l +} + +func (p *ListEvaluatorsRequest) field12Length() int { + l := 0 + if p.IsSetFilterOption() { + l += thrift.Binary.FieldBeginLength() + l += p.FilterOption.BLength() + } + return l +} + func (p *ListEvaluatorsRequest) field101Length() int { l := 0 if p.IsSetPageSize() { @@ -622,6 +716,20 @@ func (p *ListEvaluatorsRequest) DeepCopy(s interface{}) error { p.WithVersion = &tmp } + if src.Builtin != nil { + tmp := *src.Builtin + p.Builtin = &tmp + } + + var _filterOption *evaluator.EvaluatorFilterOption + if src.FilterOption != nil { + _filterOption = &evaluator.EvaluatorFilterOption{} + if err := _filterOption.DeepCopy(src.FilterOption); err != nil { + return err + } + } + p.FilterOption = _filterOption + if src.PageSize != nil { tmp := *src.PageSize p.PageSize = &tmp @@ -2346,6 +2454,34 @@ func (p *UpdateEvaluatorDraftRequest) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 5: + if fieldTypeId == thrift.MAP { + l, err = p.FastReadField5(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 6: + if fieldTypeId == thrift.BOOL { + l, err = p.FastReadField6(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 255: if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField255(buf[offset:]) @@ -2454,6 +2590,62 @@ func (p *UpdateEvaluatorDraftRequest) FastReadField4(buf []byte) (int, error) { return offset, nil } +func (p *UpdateEvaluatorDraftRequest) FastReadField5(buf []byte) (int, error) { + offset := 0 + + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make(map[evaluator.EvaluatorTagKey][]string, size) + for i := 0; i < size; i++ { + var _key evaluator.EvaluatorTagKey + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _key = v + } + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _val := make([]string, 0, size) + for i := 0; i < size; i++ { + var _elem string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _elem = v + } + + _val = append(_val, _elem) + } + + _field[_key] = _val + } + p.Tags = _field + return offset, nil +} + +func (p *UpdateEvaluatorDraftRequest) FastReadField6(buf []byte) (int, error) { + offset := 0 + + var _field *bool + if v, l, err := thrift.Binary.ReadBool(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Builtin = _field + return offset, nil +} + func (p *UpdateEvaluatorDraftRequest) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBase() @@ -2475,8 +2667,10 @@ func (p *UpdateEvaluatorDraftRequest) FastWriteNocopy(buf []byte, w thrift.Nocop if p != nil { offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField6(buf[offset:], w) offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField4(buf[offset:], w) + offset += p.fastWriteField5(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -2490,6 +2684,8 @@ func (p *UpdateEvaluatorDraftRequest) BLength() int { l += p.field2Length() l += p.field3Length() l += p.field4Length() + l += p.field5Length() + l += p.field6Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -2524,6 +2720,39 @@ func (p *UpdateEvaluatorDraftRequest) fastWriteField4(buf []byte, w thrift.Nocop return offset } +func (p *UpdateEvaluatorDraftRequest) fastWriteField5(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetTags() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 5) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() + var length int + for k, v := range p.Tags { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range v { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) + } + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) + } + return offset +} + +func (p *UpdateEvaluatorDraftRequest) fastWriteField6(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBuiltin() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.BOOL, 6) + offset += thrift.Binary.WriteBool(buf[offset:], *p.Builtin) + } + return offset +} + func (p *UpdateEvaluatorDraftRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBase() { @@ -2561,6 +2790,34 @@ func (p *UpdateEvaluatorDraftRequest) field4Length() int { return l } +func (p *UpdateEvaluatorDraftRequest) field5Length() int { + l := 0 + if p.IsSetTags() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.MapBeginLength() + for k, v := range p.Tags { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.ListBeginLength() + for _, v := range v { + _ = v + l += thrift.Binary.StringLengthNocopy(v) + } + } + } + return l +} + +func (p *UpdateEvaluatorDraftRequest) field6Length() int { + l := 0 + if p.IsSetBuiltin() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.BoolLength() + } + return l +} + func (p *UpdateEvaluatorDraftRequest) field255Length() int { l := 0 if p.IsSetBase() { @@ -2591,6 +2848,33 @@ func (p *UpdateEvaluatorDraftRequest) DeepCopy(s interface{}) error { p.EvaluatorType = src.EvaluatorType + if src.Tags != nil { + p.Tags = make(map[evaluator.EvaluatorTagKey][]string, len(src.Tags)) + for key, val := range src.Tags { + var _key evaluator.EvaluatorTagKey + _key = key + + var _val []string + if val != nil { + _val = make([]string, 0, len(val)) + for _, elem := range val { + var _elem string + if elem != "" { + _elem = kutils.StringDeepCopy(elem) + } + _val = append(_val, _elem) + } + } + + p.Tags[_key] = _val + } + } + + if src.Builtin != nil { + tmp := *src.Builtin + p.Builtin = &tmp + } + var _base *base.Base if src.Base != nil { _base = &base.Base{} @@ -2866,6 +3150,48 @@ func (p *UpdateEvaluatorRequest) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 11: + if fieldTypeId == thrift.BOOL { + l, err = p.FastReadField11(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 12: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField12(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 13: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField13(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 255: if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField255(buf[offset:]) @@ -2985,30 +3311,75 @@ func (p *UpdateEvaluatorRequest) FastReadField5(buf []byte) (int, error) { return offset, nil } -func (p *UpdateEvaluatorRequest) FastReadField255(buf []byte) (int, error) { +func (p *UpdateEvaluatorRequest) FastReadField11(buf []byte) (int, error) { offset := 0 - _field := base.NewBase() - if l, err := _field.FastRead(buf[offset:]); err != nil { + + var _field *bool + if v, l, err := thrift.Binary.ReadBool(buf[offset:]); err != nil { return offset, err } else { offset += l + _field = &v } - p.Base = _field + p.Builtin = _field return offset, nil } -func (p *UpdateEvaluatorRequest) FastWrite(buf []byte) int { - return p.FastWriteNocopy(buf, nil) +func (p *UpdateEvaluatorRequest) FastReadField12(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Benchmark = _field + return offset, nil } -func (p *UpdateEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateEvaluatorRequest) FastReadField13(buf []byte) (int, error) { offset := 0 - if p != nil { - offset += p.fastWriteField1(buf[offset:], w) - offset += p.fastWriteField2(buf[offset:], w) - offset += p.fastWriteField3(buf[offset:], w) - offset += p.fastWriteField4(buf[offset:], w) + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Vendor = _field + return offset, nil +} + +func (p *UpdateEvaluatorRequest) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + +func (p *UpdateEvaluatorRequest) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *UpdateEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField11(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) + offset += p.fastWriteField4(buf[offset:], w) offset += p.fastWriteField5(buf[offset:], w) + offset += p.fastWriteField12(buf[offset:], w) + offset += p.fastWriteField13(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -3023,6 +3394,9 @@ func (p *UpdateEvaluatorRequest) BLength() int { l += p.field3Length() l += p.field4Length() l += p.field5Length() + l += p.field11Length() + l += p.field12Length() + l += p.field13Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -3068,6 +3442,33 @@ func (p *UpdateEvaluatorRequest) fastWriteField5(buf []byte, w thrift.NocopyWrit return offset } +func (p *UpdateEvaluatorRequest) fastWriteField11(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBuiltin() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.BOOL, 11) + offset += thrift.Binary.WriteBool(buf[offset:], *p.Builtin) + } + return offset +} + +func (p *UpdateEvaluatorRequest) fastWriteField12(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBenchmark() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 12) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Benchmark) + } + return offset +} + +func (p *UpdateEvaluatorRequest) fastWriteField13(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetVendor() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 13) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Vendor) + } + return offset +} + func (p *UpdateEvaluatorRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBase() { @@ -3116,6 +3517,33 @@ func (p *UpdateEvaluatorRequest) field5Length() int { return l } +func (p *UpdateEvaluatorRequest) field11Length() int { + l := 0 + if p.IsSetBuiltin() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.BoolLength() + } + return l +} + +func (p *UpdateEvaluatorRequest) field12Length() int { + l := 0 + if p.IsSetBenchmark() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Benchmark) + } + return l +} + +func (p *UpdateEvaluatorRequest) field13Length() int { + l := 0 + if p.IsSetVendor() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Vendor) + } + return l +} + func (p *UpdateEvaluatorRequest) field255Length() int { l := 0 if p.IsSetBase() { @@ -3153,6 +3581,27 @@ func (p *UpdateEvaluatorRequest) DeepCopy(s interface{}) error { p.Description = &tmp } + if src.Builtin != nil { + tmp := *src.Builtin + p.Builtin = &tmp + } + + if src.Benchmark != nil { + var tmp string + if *src.Benchmark != "" { + tmp = kutils.StringDeepCopy(*src.Benchmark) + } + p.Benchmark = &tmp + } + + if src.Vendor != nil { + var tmp string + if *src.Vendor != "" { + tmp = kutils.StringDeepCopy(*src.Vendor) + } + p.Vendor = &tmp + } + var _base *base.Base if src.Base != nil { _base = &base.Base{} @@ -4487,6 +4936,20 @@ func (p *GetEvaluatorVersionRequest) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 4: + if fieldTypeId == thrift.BOOL { + l, err = p.FastReadField4(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 255: if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField255(buf[offset:]) @@ -4572,6 +5035,20 @@ func (p *GetEvaluatorVersionRequest) FastReadField3(buf []byte) (int, error) { return offset, nil } +func (p *GetEvaluatorVersionRequest) FastReadField4(buf []byte) (int, error) { + offset := 0 + + var _field *bool + if v, l, err := thrift.Binary.ReadBool(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Builtin = _field + return offset, nil +} + func (p *GetEvaluatorVersionRequest) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBase() @@ -4594,6 +5071,7 @@ func (p *GetEvaluatorVersionRequest) FastWriteNocopy(buf []byte, w thrift.Nocopy offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) offset += p.fastWriteField3(buf[offset:], w) + offset += p.fastWriteField4(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -4606,6 +5084,7 @@ func (p *GetEvaluatorVersionRequest) BLength() int { l += p.field1Length() l += p.field2Length() l += p.field3Length() + l += p.field4Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -4635,6 +5114,15 @@ func (p *GetEvaluatorVersionRequest) fastWriteField3(buf []byte, w thrift.Nocopy return offset } +func (p *GetEvaluatorVersionRequest) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBuiltin() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.BOOL, 4) + offset += thrift.Binary.WriteBool(buf[offset:], *p.Builtin) + } + return offset +} + func (p *GetEvaluatorVersionRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBase() { @@ -4667,6 +5155,15 @@ func (p *GetEvaluatorVersionRequest) field3Length() int { return l } +func (p *GetEvaluatorVersionRequest) field4Length() int { + l := 0 + if p.IsSetBuiltin() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.BoolLength() + } + return l +} + func (p *GetEvaluatorVersionRequest) field255Length() int { l := 0 if p.IsSetBase() { @@ -4691,6 +5188,11 @@ func (p *GetEvaluatorVersionRequest) DeepCopy(s interface{}) error { p.IncludeDeleted = &tmp } + if src.Builtin != nil { + tmp := *src.Builtin + p.Builtin = &tmp + } + var _base *base.Base if src.Base != nil { _base = &base.Base{} @@ -12437,7 +12939,7 @@ func (p *ValidateEvaluatorResponse) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceListEvaluatorsArgs) FastRead(buf []byte) (int, error) { +func (p *ListTemplatesV2Request) FastRead(buf []byte) (int, error) { var err error var offset int @@ -12481,28 +12983,28 @@ func (p *EvaluatorServiceListEvaluatorsArgs) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorsArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_ListTemplatesV2Request[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceListEvaluatorsArgs) FastReadField1(buf []byte) (int, error) { +func (p *ListTemplatesV2Request) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewListEvaluatorsRequest() + _field := evaluator.NewEvaluatorFilterOption() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Request = _field + p.FilterOption = _field return offset, nil } -func (p *EvaluatorServiceListEvaluatorsArgs) FastWrite(buf []byte) int { +func (p *ListTemplatesV2Request) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceListEvaluatorsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *ListTemplatesV2Request) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -12511,7 +13013,7 @@ func (p *EvaluatorServiceListEvaluatorsArgs) FastWriteNocopy(buf []byte, w thrif return offset } -func (p *EvaluatorServiceListEvaluatorsArgs) BLength() int { +func (p *ListTemplatesV2Request) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -12520,39 +13022,43 @@ func (p *EvaluatorServiceListEvaluatorsArgs) BLength() int { return l } -func (p *EvaluatorServiceListEvaluatorsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *ListTemplatesV2Request) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Request.FastWriteNocopy(buf[offset:], w) + if p.IsSetFilterOption() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.FilterOption.FastWriteNocopy(buf[offset:], w) + } return offset } -func (p *EvaluatorServiceListEvaluatorsArgs) field1Length() int { +func (p *ListTemplatesV2Request) field1Length() int { l := 0 - l += thrift.Binary.FieldBeginLength() - l += p.Request.BLength() + if p.IsSetFilterOption() { + l += thrift.Binary.FieldBeginLength() + l += p.FilterOption.BLength() + } return l } -func (p *EvaluatorServiceListEvaluatorsArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceListEvaluatorsArgs) +func (p *ListTemplatesV2Request) DeepCopy(s interface{}) error { + src, ok := s.(*ListTemplatesV2Request) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *ListEvaluatorsRequest - if src.Request != nil { - _request = &ListEvaluatorsRequest{} - if err := _request.DeepCopy(src.Request); err != nil { + var _filterOption *evaluator.EvaluatorFilterOption + if src.FilterOption != nil { + _filterOption = &evaluator.EvaluatorFilterOption{} + if err := _filterOption.DeepCopy(src.FilterOption); err != nil { return err } } - p.Request = _request + p.FilterOption = _filterOption return nil } -func (p *EvaluatorServiceListEvaluatorsResult) FastRead(buf []byte) (int, error) { +func (p *ListTemplatesV2Response) FastRead(buf []byte) (int, error) { var err error var offset int @@ -12569,9 +13075,23 @@ func (p *EvaluatorServiceListEvaluatorsResult) FastRead(buf []byte) (int, error) break } switch fieldId { - case 0: + case 1: + if fieldTypeId == thrift.LIST { + l, err = p.FastReadField1(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 255: if fieldTypeId == thrift.STRUCT { - l, err = p.FastReadField0(buf[offset:]) + l, err = p.FastReadField255(buf[offset:]) offset += l if err != nil { goto ReadFieldError @@ -12596,88 +13116,156 @@ func (p *EvaluatorServiceListEvaluatorsResult) FastRead(buf []byte) (int, error) ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorsResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_ListTemplatesV2Response[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceListEvaluatorsResult) FastReadField0(buf []byte) (int, error) { +func (p *ListTemplatesV2Response) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewListEvaluatorsResponse() + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make([]*evaluator.EvaluatorTemplate, 0, size) + values := make([]evaluator.EvaluatorTemplate, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + if l, err := _elem.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + + _field = append(_field, _elem) + } + p.EvaluatorTemplates = _field + return offset, nil +} + +func (p *ListTemplatesV2Response) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBaseResp() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Success = _field + p.BaseResp = _field return offset, nil } -func (p *EvaluatorServiceListEvaluatorsResult) FastWrite(buf []byte) int { +func (p *ListTemplatesV2Response) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceListEvaluatorsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *ListTemplatesV2Response) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { - offset += p.fastWriteField0(buf[offset:], w) + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) return offset } -func (p *EvaluatorServiceListEvaluatorsResult) BLength() int { +func (p *ListTemplatesV2Response) BLength() int { l := 0 if p != nil { - l += p.field0Length() + l += p.field1Length() + l += p.field255Length() } l += thrift.Binary.FieldStopLength() return l } -func (p *EvaluatorServiceListEvaluatorsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *ListTemplatesV2Response) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 - if p.IsSetSuccess() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) - offset += p.Success.FastWriteNocopy(buf[offset:], w) + if p.IsSetEvaluatorTemplates() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.LIST, 1) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range p.EvaluatorTemplates { + length++ + offset += v.FastWriteNocopy(buf[offset:], w) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRUCT, length) } return offset } -func (p *EvaluatorServiceListEvaluatorsResult) field0Length() int { +func (p *ListTemplatesV2Response) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *ListTemplatesV2Response) field1Length() int { l := 0 - if p.IsSetSuccess() { + if p.IsSetEvaluatorTemplates() { l += thrift.Binary.FieldBeginLength() - l += p.Success.BLength() + l += thrift.Binary.ListBeginLength() + for _, v := range p.EvaluatorTemplates { + _ = v + l += v.BLength() + } } return l } -func (p *EvaluatorServiceListEvaluatorsResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceListEvaluatorsResult) +func (p *ListTemplatesV2Response) field255Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.BaseResp.BLength() + return l +} + +func (p *ListTemplatesV2Response) DeepCopy(s interface{}) error { + src, ok := s.(*ListTemplatesV2Response) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *ListEvaluatorsResponse - if src.Success != nil { - _success = &ListEvaluatorsResponse{} - if err := _success.DeepCopy(src.Success); err != nil { + if src.EvaluatorTemplates != nil { + p.EvaluatorTemplates = make([]*evaluator.EvaluatorTemplate, 0, len(src.EvaluatorTemplates)) + for _, elem := range src.EvaluatorTemplates { + var _elem *evaluator.EvaluatorTemplate + if elem != nil { + _elem = &evaluator.EvaluatorTemplate{} + if err := _elem.DeepCopy(elem); err != nil { + return err + } + } + + p.EvaluatorTemplates = append(p.EvaluatorTemplates, _elem) + } + } + + var _baseResp *base.BaseResp + if src.BaseResp != nil { + _baseResp = &base.BaseResp{} + if err := _baseResp.DeepCopy(src.BaseResp); err != nil { return err } } - p.Success = _success + p.BaseResp = _baseResp return nil } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastRead(buf []byte) (int, error) { +func (p *GetTemplateInfoV2Request) FastRead(buf []byte) (int, error) { var err error var offset int var l int var fieldTypeId thrift.TType var fieldId int16 + var issetEvaluatorTemplateID bool = false for { fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) offset += l @@ -12689,12 +13277,13 @@ func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastRead(buf []byte) (int, erro } switch fieldId { case 1: - if fieldTypeId == thrift.STRUCT { + if fieldTypeId == thrift.I64 { l, err = p.FastReadField1(buf[offset:]) offset += l if err != nil { goto ReadFieldError } + issetEvaluatorTemplateID = true } else { l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -12702,7 +13291,4816 @@ func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastRead(buf []byte) (int, erro goto SkipFieldError } } - default: + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetEvaluatorTemplateID { + fieldId = 1 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateInfoV2Request[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_GetTemplateInfoV2Request[fieldId])) +} + +func (p *GetTemplateInfoV2Request) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.EvaluatorTemplateID = _field + return offset, nil +} + +func (p *GetTemplateInfoV2Request) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + +func (p *GetTemplateInfoV2Request) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *GetTemplateInfoV2Request) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *GetTemplateInfoV2Request) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *GetTemplateInfoV2Request) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], p.EvaluatorTemplateID) + return offset +} + +func (p *GetTemplateInfoV2Request) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBase() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.Base.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *GetTemplateInfoV2Request) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + return l +} + +func (p *GetTemplateInfoV2Request) field255Length() int { + l := 0 + if p.IsSetBase() { + l += thrift.Binary.FieldBeginLength() + l += p.Base.BLength() + } + return l +} + +func (p *GetTemplateInfoV2Request) DeepCopy(s interface{}) error { + src, ok := s.(*GetTemplateInfoV2Request) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + p.EvaluatorTemplateID = src.EvaluatorTemplateID + + var _base *base.Base + if src.Base != nil { + _base = &base.Base{} + if err := _base.DeepCopy(src.Base); err != nil { + return err + } + } + p.Base = _base + + return nil +} + +func (p *GetTemplateInfoV2Response) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateInfoV2Response[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *GetTemplateInfoV2Response) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorTemplate() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.EvaluatorTemplate = _field + return offset, nil +} + +func (p *GetTemplateInfoV2Response) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBaseResp() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.BaseResp = _field + return offset, nil +} + +func (p *GetTemplateInfoV2Response) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *GetTemplateInfoV2Response) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *GetTemplateInfoV2Response) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *GetTemplateInfoV2Response) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetEvaluatorTemplate() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.EvaluatorTemplate.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *GetTemplateInfoV2Response) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *GetTemplateInfoV2Response) field1Length() int { + l := 0 + if p.IsSetEvaluatorTemplate() { + l += thrift.Binary.FieldBeginLength() + l += p.EvaluatorTemplate.BLength() + } + return l +} + +func (p *GetTemplateInfoV2Response) field255Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.BaseResp.BLength() + return l +} + +func (p *GetTemplateInfoV2Response) DeepCopy(s interface{}) error { + src, ok := s.(*GetTemplateInfoV2Response) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _evaluatorTemplate *evaluator.EvaluatorTemplate + if src.EvaluatorTemplate != nil { + _evaluatorTemplate = &evaluator.EvaluatorTemplate{} + if err := _evaluatorTemplate.DeepCopy(src.EvaluatorTemplate); err != nil { + return err + } + } + p.EvaluatorTemplate = _evaluatorTemplate + + var _baseResp *base.BaseResp + if src.BaseResp != nil { + _baseResp = &base.BaseResp{} + if err := _baseResp.DeepCopy(src.BaseResp); err != nil { + return err + } + } + p.BaseResp = _baseResp + + return nil +} + +func (p *GetLatestEvaluatorVersionRequest) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorID bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetEvaluatorID = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 2: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField2(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 3: + if fieldTypeId == thrift.BOOL { + l, err = p.FastReadField3(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 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetEvaluatorID { + fieldId = 1 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetLatestEvaluatorVersionRequest[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_GetLatestEvaluatorVersionRequest[fieldId])) +} + +func (p *GetLatestEvaluatorVersionRequest) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.EvaluatorID = _field + return offset, nil +} + +func (p *GetLatestEvaluatorVersionRequest) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.WorkspaceID = _field + return offset, nil +} + +func (p *GetLatestEvaluatorVersionRequest) FastReadField3(buf []byte) (int, error) { + offset := 0 + + var _field *bool + if v, l, err := thrift.Binary.ReadBool(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Builtin = _field + return offset, nil +} + +func (p *GetLatestEvaluatorVersionRequest) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + +func (p *GetLatestEvaluatorVersionRequest) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *GetLatestEvaluatorVersionRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *GetLatestEvaluatorVersionRequest) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field3Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *GetLatestEvaluatorVersionRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], p.EvaluatorID) + return offset +} + +func (p *GetLatestEvaluatorVersionRequest) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetWorkspaceID() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 2) + offset += thrift.Binary.WriteI64(buf[offset:], *p.WorkspaceID) + } + return offset +} + +func (p *GetLatestEvaluatorVersionRequest) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBuiltin() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.BOOL, 3) + offset += thrift.Binary.WriteBool(buf[offset:], *p.Builtin) + } + return offset +} + +func (p *GetLatestEvaluatorVersionRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBase() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.Base.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *GetLatestEvaluatorVersionRequest) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + return l +} + +func (p *GetLatestEvaluatorVersionRequest) field2Length() int { + l := 0 + if p.IsSetWorkspaceID() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *GetLatestEvaluatorVersionRequest) field3Length() int { + l := 0 + if p.IsSetBuiltin() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.BoolLength() + } + return l +} + +func (p *GetLatestEvaluatorVersionRequest) field255Length() int { + l := 0 + if p.IsSetBase() { + l += thrift.Binary.FieldBeginLength() + l += p.Base.BLength() + } + return l +} + +func (p *GetLatestEvaluatorVersionRequest) DeepCopy(s interface{}) error { + src, ok := s.(*GetLatestEvaluatorVersionRequest) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + p.EvaluatorID = src.EvaluatorID + + if src.WorkspaceID != nil { + tmp := *src.WorkspaceID + p.WorkspaceID = &tmp + } + + if src.Builtin != nil { + tmp := *src.Builtin + p.Builtin = &tmp + } + + var _base *base.Base + if src.Base != nil { + _base = &base.Base{} + if err := _base.DeepCopy(src.Base); err != nil { + return err + } + } + p.Base = _base + + return nil +} + +func (p *GetLatestEvaluatorVersionResponse) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetVersion bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetVersion = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetVersion { + fieldId = 1 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetLatestEvaluatorVersionResponse[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_GetLatestEvaluatorVersionResponse[fieldId])) +} + +func (p *GetLatestEvaluatorVersionResponse) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorVersion() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Version = _field + return offset, nil +} + +func (p *GetLatestEvaluatorVersionResponse) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBaseResp() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.BaseResp = _field + return offset, nil +} + +func (p *GetLatestEvaluatorVersionResponse) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *GetLatestEvaluatorVersionResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *GetLatestEvaluatorVersionResponse) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *GetLatestEvaluatorVersionResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Version.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *GetLatestEvaluatorVersionResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *GetLatestEvaluatorVersionResponse) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Version.BLength() + return l +} + +func (p *GetLatestEvaluatorVersionResponse) field255Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.BaseResp.BLength() + return l +} + +func (p *GetLatestEvaluatorVersionResponse) DeepCopy(s interface{}) error { + src, ok := s.(*GetLatestEvaluatorVersionResponse) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _version *evaluator.EvaluatorVersion + if src.Version != nil { + _version = &evaluator.EvaluatorVersion{} + if err := _version.DeepCopy(src.Version); err != nil { + return err + } + } + p.Version = _version + + var _baseResp *base.BaseResp + if src.BaseResp != nil { + _baseResp = &base.BaseResp{} + if err := _baseResp.DeepCopy(src.BaseResp); err != nil { + return err + } + } + p.BaseResp = _baseResp + + return nil +} + +func (p *DebugBuiltinEvaluatorRequest) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorID bool = false + var issetInputData bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetEvaluatorID = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 2: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField2(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetInputData = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetEvaluatorID { + fieldId = 1 + goto RequiredFieldNotSetError + } + + if !issetInputData { + fieldId = 2 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_DebugBuiltinEvaluatorRequest[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_DebugBuiltinEvaluatorRequest[fieldId])) +} + +func (p *DebugBuiltinEvaluatorRequest) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.EvaluatorID = _field + return offset, nil +} + +func (p *DebugBuiltinEvaluatorRequest) FastReadField2(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorInputData() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.InputData = _field + return offset, nil +} + +func (p *DebugBuiltinEvaluatorRequest) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + +func (p *DebugBuiltinEvaluatorRequest) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *DebugBuiltinEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *DebugBuiltinEvaluatorRequest) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *DebugBuiltinEvaluatorRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], p.EvaluatorID) + return offset +} + +func (p *DebugBuiltinEvaluatorRequest) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 2) + offset += p.InputData.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *DebugBuiltinEvaluatorRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBase() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.Base.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *DebugBuiltinEvaluatorRequest) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + return l +} + +func (p *DebugBuiltinEvaluatorRequest) field2Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.InputData.BLength() + return l +} + +func (p *DebugBuiltinEvaluatorRequest) field255Length() int { + l := 0 + if p.IsSetBase() { + l += thrift.Binary.FieldBeginLength() + l += p.Base.BLength() + } + return l +} + +func (p *DebugBuiltinEvaluatorRequest) DeepCopy(s interface{}) error { + src, ok := s.(*DebugBuiltinEvaluatorRequest) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + p.EvaluatorID = src.EvaluatorID + + var _inputData *evaluator.EvaluatorInputData + if src.InputData != nil { + _inputData = &evaluator.EvaluatorInputData{} + if err := _inputData.DeepCopy(src.InputData); err != nil { + return err + } + } + p.InputData = _inputData + + var _base *base.Base + if src.Base != nil { + _base = &base.Base{} + if err := _base.DeepCopy(src.Base); err != nil { + return err + } + } + p.Base = _base + + return nil +} + +func (p *DebugBuiltinEvaluatorResponse) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetOutputData bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetOutputData = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetOutputData { + fieldId = 1 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_DebugBuiltinEvaluatorResponse[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_DebugBuiltinEvaluatorResponse[fieldId])) +} + +func (p *DebugBuiltinEvaluatorResponse) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorOutputData() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.OutputData = _field + return offset, nil +} + +func (p *DebugBuiltinEvaluatorResponse) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBaseResp() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.BaseResp = _field + return offset, nil +} + +func (p *DebugBuiltinEvaluatorResponse) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *DebugBuiltinEvaluatorResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *DebugBuiltinEvaluatorResponse) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *DebugBuiltinEvaluatorResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.OutputData.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *DebugBuiltinEvaluatorResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *DebugBuiltinEvaluatorResponse) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.OutputData.BLength() + return l +} + +func (p *DebugBuiltinEvaluatorResponse) field255Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.BaseResp.BLength() + return l +} + +func (p *DebugBuiltinEvaluatorResponse) DeepCopy(s interface{}) error { + src, ok := s.(*DebugBuiltinEvaluatorResponse) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _outputData *evaluator.EvaluatorOutputData + if src.OutputData != nil { + _outputData = &evaluator.EvaluatorOutputData{} + if err := _outputData.DeepCopy(src.OutputData); err != nil { + return err + } + } + p.OutputData = _outputData + + var _baseResp *base.BaseResp + if src.BaseResp != nil { + _baseResp = &base.BaseResp{} + if err := _baseResp.DeepCopy(src.BaseResp); err != nil { + return err + } + } + p.BaseResp = _baseResp + + return nil +} + +func (p *PublishBuiltinEvaluatorRequest) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorID bool = false + var issetVersion bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetEvaluatorID = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 2: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField2(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetVersion = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 3: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField3(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 4: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField4(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 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetEvaluatorID { + fieldId = 1 + goto RequiredFieldNotSetError + } + + if !issetVersion { + fieldId = 2 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_PublishBuiltinEvaluatorRequest[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_PublishBuiltinEvaluatorRequest[fieldId])) +} + +func (p *PublishBuiltinEvaluatorRequest) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.EvaluatorID = _field + return offset, nil +} + +func (p *PublishBuiltinEvaluatorRequest) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.Version = _field + return offset, nil +} + +func (p *PublishBuiltinEvaluatorRequest) FastReadField3(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.WorkspaceID = _field + return offset, nil +} + +func (p *PublishBuiltinEvaluatorRequest) FastReadField4(buf []byte) (int, error) { + offset := 0 + + var _field *evaluator.OperationType + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.OperationType = _field + return offset, nil +} + +func (p *PublishBuiltinEvaluatorRequest) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + +func (p *PublishBuiltinEvaluatorRequest) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *PublishBuiltinEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField4(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *PublishBuiltinEvaluatorRequest) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field3Length() + l += p.field4Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *PublishBuiltinEvaluatorRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], p.EvaluatorID) + return offset +} + +func (p *PublishBuiltinEvaluatorRequest) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 2) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, p.Version) + return offset +} + +func (p *PublishBuiltinEvaluatorRequest) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetWorkspaceID() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 3) + offset += thrift.Binary.WriteI64(buf[offset:], *p.WorkspaceID) + } + return offset +} + +func (p *PublishBuiltinEvaluatorRequest) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetOperationType() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 4) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.OperationType) + } + return offset +} + +func (p *PublishBuiltinEvaluatorRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBase() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.Base.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *PublishBuiltinEvaluatorRequest) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + return l +} + +func (p *PublishBuiltinEvaluatorRequest) field2Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(p.Version) + return l +} + +func (p *PublishBuiltinEvaluatorRequest) field3Length() int { + l := 0 + if p.IsSetWorkspaceID() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *PublishBuiltinEvaluatorRequest) field4Length() int { + l := 0 + if p.IsSetOperationType() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.OperationType) + } + return l +} + +func (p *PublishBuiltinEvaluatorRequest) field255Length() int { + l := 0 + if p.IsSetBase() { + l += thrift.Binary.FieldBeginLength() + l += p.Base.BLength() + } + return l +} + +func (p *PublishBuiltinEvaluatorRequest) DeepCopy(s interface{}) error { + src, ok := s.(*PublishBuiltinEvaluatorRequest) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + p.EvaluatorID = src.EvaluatorID + + if src.Version != "" { + p.Version = kutils.StringDeepCopy(src.Version) + } + + if src.WorkspaceID != nil { + tmp := *src.WorkspaceID + p.WorkspaceID = &tmp + } + + if src.OperationType != nil { + tmp := *src.OperationType + p.OperationType = &tmp + } + + var _base *base.Base + if src.Base != nil { + _base = &base.Base{} + if err := _base.DeepCopy(src.Base); err != nil { + return err + } + } + p.Base = _base + + return nil +} + +func (p *PublishBuiltinEvaluatorResponse) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetVersion bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetVersion = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetVersion { + fieldId = 1 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_PublishBuiltinEvaluatorResponse[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_PublishBuiltinEvaluatorResponse[fieldId])) +} + +func (p *PublishBuiltinEvaluatorResponse) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorVersion() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Version = _field + return offset, nil +} + +func (p *PublishBuiltinEvaluatorResponse) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBaseResp() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.BaseResp = _field + return offset, nil +} + +func (p *PublishBuiltinEvaluatorResponse) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *PublishBuiltinEvaluatorResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *PublishBuiltinEvaluatorResponse) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *PublishBuiltinEvaluatorResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Version.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *PublishBuiltinEvaluatorResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *PublishBuiltinEvaluatorResponse) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Version.BLength() + return l +} + +func (p *PublishBuiltinEvaluatorResponse) field255Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.BaseResp.BLength() + return l +} + +func (p *PublishBuiltinEvaluatorResponse) DeepCopy(s interface{}) error { + src, ok := s.(*PublishBuiltinEvaluatorResponse) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _version *evaluator.EvaluatorVersion + if src.Version != nil { + _version = &evaluator.EvaluatorVersion{} + if err := _version.DeepCopy(src.Version); err != nil { + return err + } + } + p.Version = _version + + var _baseResp *base.BaseResp + if src.BaseResp != nil { + _baseResp = &base.BaseResp{} + if err := _baseResp.DeepCopy(src.BaseResp); err != nil { + return err + } + } + p.BaseResp = _baseResp + + return nil +} + +func (p *CreateEvaluatorTemplateRequest) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplate bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetEvaluatorTemplate = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetEvaluatorTemplate { + fieldId = 1 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_CreateEvaluatorTemplateRequest[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_CreateEvaluatorTemplateRequest[fieldId])) +} + +func (p *CreateEvaluatorTemplateRequest) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorTemplate() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.EvaluatorTemplate = _field + return offset, nil +} + +func (p *CreateEvaluatorTemplateRequest) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + +func (p *CreateEvaluatorTemplateRequest) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *CreateEvaluatorTemplateRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *CreateEvaluatorTemplateRequest) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *CreateEvaluatorTemplateRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.EvaluatorTemplate.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *CreateEvaluatorTemplateRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBase() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.Base.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *CreateEvaluatorTemplateRequest) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.EvaluatorTemplate.BLength() + return l +} + +func (p *CreateEvaluatorTemplateRequest) field255Length() int { + l := 0 + if p.IsSetBase() { + l += thrift.Binary.FieldBeginLength() + l += p.Base.BLength() + } + return l +} + +func (p *CreateEvaluatorTemplateRequest) DeepCopy(s interface{}) error { + src, ok := s.(*CreateEvaluatorTemplateRequest) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _evaluatorTemplate *evaluator.EvaluatorTemplate + if src.EvaluatorTemplate != nil { + _evaluatorTemplate = &evaluator.EvaluatorTemplate{} + if err := _evaluatorTemplate.DeepCopy(src.EvaluatorTemplate); err != nil { + return err + } + } + p.EvaluatorTemplate = _evaluatorTemplate + + var _base *base.Base + if src.Base != nil { + _base = &base.Base{} + if err := _base.DeepCopy(src.Base); err != nil { + return err + } + } + p.Base = _base + + return nil +} + +func (p *CreateEvaluatorTemplateResponse) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplate bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetEvaluatorTemplate = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetEvaluatorTemplate { + fieldId = 1 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_CreateEvaluatorTemplateResponse[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_CreateEvaluatorTemplateResponse[fieldId])) +} + +func (p *CreateEvaluatorTemplateResponse) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorTemplate() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.EvaluatorTemplate = _field + return offset, nil +} + +func (p *CreateEvaluatorTemplateResponse) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBaseResp() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.BaseResp = _field + return offset, nil +} + +func (p *CreateEvaluatorTemplateResponse) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *CreateEvaluatorTemplateResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *CreateEvaluatorTemplateResponse) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *CreateEvaluatorTemplateResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.EvaluatorTemplate.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *CreateEvaluatorTemplateResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *CreateEvaluatorTemplateResponse) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.EvaluatorTemplate.BLength() + return l +} + +func (p *CreateEvaluatorTemplateResponse) field255Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.BaseResp.BLength() + return l +} + +func (p *CreateEvaluatorTemplateResponse) DeepCopy(s interface{}) error { + src, ok := s.(*CreateEvaluatorTemplateResponse) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _evaluatorTemplate *evaluator.EvaluatorTemplate + if src.EvaluatorTemplate != nil { + _evaluatorTemplate = &evaluator.EvaluatorTemplate{} + if err := _evaluatorTemplate.DeepCopy(src.EvaluatorTemplate); err != nil { + return err + } + } + p.EvaluatorTemplate = _evaluatorTemplate + + var _baseResp *base.BaseResp + if src.BaseResp != nil { + _baseResp = &base.BaseResp{} + if err := _baseResp.DeepCopy(src.BaseResp); err != nil { + return err + } + } + p.BaseResp = _baseResp + + return nil +} + +func (p *UpdateEvaluatorTemplateRequest) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplate bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetEvaluatorTemplate = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetEvaluatorTemplate { + fieldId = 1 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_UpdateEvaluatorTemplateRequest[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_UpdateEvaluatorTemplateRequest[fieldId])) +} + +func (p *UpdateEvaluatorTemplateRequest) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorTemplate() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.EvaluatorTemplate = _field + return offset, nil +} + +func (p *UpdateEvaluatorTemplateRequest) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + +func (p *UpdateEvaluatorTemplateRequest) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *UpdateEvaluatorTemplateRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *UpdateEvaluatorTemplateRequest) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *UpdateEvaluatorTemplateRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.EvaluatorTemplate.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *UpdateEvaluatorTemplateRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBase() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.Base.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *UpdateEvaluatorTemplateRequest) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.EvaluatorTemplate.BLength() + return l +} + +func (p *UpdateEvaluatorTemplateRequest) field255Length() int { + l := 0 + if p.IsSetBase() { + l += thrift.Binary.FieldBeginLength() + l += p.Base.BLength() + } + return l +} + +func (p *UpdateEvaluatorTemplateRequest) DeepCopy(s interface{}) error { + src, ok := s.(*UpdateEvaluatorTemplateRequest) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _evaluatorTemplate *evaluator.EvaluatorTemplate + if src.EvaluatorTemplate != nil { + _evaluatorTemplate = &evaluator.EvaluatorTemplate{} + if err := _evaluatorTemplate.DeepCopy(src.EvaluatorTemplate); err != nil { + return err + } + } + p.EvaluatorTemplate = _evaluatorTemplate + + var _base *base.Base + if src.Base != nil { + _base = &base.Base{} + if err := _base.DeepCopy(src.Base); err != nil { + return err + } + } + p.Base = _base + + return nil +} + +func (p *UpdateEvaluatorTemplateResponse) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplate bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetEvaluatorTemplate = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetEvaluatorTemplate { + fieldId = 1 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_UpdateEvaluatorTemplateResponse[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_UpdateEvaluatorTemplateResponse[fieldId])) +} + +func (p *UpdateEvaluatorTemplateResponse) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorTemplate() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.EvaluatorTemplate = _field + return offset, nil +} + +func (p *UpdateEvaluatorTemplateResponse) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBaseResp() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.BaseResp = _field + return offset, nil +} + +func (p *UpdateEvaluatorTemplateResponse) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *UpdateEvaluatorTemplateResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *UpdateEvaluatorTemplateResponse) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *UpdateEvaluatorTemplateResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.EvaluatorTemplate.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *UpdateEvaluatorTemplateResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *UpdateEvaluatorTemplateResponse) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.EvaluatorTemplate.BLength() + return l +} + +func (p *UpdateEvaluatorTemplateResponse) field255Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.BaseResp.BLength() + return l +} + +func (p *UpdateEvaluatorTemplateResponse) DeepCopy(s interface{}) error { + src, ok := s.(*UpdateEvaluatorTemplateResponse) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _evaluatorTemplate *evaluator.EvaluatorTemplate + if src.EvaluatorTemplate != nil { + _evaluatorTemplate = &evaluator.EvaluatorTemplate{} + if err := _evaluatorTemplate.DeepCopy(src.EvaluatorTemplate); err != nil { + return err + } + } + p.EvaluatorTemplate = _evaluatorTemplate + + var _baseResp *base.BaseResp + if src.BaseResp != nil { + _baseResp = &base.BaseResp{} + if err := _baseResp.DeepCopy(src.BaseResp); err != nil { + return err + } + } + p.BaseResp = _baseResp + + return nil +} + +func (p *DeleteEvaluatorTemplateRequest) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetEvaluatorTemplateID bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField1(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetEvaluatorTemplateID = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetEvaluatorTemplateID { + fieldId = 1 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_DeleteEvaluatorTemplateRequest[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_DeleteEvaluatorTemplateRequest[fieldId])) +} + +func (p *DeleteEvaluatorTemplateRequest) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.EvaluatorTemplateID = _field + return offset, nil +} + +func (p *DeleteEvaluatorTemplateRequest) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + +func (p *DeleteEvaluatorTemplateRequest) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *DeleteEvaluatorTemplateRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *DeleteEvaluatorTemplateRequest) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *DeleteEvaluatorTemplateRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], p.EvaluatorTemplateID) + return offset +} + +func (p *DeleteEvaluatorTemplateRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBase() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.Base.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *DeleteEvaluatorTemplateRequest) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + return l +} + +func (p *DeleteEvaluatorTemplateRequest) field255Length() int { + l := 0 + if p.IsSetBase() { + l += thrift.Binary.FieldBeginLength() + l += p.Base.BLength() + } + return l +} + +func (p *DeleteEvaluatorTemplateRequest) DeepCopy(s interface{}) error { + src, ok := s.(*DeleteEvaluatorTemplateRequest) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + p.EvaluatorTemplateID = src.EvaluatorTemplateID + + var _base *base.Base + if src.Base != nil { + _base = &base.Base{} + if err := _base.DeepCopy(src.Base); err != nil { + return err + } + } + p.Base = _base + + return nil +} + +func (p *DeleteEvaluatorTemplateResponse) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_DeleteEvaluatorTemplateResponse[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *DeleteEvaluatorTemplateResponse) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBaseResp() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.BaseResp = _field + return offset, nil +} + +func (p *DeleteEvaluatorTemplateResponse) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *DeleteEvaluatorTemplateResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *DeleteEvaluatorTemplateResponse) BLength() int { + l := 0 + if p != nil { + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *DeleteEvaluatorTemplateResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *DeleteEvaluatorTemplateResponse) field255Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.BaseResp.BLength() + return l +} + +func (p *DeleteEvaluatorTemplateResponse) DeepCopy(s interface{}) error { + src, ok := s.(*DeleteEvaluatorTemplateResponse) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _baseResp *base.BaseResp + if src.BaseResp != nil { + _baseResp = &base.BaseResp{} + if err := _baseResp.DeepCopy(src.BaseResp); err != nil { + return err + } + } + p.BaseResp = _baseResp + + return nil +} + +func (p *ListEvaluatorTagsRequest) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_ListEvaluatorTagsRequest[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *ListEvaluatorTagsRequest) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + +func (p *ListEvaluatorTagsRequest) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *ListEvaluatorTagsRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *ListEvaluatorTagsRequest) BLength() int { + l := 0 + if p != nil { + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *ListEvaluatorTagsRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBase() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.Base.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *ListEvaluatorTagsRequest) field255Length() int { + l := 0 + if p.IsSetBase() { + l += thrift.Binary.FieldBeginLength() + l += p.Base.BLength() + } + return l +} + +func (p *ListEvaluatorTagsRequest) DeepCopy(s interface{}) error { + src, ok := s.(*ListEvaluatorTagsRequest) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _base *base.Base + if src.Base != nil { + _base = &base.Base{} + if err := _base.DeepCopy(src.Base); err != nil { + return err + } + } + p.Base = _base + + return nil +} + +func (p *ListEvaluatorTagsResponse) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.MAP { + l, err = p.FastReadField1(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 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_ListEvaluatorTagsResponse[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *ListEvaluatorTagsResponse) FastReadField1(buf []byte) (int, error) { + offset := 0 + + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make(map[evaluator.EvaluatorTagKey][]string, size) + for i := 0; i < size; i++ { + var _key evaluator.EvaluatorTagKey + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _key = v + } + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _val := make([]string, 0, size) + for i := 0; i < size; i++ { + var _elem string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _elem = v + } + + _val = append(_val, _elem) + } + + _field[_key] = _val + } + p.Tags = _field + return offset, nil +} + +func (p *ListEvaluatorTagsResponse) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBaseResp() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.BaseResp = _field + return offset, nil +} + +func (p *ListEvaluatorTagsResponse) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *ListEvaluatorTagsResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *ListEvaluatorTagsResponse) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *ListEvaluatorTagsResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetTags() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 1) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() + var length int + for k, v := range p.Tags { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range v { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) + } + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) + } + return offset +} + +func (p *ListEvaluatorTagsResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *ListEvaluatorTagsResponse) field1Length() int { + l := 0 + if p.IsSetTags() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.MapBeginLength() + for k, v := range p.Tags { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.ListBeginLength() + for _, v := range v { + _ = v + l += thrift.Binary.StringLengthNocopy(v) + } + } + } + return l +} + +func (p *ListEvaluatorTagsResponse) field255Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.BaseResp.BLength() + return l +} + +func (p *ListEvaluatorTagsResponse) DeepCopy(s interface{}) error { + src, ok := s.(*ListEvaluatorTagsResponse) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.Tags != nil { + p.Tags = make(map[evaluator.EvaluatorTagKey][]string, len(src.Tags)) + for key, val := range src.Tags { + var _key evaluator.EvaluatorTagKey + _key = key + + var _val []string + if val != nil { + _val = make([]string, 0, len(val)) + for _, elem := range val { + var _elem string + if elem != "" { + _elem = kutils.StringDeepCopy(elem) + } + _val = append(_val, _elem) + } + } + + p.Tags[_key] = _val + } + } + + var _baseResp *base.BaseResp + if src.BaseResp != nil { + _baseResp = &base.BaseResp{} + if err := _baseResp.DeepCopy(src.BaseResp); err != nil { + return err + } + } + p.BaseResp = _baseResp + + return nil +} + +func (p *EvaluatorServiceListEvaluatorsArgs) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorsArgs[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceListEvaluatorsArgs) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewListEvaluatorsRequest() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Request = _field + return offset, nil +} + +func (p *EvaluatorServiceListEvaluatorsArgs) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceListEvaluatorsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceListEvaluatorsArgs) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceListEvaluatorsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Request.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *EvaluatorServiceListEvaluatorsArgs) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Request.BLength() + return l +} + +func (p *EvaluatorServiceListEvaluatorsArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceListEvaluatorsArgs) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _request *ListEvaluatorsRequest + if src.Request != nil { + _request = &ListEvaluatorsRequest{} + if err := _request.DeepCopy(src.Request); err != nil { + return err + } + } + p.Request = _request + + return nil +} + +func (p *EvaluatorServiceListEvaluatorsResult) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField0(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorsResult[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceListEvaluatorsResult) FastReadField0(buf []byte) (int, error) { + offset := 0 + _field := NewListEvaluatorsResponse() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Success = _field + return offset, nil +} + +func (p *EvaluatorServiceListEvaluatorsResult) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceListEvaluatorsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField0(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceListEvaluatorsResult) BLength() int { + l := 0 + if p != nil { + l += p.field0Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceListEvaluatorsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSuccess() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) + offset += p.Success.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorServiceListEvaluatorsResult) field0Length() int { + l := 0 + if p.IsSetSuccess() { + l += thrift.Binary.FieldBeginLength() + l += p.Success.BLength() + } + return l +} + +func (p *EvaluatorServiceListEvaluatorsResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceListEvaluatorsResult) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _success *ListEvaluatorsResponse + if src.Success != nil { + _success = &ListEvaluatorsResponse{} + if err := _success.DeepCopy(src.Success); err != nil { + return err + } + } + p.Success = _success + + return nil +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorsArgs[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewBatchGetEvaluatorsRequest() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Request = _field + return offset, nil +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Request.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Request.BLength() + return l +} + +func (p *EvaluatorServiceBatchGetEvaluatorsArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceBatchGetEvaluatorsArgs) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _request *BatchGetEvaluatorsRequest + if src.Request != nil { + _request = &BatchGetEvaluatorsRequest{} + if err := _request.DeepCopy(src.Request); err != nil { + return err + } + } + p.Request = _request + + return nil +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField0(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorsResult[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastReadField0(buf []byte) (int, error) { + offset := 0 + _field := NewBatchGetEvaluatorsResponse() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Success = _field + return offset, nil +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField0(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) BLength() int { + l := 0 + if p != nil { + l += p.field0Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSuccess() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) + offset += p.Success.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) field0Length() int { + l := 0 + if p.IsSetSuccess() { + l += thrift.Binary.FieldBeginLength() + l += p.Success.BLength() + } + return l +} + +func (p *EvaluatorServiceBatchGetEvaluatorsResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceBatchGetEvaluatorsResult) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _success *BatchGetEvaluatorsResponse + if src.Success != nil { + _success = &BatchGetEvaluatorsResponse{} + if err := _success.DeepCopy(src.Success); err != nil { + return err + } + } + p.Success = _success + + return nil +} + +func (p *EvaluatorServiceGetEvaluatorArgs) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorArgs[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceGetEvaluatorArgs) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewGetEvaluatorRequest() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Request = _field + return offset, nil +} + +func (p *EvaluatorServiceGetEvaluatorArgs) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceGetEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceGetEvaluatorArgs) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceGetEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Request.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *EvaluatorServiceGetEvaluatorArgs) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Request.BLength() + return l +} + +func (p *EvaluatorServiceGetEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetEvaluatorArgs) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _request *GetEvaluatorRequest + if src.Request != nil { + _request = &GetEvaluatorRequest{} + if err := _request.DeepCopy(src.Request); err != nil { + return err + } + } + p.Request = _request + + return nil +} + +func (p *EvaluatorServiceGetEvaluatorResult) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField0(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorResult[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceGetEvaluatorResult) FastReadField0(buf []byte) (int, error) { + offset := 0 + _field := NewGetEvaluatorResponse() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Success = _field + return offset, nil +} + +func (p *EvaluatorServiceGetEvaluatorResult) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceGetEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField0(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceGetEvaluatorResult) BLength() int { + l := 0 + if p != nil { + l += p.field0Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceGetEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSuccess() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) + offset += p.Success.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorServiceGetEvaluatorResult) field0Length() int { + l := 0 + if p.IsSetSuccess() { + l += thrift.Binary.FieldBeginLength() + l += p.Success.BLength() + } + return l +} + +func (p *EvaluatorServiceGetEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetEvaluatorResult) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _success *GetEvaluatorResponse + if src.Success != nil { + _success = &GetEvaluatorResponse{} + if err := _success.DeepCopy(src.Success); err != nil { + return err + } + } + p.Success = _success + + return nil +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorArgs[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewCreateEvaluatorRequest() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Request = _field + return offset, nil +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Request.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Request.BLength() + return l +} + +func (p *EvaluatorServiceCreateEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceCreateEvaluatorArgs) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _request *CreateEvaluatorRequest + if src.Request != nil { + _request = &CreateEvaluatorRequest{} + if err := _request.DeepCopy(src.Request); err != nil { + return err + } + } + p.Request = _request + + return nil +} + +func (p *EvaluatorServiceCreateEvaluatorResult) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField0(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorResult[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceCreateEvaluatorResult) FastReadField0(buf []byte) (int, error) { + offset := 0 + _field := NewCreateEvaluatorResponse() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Success = _field + return offset, nil +} + +func (p *EvaluatorServiceCreateEvaluatorResult) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceCreateEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField0(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceCreateEvaluatorResult) BLength() int { + l := 0 + if p != nil { + l += p.field0Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceCreateEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSuccess() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) + offset += p.Success.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorServiceCreateEvaluatorResult) field0Length() int { + l := 0 + if p.IsSetSuccess() { + l += thrift.Binary.FieldBeginLength() + l += p.Success.BLength() + } + return l +} + +func (p *EvaluatorServiceCreateEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceCreateEvaluatorResult) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _success *CreateEvaluatorResponse + if src.Success != nil { + _success = &CreateEvaluatorResponse{} + if err := _success.DeepCopy(src.Success); err != nil { + return err + } + } + p.Success = _success + + return nil +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorArgs[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewUpdateEvaluatorRequest() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Request = _field + return offset, nil +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Request.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Request.BLength() + return l +} + +func (p *EvaluatorServiceUpdateEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceUpdateEvaluatorArgs) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _request *UpdateEvaluatorRequest + if src.Request != nil { + _request = &UpdateEvaluatorRequest{} + if err := _request.DeepCopy(src.Request); err != nil { + return err + } + } + p.Request = _request + + return nil +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField0(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorResult[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) FastReadField0(buf []byte) (int, error) { + offset := 0 + _field := NewUpdateEvaluatorResponse() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Success = _field + return offset, nil +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField0(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) BLength() int { + l := 0 + if p != nil { + l += p.field0Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSuccess() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) + offset += p.Success.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) field0Length() int { + l := 0 + if p.IsSetSuccess() { + l += thrift.Binary.FieldBeginLength() + l += p.Success.BLength() + } + return l +} + +func (p *EvaluatorServiceUpdateEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceUpdateEvaluatorResult) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _success *UpdateEvaluatorResponse + if src.Success != nil { + _success = &UpdateEvaluatorResponse{} + if err := _success.DeepCopy(src.Success); err != nil { + return err + } + } + p.Success = _success + + return nil +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftArgs[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewUpdateEvaluatorDraftRequest() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Request = _field + return offset, nil +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Request.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Request.BLength() + return l +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceUpdateEvaluatorDraftArgs) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _request *UpdateEvaluatorDraftRequest + if src.Request != nil { + _request = &UpdateEvaluatorDraftRequest{} + if err := _request.DeepCopy(src.Request); err != nil { + return err + } + } + p.Request = _request + + return nil +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField0(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftResult[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastReadField0(buf []byte) (int, error) { + offset := 0 + _field := NewUpdateEvaluatorDraftResponse() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Success = _field + return offset, nil +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField0(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) BLength() int { + l := 0 + if p != nil { + l += p.field0Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSuccess() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) + offset += p.Success.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) field0Length() int { + l := 0 + if p.IsSetSuccess() { + l += thrift.Binary.FieldBeginLength() + l += p.Success.BLength() + } + return l +} + +func (p *EvaluatorServiceUpdateEvaluatorDraftResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceUpdateEvaluatorDraftResult) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _success *UpdateEvaluatorDraftResponse + if src.Success != nil { + _success = &UpdateEvaluatorDraftResponse{} + if err := _success.DeepCopy(src.Success); err != nil { + return err + } + } + p.Success = _success + + return nil +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorArgs[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewDeleteEvaluatorRequest() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Request = _field + return offset, nil +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Request.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Request.BLength() + return l +} + +func (p *EvaluatorServiceDeleteEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceDeleteEvaluatorArgs) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _request *DeleteEvaluatorRequest + if src.Request != nil { + _request = &DeleteEvaluatorRequest{} + if err := _request.DeepCopy(src.Request); err != nil { + return err + } + } + p.Request = _request + + return nil +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField0(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorResult[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) FastReadField0(buf []byte) (int, error) { + offset := 0 + _field := NewDeleteEvaluatorResponse() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Success = _field + return offset, nil +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField0(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) BLength() int { + l := 0 + if p != nil { + l += p.field0Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSuccess() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) + offset += p.Success.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) field0Length() int { + l := 0 + if p.IsSetSuccess() { + l += thrift.Binary.FieldBeginLength() + l += p.Success.BLength() + } + return l +} + +func (p *EvaluatorServiceDeleteEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceDeleteEvaluatorResult) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _success *DeleteEvaluatorResponse + if src.Success != nil { + _success = &DeleteEvaluatorResponse{} + if err := _success.DeepCopy(src.Success); err != nil { + return err + } + } + p.Success = _success + + return nil +} + +func (p *EvaluatorServiceCheckEvaluatorNameArgs) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCheckEvaluatorNameArgs[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceCheckEvaluatorNameArgs) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewCheckEvaluatorNameRequest() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Request = _field + return offset, nil +} + +func (p *EvaluatorServiceCheckEvaluatorNameArgs) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceCheckEvaluatorNameArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceCheckEvaluatorNameArgs) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceCheckEvaluatorNameArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Request.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *EvaluatorServiceCheckEvaluatorNameArgs) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Request.BLength() + return l +} + +func (p *EvaluatorServiceCheckEvaluatorNameArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceCheckEvaluatorNameArgs) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _request *CheckEvaluatorNameRequest + if src.Request != nil { + _request = &CheckEvaluatorNameRequest{} + if err := _request.DeepCopy(src.Request); err != nil { + return err + } + } + p.Request = _request + + return nil +} + +func (p *EvaluatorServiceCheckEvaluatorNameResult) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField0(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 + } + } + default: l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l if err != nil { @@ -12715,14 +18113,133 @@ func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastRead(buf []byte) (int, erro ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorsArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCheckEvaluatorNameResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceCheckEvaluatorNameResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewBatchGetEvaluatorsRequest() + _field := NewCheckEvaluatorNameResponse() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Success = _field + return offset, nil +} + +func (p *EvaluatorServiceCheckEvaluatorNameResult) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceCheckEvaluatorNameResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField0(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceCheckEvaluatorNameResult) BLength() int { + l := 0 + if p != nil { + l += p.field0Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceCheckEvaluatorNameResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSuccess() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) + offset += p.Success.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorServiceCheckEvaluatorNameResult) field0Length() int { + l := 0 + if p.IsSetSuccess() { + l += thrift.Binary.FieldBeginLength() + l += p.Success.BLength() + } + return l +} + +func (p *EvaluatorServiceCheckEvaluatorNameResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceCheckEvaluatorNameResult) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _success *CheckEvaluatorNameResponse + if src.Success != nil { + _success = &CheckEvaluatorNameResponse{} + if err := _success.DeepCopy(src.Success); err != nil { + return err + } + } + p.Success = _success + + return nil +} + +func (p *EvaluatorServiceListEvaluatorVersionsArgs) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorVersionsArgs[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceListEvaluatorVersionsArgs) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewListEvaluatorVersionsRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -12732,11 +18249,11 @@ func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastReadField1(buf []byte) (int return offset, nil } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -12745,7 +18262,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorsArgs) FastWriteNocopy(buf []byte, w t return offset } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) BLength() int { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -12754,29 +18271,29 @@ func (p *EvaluatorServiceBatchGetEvaluatorsArgs) BLength() int { return l } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) field1Length() int { +func (p *EvaluatorServiceListEvaluatorVersionsArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.Request.BLength() return l } -func (p *EvaluatorServiceBatchGetEvaluatorsArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceBatchGetEvaluatorsArgs) +func (p *EvaluatorServiceListEvaluatorVersionsArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceListEvaluatorVersionsArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *BatchGetEvaluatorsRequest + var _request *ListEvaluatorVersionsRequest if src.Request != nil { - _request = &BatchGetEvaluatorsRequest{} + _request = &ListEvaluatorVersionsRequest{} if err := _request.DeepCopy(src.Request); err != nil { return err } @@ -12786,7 +18303,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorsArgs) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceListEvaluatorVersionsResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -12830,14 +18347,14 @@ func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastRead(buf []byte) (int, er ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorsResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorVersionsResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceListEvaluatorVersionsResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewBatchGetEvaluatorsResponse() + _field := NewListEvaluatorVersionsResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -12847,11 +18364,11 @@ func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastReadField0(buf []byte) (i return offset, nil } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceListEvaluatorVersionsResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListEvaluatorVersionsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -12860,7 +18377,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorsResult) FastWriteNocopy(buf []byte, w return offset } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) BLength() int { +func (p *EvaluatorServiceListEvaluatorVersionsResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -12869,7 +18386,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorsResult) BLength() int { return l } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListEvaluatorVersionsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -12878,7 +18395,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorsResult) fastWriteField0(buf []byte, w return offset } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) field0Length() int { +func (p *EvaluatorServiceListEvaluatorVersionsResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -12887,15 +18404,15 @@ func (p *EvaluatorServiceBatchGetEvaluatorsResult) field0Length() int { return l } -func (p *EvaluatorServiceBatchGetEvaluatorsResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceBatchGetEvaluatorsResult) +func (p *EvaluatorServiceListEvaluatorVersionsResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceListEvaluatorVersionsResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *BatchGetEvaluatorsResponse + var _success *ListEvaluatorVersionsResponse if src.Success != nil { - _success = &BatchGetEvaluatorsResponse{} + _success = &ListEvaluatorVersionsResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -12905,7 +18422,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorsResult) DeepCopy(s interface{}) error return nil } -func (p *EvaluatorServiceGetEvaluatorArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -12949,14 +18466,14 @@ func (p *EvaluatorServiceGetEvaluatorArgs) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorVersionArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceGetEvaluatorArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewGetEvaluatorRequest() + _field := NewGetEvaluatorVersionRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -12966,11 +18483,11 @@ func (p *EvaluatorServiceGetEvaluatorArgs) FastReadField1(buf []byte) (int, erro return offset, nil } -func (p *EvaluatorServiceGetEvaluatorArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceGetEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -12979,7 +18496,7 @@ func (p *EvaluatorServiceGetEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift. return offset } -func (p *EvaluatorServiceGetEvaluatorArgs) BLength() int { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -12988,29 +18505,29 @@ func (p *EvaluatorServiceGetEvaluatorArgs) BLength() int { return l } -func (p *EvaluatorServiceGetEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceGetEvaluatorArgs) field1Length() int { +func (p *EvaluatorServiceGetEvaluatorVersionArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.Request.BLength() return l } -func (p *EvaluatorServiceGetEvaluatorArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceGetEvaluatorArgs) +func (p *EvaluatorServiceGetEvaluatorVersionArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetEvaluatorVersionArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *GetEvaluatorRequest + var _request *GetEvaluatorVersionRequest if src.Request != nil { - _request = &GetEvaluatorRequest{} + _request = &GetEvaluatorVersionRequest{} if err := _request.DeepCopy(src.Request); err != nil { return err } @@ -13020,7 +18537,7 @@ func (p *EvaluatorServiceGetEvaluatorArgs) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceGetEvaluatorResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceGetEvaluatorVersionResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13064,14 +18581,14 @@ func (p *EvaluatorServiceGetEvaluatorResult) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorVersionResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceGetEvaluatorResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceGetEvaluatorVersionResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewGetEvaluatorResponse() + _field := NewGetEvaluatorVersionResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -13081,11 +18598,11 @@ func (p *EvaluatorServiceGetEvaluatorResult) FastReadField0(buf []byte) (int, er return offset, nil } -func (p *EvaluatorServiceGetEvaluatorResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceGetEvaluatorVersionResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceGetEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetEvaluatorVersionResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -13094,7 +18611,7 @@ func (p *EvaluatorServiceGetEvaluatorResult) FastWriteNocopy(buf []byte, w thrif return offset } -func (p *EvaluatorServiceGetEvaluatorResult) BLength() int { +func (p *EvaluatorServiceGetEvaluatorVersionResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -13103,7 +18620,7 @@ func (p *EvaluatorServiceGetEvaluatorResult) BLength() int { return l } -func (p *EvaluatorServiceGetEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetEvaluatorVersionResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -13112,7 +18629,7 @@ func (p *EvaluatorServiceGetEvaluatorResult) fastWriteField0(buf []byte, w thrif return offset } -func (p *EvaluatorServiceGetEvaluatorResult) field0Length() int { +func (p *EvaluatorServiceGetEvaluatorVersionResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -13121,15 +18638,15 @@ func (p *EvaluatorServiceGetEvaluatorResult) field0Length() int { return l } -func (p *EvaluatorServiceGetEvaluatorResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceGetEvaluatorResult) +func (p *EvaluatorServiceGetEvaluatorVersionResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetEvaluatorVersionResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *GetEvaluatorResponse + var _success *GetEvaluatorVersionResponse if src.Success != nil { - _success = &GetEvaluatorResponse{} + _success = &GetEvaluatorVersionResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -13139,7 +18656,7 @@ func (p *EvaluatorServiceGetEvaluatorResult) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceCreateEvaluatorArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13183,14 +18700,14 @@ func (p *EvaluatorServiceCreateEvaluatorArgs) FastRead(buf []byte) (int, error) ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceCreateEvaluatorArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewCreateEvaluatorRequest() + _field := NewBatchGetEvaluatorVersionsRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -13200,11 +18717,11 @@ func (p *EvaluatorServiceCreateEvaluatorArgs) FastReadField1(buf []byte) (int, e return offset, nil } -func (p *EvaluatorServiceCreateEvaluatorArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceCreateEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -13213,7 +18730,7 @@ func (p *EvaluatorServiceCreateEvaluatorArgs) FastWriteNocopy(buf []byte, w thri return offset } -func (p *EvaluatorServiceCreateEvaluatorArgs) BLength() int { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -13222,29 +18739,29 @@ func (p *EvaluatorServiceCreateEvaluatorArgs) BLength() int { return l } -func (p *EvaluatorServiceCreateEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceCreateEvaluatorArgs) field1Length() int { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.Request.BLength() return l } -func (p *EvaluatorServiceCreateEvaluatorArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceCreateEvaluatorArgs) +func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceBatchGetEvaluatorVersionsArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *CreateEvaluatorRequest + var _request *BatchGetEvaluatorVersionsRequest if src.Request != nil { - _request = &CreateEvaluatorRequest{} + _request = &BatchGetEvaluatorVersionsRequest{} if err := _request.DeepCopy(src.Request); err != nil { return err } @@ -13254,7 +18771,7 @@ func (p *EvaluatorServiceCreateEvaluatorArgs) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceCreateEvaluatorResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13298,14 +18815,14 @@ func (p *EvaluatorServiceCreateEvaluatorResult) FastRead(buf []byte) (int, error ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceCreateEvaluatorResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewCreateEvaluatorResponse() + _field := NewBatchGetEvaluatorVersionsResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -13315,11 +18832,11 @@ func (p *EvaluatorServiceCreateEvaluatorResult) FastReadField0(buf []byte) (int, return offset, nil } -func (p *EvaluatorServiceCreateEvaluatorResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceCreateEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -13328,7 +18845,7 @@ func (p *EvaluatorServiceCreateEvaluatorResult) FastWriteNocopy(buf []byte, w th return offset } -func (p *EvaluatorServiceCreateEvaluatorResult) BLength() int { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -13337,7 +18854,7 @@ func (p *EvaluatorServiceCreateEvaluatorResult) BLength() int { return l } -func (p *EvaluatorServiceCreateEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -13346,7 +18863,7 @@ func (p *EvaluatorServiceCreateEvaluatorResult) fastWriteField0(buf []byte, w th return offset } -func (p *EvaluatorServiceCreateEvaluatorResult) field0Length() int { +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -13355,15 +18872,15 @@ func (p *EvaluatorServiceCreateEvaluatorResult) field0Length() int { return l } -func (p *EvaluatorServiceCreateEvaluatorResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceCreateEvaluatorResult) +func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceBatchGetEvaluatorVersionsResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *CreateEvaluatorResponse + var _success *BatchGetEvaluatorVersionsResponse if src.Success != nil { - _success = &CreateEvaluatorResponse{} + _success = &BatchGetEvaluatorVersionsResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -13373,7 +18890,7 @@ func (p *EvaluatorServiceCreateEvaluatorResult) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceUpdateEvaluatorArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13417,14 +18934,14 @@ func (p *EvaluatorServiceUpdateEvaluatorArgs) FastRead(buf []byte) (int, error) ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceUpdateEvaluatorArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewUpdateEvaluatorRequest() + _field := NewSubmitEvaluatorVersionRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -13434,11 +18951,11 @@ func (p *EvaluatorServiceUpdateEvaluatorArgs) FastReadField1(buf []byte) (int, e return offset, nil } -func (p *EvaluatorServiceUpdateEvaluatorArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceUpdateEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -13447,7 +18964,7 @@ func (p *EvaluatorServiceUpdateEvaluatorArgs) FastWriteNocopy(buf []byte, w thri return offset } -func (p *EvaluatorServiceUpdateEvaluatorArgs) BLength() int { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -13456,29 +18973,29 @@ func (p *EvaluatorServiceUpdateEvaluatorArgs) BLength() int { return l } -func (p *EvaluatorServiceUpdateEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceUpdateEvaluatorArgs) field1Length() int { +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.Request.BLength() return l } -func (p *EvaluatorServiceUpdateEvaluatorArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceUpdateEvaluatorArgs) +func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceSubmitEvaluatorVersionArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *UpdateEvaluatorRequest + var _request *SubmitEvaluatorVersionRequest if src.Request != nil { - _request = &UpdateEvaluatorRequest{} + _request = &SubmitEvaluatorVersionRequest{} if err := _request.DeepCopy(src.Request); err != nil { return err } @@ -13488,7 +19005,7 @@ func (p *EvaluatorServiceUpdateEvaluatorArgs) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceUpdateEvaluatorResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13532,14 +19049,14 @@ func (p *EvaluatorServiceUpdateEvaluatorResult) FastRead(buf []byte) (int, error ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceUpdateEvaluatorResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewUpdateEvaluatorResponse() + _field := NewSubmitEvaluatorVersionResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -13549,11 +19066,11 @@ func (p *EvaluatorServiceUpdateEvaluatorResult) FastReadField0(buf []byte) (int, return offset, nil } -func (p *EvaluatorServiceUpdateEvaluatorResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceUpdateEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -13562,7 +19079,7 @@ func (p *EvaluatorServiceUpdateEvaluatorResult) FastWriteNocopy(buf []byte, w th return offset } -func (p *EvaluatorServiceUpdateEvaluatorResult) BLength() int { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -13571,7 +19088,7 @@ func (p *EvaluatorServiceUpdateEvaluatorResult) BLength() int { return l } -func (p *EvaluatorServiceUpdateEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -13580,7 +19097,7 @@ func (p *EvaluatorServiceUpdateEvaluatorResult) fastWriteField0(buf []byte, w th return offset } -func (p *EvaluatorServiceUpdateEvaluatorResult) field0Length() int { +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -13589,15 +19106,15 @@ func (p *EvaluatorServiceUpdateEvaluatorResult) field0Length() int { return l } -func (p *EvaluatorServiceUpdateEvaluatorResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceUpdateEvaluatorResult) +func (p *EvaluatorServiceSubmitEvaluatorVersionResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceSubmitEvaluatorVersionResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *UpdateEvaluatorResponse + var _success *SubmitEvaluatorVersionResponse if src.Success != nil { - _success = &UpdateEvaluatorResponse{} + _success = &SubmitEvaluatorVersionResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -13607,7 +19124,7 @@ func (p *EvaluatorServiceUpdateEvaluatorResult) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceListTemplatesArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13651,14 +19168,14 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastRead(buf []byte) (int, er ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceListTemplatesArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewUpdateEvaluatorDraftRequest() + _field := NewListTemplatesRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -13668,11 +19185,11 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastReadField1(buf []byte) (i return offset, nil } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceListTemplatesArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListTemplatesArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -13681,7 +19198,7 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) FastWriteNocopy(buf []byte, w return offset } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) BLength() int { +func (p *EvaluatorServiceListTemplatesArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -13690,29 +19207,29 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) BLength() int { return l } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListTemplatesArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) field1Length() int { +func (p *EvaluatorServiceListTemplatesArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.Request.BLength() return l } -func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceUpdateEvaluatorDraftArgs) +func (p *EvaluatorServiceListTemplatesArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceListTemplatesArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *UpdateEvaluatorDraftRequest + var _request *ListTemplatesRequest if src.Request != nil { - _request = &UpdateEvaluatorDraftRequest{} + _request = &ListTemplatesRequest{} if err := _request.DeepCopy(src.Request); err != nil { return err } @@ -13722,7 +19239,7 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftArgs) DeepCopy(s interface{}) error return nil } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceListTemplatesResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13766,14 +19283,14 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastRead(buf []byte) (int, ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorDraftResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceListTemplatesResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewUpdateEvaluatorDraftResponse() + _field := NewListTemplatesResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -13783,11 +19300,11 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastReadField0(buf []byte) return offset, nil } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceListTemplatesResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListTemplatesResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -13796,7 +19313,7 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftResult) FastWriteNocopy(buf []byte, return offset } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) BLength() int { +func (p *EvaluatorServiceListTemplatesResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -13805,7 +19322,7 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftResult) BLength() int { return l } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListTemplatesResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -13814,7 +19331,7 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftResult) fastWriteField0(buf []byte, return offset } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) field0Length() int { +func (p *EvaluatorServiceListTemplatesResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -13823,15 +19340,15 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftResult) field0Length() int { return l } -func (p *EvaluatorServiceUpdateEvaluatorDraftResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceUpdateEvaluatorDraftResult) +func (p *EvaluatorServiceListTemplatesResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceListTemplatesResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *UpdateEvaluatorDraftResponse + var _success *ListTemplatesResponse if src.Success != nil { - _success = &UpdateEvaluatorDraftResponse{} + _success = &ListTemplatesResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -13841,7 +19358,7 @@ func (p *EvaluatorServiceUpdateEvaluatorDraftResult) DeepCopy(s interface{}) err return nil } -func (p *EvaluatorServiceDeleteEvaluatorArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceGetTemplateInfoArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13885,14 +19402,14 @@ func (p *EvaluatorServiceDeleteEvaluatorArgs) FastRead(buf []byte) (int, error) ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateInfoArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceDeleteEvaluatorArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceGetTemplateInfoArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewDeleteEvaluatorRequest() + _field := NewGetTemplateInfoRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -13902,11 +19419,11 @@ func (p *EvaluatorServiceDeleteEvaluatorArgs) FastReadField1(buf []byte) (int, e return offset, nil } -func (p *EvaluatorServiceDeleteEvaluatorArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceGetTemplateInfoArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceDeleteEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetTemplateInfoArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -13915,7 +19432,7 @@ func (p *EvaluatorServiceDeleteEvaluatorArgs) FastWriteNocopy(buf []byte, w thri return offset } -func (p *EvaluatorServiceDeleteEvaluatorArgs) BLength() int { +func (p *EvaluatorServiceGetTemplateInfoArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -13924,29 +19441,29 @@ func (p *EvaluatorServiceDeleteEvaluatorArgs) BLength() int { return l } -func (p *EvaluatorServiceDeleteEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetTemplateInfoArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceDeleteEvaluatorArgs) field1Length() int { +func (p *EvaluatorServiceGetTemplateInfoArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.Request.BLength() return l } -func (p *EvaluatorServiceDeleteEvaluatorArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceDeleteEvaluatorArgs) +func (p *EvaluatorServiceGetTemplateInfoArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetTemplateInfoArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *DeleteEvaluatorRequest + var _request *GetTemplateInfoRequest if src.Request != nil { - _request = &DeleteEvaluatorRequest{} + _request = &GetTemplateInfoRequest{} if err := _request.DeepCopy(src.Request); err != nil { return err } @@ -13956,7 +19473,7 @@ func (p *EvaluatorServiceDeleteEvaluatorArgs) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceDeleteEvaluatorResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceGetTemplateInfoResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14000,14 +19517,14 @@ func (p *EvaluatorServiceDeleteEvaluatorResult) FastRead(buf []byte) (int, error ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateInfoResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceDeleteEvaluatorResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceGetTemplateInfoResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewDeleteEvaluatorResponse() + _field := NewGetTemplateInfoResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -14017,11 +19534,11 @@ func (p *EvaluatorServiceDeleteEvaluatorResult) FastReadField0(buf []byte) (int, return offset, nil } -func (p *EvaluatorServiceDeleteEvaluatorResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceGetTemplateInfoResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceDeleteEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetTemplateInfoResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -14030,7 +19547,7 @@ func (p *EvaluatorServiceDeleteEvaluatorResult) FastWriteNocopy(buf []byte, w th return offset } -func (p *EvaluatorServiceDeleteEvaluatorResult) BLength() int { +func (p *EvaluatorServiceGetTemplateInfoResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -14039,7 +19556,7 @@ func (p *EvaluatorServiceDeleteEvaluatorResult) BLength() int { return l } -func (p *EvaluatorServiceDeleteEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetTemplateInfoResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -14048,7 +19565,7 @@ func (p *EvaluatorServiceDeleteEvaluatorResult) fastWriteField0(buf []byte, w th return offset } -func (p *EvaluatorServiceDeleteEvaluatorResult) field0Length() int { +func (p *EvaluatorServiceGetTemplateInfoResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -14057,15 +19574,15 @@ func (p *EvaluatorServiceDeleteEvaluatorResult) field0Length() int { return l } -func (p *EvaluatorServiceDeleteEvaluatorResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceDeleteEvaluatorResult) +func (p *EvaluatorServiceGetTemplateInfoResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetTemplateInfoResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *DeleteEvaluatorResponse + var _success *GetTemplateInfoResponse if src.Success != nil { - _success = &DeleteEvaluatorResponse{} + _success = &GetTemplateInfoResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -14075,7 +19592,7 @@ func (p *EvaluatorServiceDeleteEvaluatorResult) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14119,28 +19636,28 @@ func (p *EvaluatorServiceCheckEvaluatorNameArgs) FastRead(buf []byte) (int, erro ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCheckEvaluatorNameArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewCheckEvaluatorNameRequest() + _field := NewGetDefaultPromptEvaluatorToolsRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Request = _field + p.Req = _field return offset, nil } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -14149,7 +19666,7 @@ func (p *EvaluatorServiceCheckEvaluatorNameArgs) FastWriteNocopy(buf []byte, w t return offset } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) BLength() int { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -14158,39 +19675,39 @@ func (p *EvaluatorServiceCheckEvaluatorNameArgs) BLength() int { return l } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Request.FastWriteNocopy(buf[offset:], w) + offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) field1Length() int { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Request.BLength() + l += p.Req.BLength() return l } -func (p *EvaluatorServiceCheckEvaluatorNameArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceCheckEvaluatorNameArgs) +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *CheckEvaluatorNameRequest - if src.Request != nil { - _request = &CheckEvaluatorNameRequest{} - if err := _request.DeepCopy(src.Request); err != nil { + var _req *GetDefaultPromptEvaluatorToolsRequest + if src.Req != nil { + _req = &GetDefaultPromptEvaluatorToolsRequest{} + if err := _req.DeepCopy(src.Req); err != nil { return err } } - p.Request = _request + p.Req = _req return nil } -func (p *EvaluatorServiceCheckEvaluatorNameResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14234,14 +19751,14 @@ func (p *EvaluatorServiceCheckEvaluatorNameResult) FastRead(buf []byte) (int, er ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCheckEvaluatorNameResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceCheckEvaluatorNameResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewCheckEvaluatorNameResponse() + _field := NewGetDefaultPromptEvaluatorToolsResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -14251,11 +19768,11 @@ func (p *EvaluatorServiceCheckEvaluatorNameResult) FastReadField0(buf []byte) (i return offset, nil } -func (p *EvaluatorServiceCheckEvaluatorNameResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceCheckEvaluatorNameResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -14264,7 +19781,7 @@ func (p *EvaluatorServiceCheckEvaluatorNameResult) FastWriteNocopy(buf []byte, w return offset } -func (p *EvaluatorServiceCheckEvaluatorNameResult) BLength() int { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -14273,7 +19790,7 @@ func (p *EvaluatorServiceCheckEvaluatorNameResult) BLength() int { return l } -func (p *EvaluatorServiceCheckEvaluatorNameResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -14282,7 +19799,7 @@ func (p *EvaluatorServiceCheckEvaluatorNameResult) fastWriteField0(buf []byte, w return offset } -func (p *EvaluatorServiceCheckEvaluatorNameResult) field0Length() int { +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -14291,15 +19808,15 @@ func (p *EvaluatorServiceCheckEvaluatorNameResult) field0Length() int { return l } -func (p *EvaluatorServiceCheckEvaluatorNameResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceCheckEvaluatorNameResult) +func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *CheckEvaluatorNameResponse + var _success *GetDefaultPromptEvaluatorToolsResponse if src.Success != nil { - _success = &CheckEvaluatorNameResponse{} + _success = &GetDefaultPromptEvaluatorToolsResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -14309,7 +19826,7 @@ func (p *EvaluatorServiceCheckEvaluatorNameResult) DeepCopy(s interface{}) error return nil } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceRunEvaluatorArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14353,28 +19870,28 @@ func (p *EvaluatorServiceListEvaluatorVersionsArgs) FastRead(buf []byte) (int, e ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorVersionsArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceRunEvaluatorArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceRunEvaluatorArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewListEvaluatorVersionsRequest() + _field := NewRunEvaluatorRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Request = _field + p.Req = _field return offset, nil } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceRunEvaluatorArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceRunEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -14383,7 +19900,7 @@ func (p *EvaluatorServiceListEvaluatorVersionsArgs) FastWriteNocopy(buf []byte, return offset } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) BLength() int { +func (p *EvaluatorServiceRunEvaluatorArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -14392,39 +19909,39 @@ func (p *EvaluatorServiceListEvaluatorVersionsArgs) BLength() int { return l } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceRunEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Request.FastWriteNocopy(buf[offset:], w) + offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) field1Length() int { +func (p *EvaluatorServiceRunEvaluatorArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Request.BLength() + l += p.Req.BLength() return l } -func (p *EvaluatorServiceListEvaluatorVersionsArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceListEvaluatorVersionsArgs) +func (p *EvaluatorServiceRunEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceRunEvaluatorArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *ListEvaluatorVersionsRequest - if src.Request != nil { - _request = &ListEvaluatorVersionsRequest{} - if err := _request.DeepCopy(src.Request); err != nil { + var _req *RunEvaluatorRequest + if src.Req != nil { + _req = &RunEvaluatorRequest{} + if err := _req.DeepCopy(src.Req); err != nil { return err } } - p.Request = _request + p.Req = _req return nil } -func (p *EvaluatorServiceListEvaluatorVersionsResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceRunEvaluatorResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14468,14 +19985,14 @@ func (p *EvaluatorServiceListEvaluatorVersionsResult) FastRead(buf []byte) (int, ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorVersionsResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceRunEvaluatorResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceListEvaluatorVersionsResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceRunEvaluatorResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewListEvaluatorVersionsResponse() + _field := NewRunEvaluatorResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -14485,11 +20002,11 @@ func (p *EvaluatorServiceListEvaluatorVersionsResult) FastReadField0(buf []byte) return offset, nil } -func (p *EvaluatorServiceListEvaluatorVersionsResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceRunEvaluatorResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceListEvaluatorVersionsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceRunEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -14498,7 +20015,7 @@ func (p *EvaluatorServiceListEvaluatorVersionsResult) FastWriteNocopy(buf []byte return offset } -func (p *EvaluatorServiceListEvaluatorVersionsResult) BLength() int { +func (p *EvaluatorServiceRunEvaluatorResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -14507,7 +20024,7 @@ func (p *EvaluatorServiceListEvaluatorVersionsResult) BLength() int { return l } -func (p *EvaluatorServiceListEvaluatorVersionsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceRunEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -14516,7 +20033,7 @@ func (p *EvaluatorServiceListEvaluatorVersionsResult) fastWriteField0(buf []byte return offset } -func (p *EvaluatorServiceListEvaluatorVersionsResult) field0Length() int { +func (p *EvaluatorServiceRunEvaluatorResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -14525,15 +20042,15 @@ func (p *EvaluatorServiceListEvaluatorVersionsResult) field0Length() int { return l } -func (p *EvaluatorServiceListEvaluatorVersionsResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceListEvaluatorVersionsResult) +func (p *EvaluatorServiceRunEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceRunEvaluatorResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *ListEvaluatorVersionsResponse + var _success *RunEvaluatorResponse if src.Success != nil { - _success = &ListEvaluatorVersionsResponse{} + _success = &RunEvaluatorResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -14543,7 +20060,7 @@ func (p *EvaluatorServiceListEvaluatorVersionsResult) DeepCopy(s interface{}) er return nil } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceDebugEvaluatorArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14587,28 +20104,28 @@ func (p *EvaluatorServiceGetEvaluatorVersionArgs) FastRead(buf []byte) (int, err ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorVersionArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugEvaluatorArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceDebugEvaluatorArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewGetEvaluatorVersionRequest() + _field := NewDebugEvaluatorRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Request = _field + p.Req = _field return offset, nil } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceDebugEvaluatorArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDebugEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -14617,7 +20134,7 @@ func (p *EvaluatorServiceGetEvaluatorVersionArgs) FastWriteNocopy(buf []byte, w return offset } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) BLength() int { +func (p *EvaluatorServiceDebugEvaluatorArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -14626,39 +20143,39 @@ func (p *EvaluatorServiceGetEvaluatorVersionArgs) BLength() int { return l } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDebugEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Request.FastWriteNocopy(buf[offset:], w) + offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) field1Length() int { +func (p *EvaluatorServiceDebugEvaluatorArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Request.BLength() + l += p.Req.BLength() return l } -func (p *EvaluatorServiceGetEvaluatorVersionArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceGetEvaluatorVersionArgs) +func (p *EvaluatorServiceDebugEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceDebugEvaluatorArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *GetEvaluatorVersionRequest - if src.Request != nil { - _request = &GetEvaluatorVersionRequest{} - if err := _request.DeepCopy(src.Request); err != nil { + var _req *DebugEvaluatorRequest + if src.Req != nil { + _req = &DebugEvaluatorRequest{} + if err := _req.DeepCopy(src.Req); err != nil { return err } } - p.Request = _request + p.Req = _req return nil } -func (p *EvaluatorServiceGetEvaluatorVersionResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceDebugEvaluatorResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14702,14 +20219,14 @@ func (p *EvaluatorServiceGetEvaluatorVersionResult) FastRead(buf []byte) (int, e ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorVersionResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugEvaluatorResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceGetEvaluatorVersionResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceDebugEvaluatorResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewGetEvaluatorVersionResponse() + _field := NewDebugEvaluatorResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -14719,11 +20236,11 @@ func (p *EvaluatorServiceGetEvaluatorVersionResult) FastReadField0(buf []byte) ( return offset, nil } -func (p *EvaluatorServiceGetEvaluatorVersionResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceDebugEvaluatorResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceGetEvaluatorVersionResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDebugEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -14732,7 +20249,7 @@ func (p *EvaluatorServiceGetEvaluatorVersionResult) FastWriteNocopy(buf []byte, return offset } -func (p *EvaluatorServiceGetEvaluatorVersionResult) BLength() int { +func (p *EvaluatorServiceDebugEvaluatorResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -14741,7 +20258,7 @@ func (p *EvaluatorServiceGetEvaluatorVersionResult) BLength() int { return l } -func (p *EvaluatorServiceGetEvaluatorVersionResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDebugEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -14750,7 +20267,7 @@ func (p *EvaluatorServiceGetEvaluatorVersionResult) fastWriteField0(buf []byte, return offset } -func (p *EvaluatorServiceGetEvaluatorVersionResult) field0Length() int { +func (p *EvaluatorServiceDebugEvaluatorResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -14759,15 +20276,15 @@ func (p *EvaluatorServiceGetEvaluatorVersionResult) field0Length() int { return l } -func (p *EvaluatorServiceGetEvaluatorVersionResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceGetEvaluatorVersionResult) +func (p *EvaluatorServiceDebugEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceDebugEvaluatorResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *GetEvaluatorVersionResponse + var _success *DebugEvaluatorResponse if src.Success != nil { - _success = &GetEvaluatorVersionResponse{} + _success = &DebugEvaluatorResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -14777,7 +20294,7 @@ func (p *EvaluatorServiceGetEvaluatorVersionResult) DeepCopy(s interface{}) erro return nil } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14821,28 +20338,28 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) FastRead(buf []byte) (in ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchDebugEvaluatorArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewBatchGetEvaluatorVersionsRequest() + _field := NewBatchDebugEvaluatorRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Request = _field + p.Req = _field return offset, nil } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -14851,7 +20368,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) FastWriteNocopy(buf []by return offset } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) BLength() int { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -14860,39 +20377,39 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) BLength() int { return l } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Request.FastWriteNocopy(buf[offset:], w) + offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) field1Length() int { +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Request.BLength() + l += p.Req.BLength() return l } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceBatchGetEvaluatorVersionsArgs) +func (p *EvaluatorServiceBatchDebugEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceBatchDebugEvaluatorArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *BatchGetEvaluatorVersionsRequest - if src.Request != nil { - _request = &BatchGetEvaluatorVersionsRequest{} - if err := _request.DeepCopy(src.Request); err != nil { + var _req *BatchDebugEvaluatorRequest + if src.Req != nil { + _req = &BatchDebugEvaluatorRequest{} + if err := _req.DeepCopy(src.Req); err != nil { return err } } - p.Request = _request + p.Req = _req return nil } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14936,14 +20453,14 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastRead(buf []byte) ( ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorVersionsResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchDebugEvaluatorResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewBatchGetEvaluatorVersionsResponse() + _field := NewBatchDebugEvaluatorResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -14953,11 +20470,11 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastReadField0(buf []b return offset, nil } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -14966,7 +20483,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) FastWriteNocopy(buf [] return offset } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) BLength() int { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -14975,7 +20492,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) BLength() int { return l } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -14984,7 +20501,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) fastWriteField0(buf [] return offset } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) field0Length() int { +func (p *EvaluatorServiceBatchDebugEvaluatorResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -14993,15 +20510,15 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) field0Length() int { return l } -func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceBatchGetEvaluatorVersionsResult) +func (p *EvaluatorServiceBatchDebugEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceBatchDebugEvaluatorResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *BatchGetEvaluatorVersionsResponse + var _success *BatchDebugEvaluatorResponse if src.Success != nil { - _success = &BatchGetEvaluatorVersionsResponse{} + _success = &BatchDebugEvaluatorResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -15011,7 +20528,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorVersionsResult) DeepCopy(s interface{} return nil } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -15055,28 +20572,28 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) FastRead(buf []byte) (int, ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewSubmitEvaluatorVersionRequest() + _field := NewUpdateEvaluatorRecordRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Request = _field + p.Req = _field return offset, nil } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -15085,7 +20602,7 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) FastWriteNocopy(buf []byte, return offset } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) BLength() int { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -15094,39 +20611,39 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) BLength() int { return l } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Request.FastWriteNocopy(buf[offset:], w) + offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) field1Length() int { +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Request.BLength() + l += p.Req.BLength() return l } -func (p *EvaluatorServiceSubmitEvaluatorVersionArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceSubmitEvaluatorVersionArgs) +func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceUpdateEvaluatorRecordArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *SubmitEvaluatorVersionRequest - if src.Request != nil { - _request = &SubmitEvaluatorVersionRequest{} - if err := _request.DeepCopy(src.Request); err != nil { + var _req *UpdateEvaluatorRecordRequest + if src.Req != nil { + _req = &UpdateEvaluatorRecordRequest{} + if err := _req.DeepCopy(src.Req); err != nil { return err } } - p.Request = _request + p.Req = _req return nil } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -15170,14 +20687,14 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastRead(buf []byte) (int ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceSubmitEvaluatorVersionResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewSubmitEvaluatorVersionResponse() + _field := NewUpdateEvaluatorRecordResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -15187,11 +20704,11 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastReadField0(buf []byte return offset, nil } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -15200,7 +20717,7 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionResult) FastWriteNocopy(buf []byt return offset } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) BLength() int { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -15209,7 +20726,7 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionResult) BLength() int { return l } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -15218,7 +20735,7 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionResult) fastWriteField0(buf []byt return offset } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) field0Length() int { +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -15227,15 +20744,15 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionResult) field0Length() int { return l } -func (p *EvaluatorServiceSubmitEvaluatorVersionResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceSubmitEvaluatorVersionResult) +func (p *EvaluatorServiceUpdateEvaluatorRecordResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceUpdateEvaluatorRecordResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *SubmitEvaluatorVersionResponse + var _success *UpdateEvaluatorRecordResponse if src.Success != nil { - _success = &SubmitEvaluatorVersionResponse{} + _success = &UpdateEvaluatorRecordResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -15245,7 +20762,7 @@ func (p *EvaluatorServiceSubmitEvaluatorVersionResult) DeepCopy(s interface{}) e return nil } -func (p *EvaluatorServiceListTemplatesArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -15289,28 +20806,28 @@ func (p *EvaluatorServiceListTemplatesArgs) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorRecordArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceListTemplatesArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewListTemplatesRequest() + _field := NewGetEvaluatorRecordRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Request = _field + p.Req = _field return offset, nil } -func (p *EvaluatorServiceListTemplatesArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceListTemplatesArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -15319,7 +20836,7 @@ func (p *EvaluatorServiceListTemplatesArgs) FastWriteNocopy(buf []byte, w thrift return offset } -func (p *EvaluatorServiceListTemplatesArgs) BLength() int { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -15328,39 +20845,39 @@ func (p *EvaluatorServiceListTemplatesArgs) BLength() int { return l } -func (p *EvaluatorServiceListTemplatesArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Request.FastWriteNocopy(buf[offset:], w) + offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceListTemplatesArgs) field1Length() int { +func (p *EvaluatorServiceGetEvaluatorRecordArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Request.BLength() + l += p.Req.BLength() return l } -func (p *EvaluatorServiceListTemplatesArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceListTemplatesArgs) +func (p *EvaluatorServiceGetEvaluatorRecordArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetEvaluatorRecordArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *ListTemplatesRequest - if src.Request != nil { - _request = &ListTemplatesRequest{} - if err := _request.DeepCopy(src.Request); err != nil { + var _req *GetEvaluatorRecordRequest + if src.Req != nil { + _req = &GetEvaluatorRecordRequest{} + if err := _req.DeepCopy(src.Req); err != nil { return err } } - p.Request = _request + p.Req = _req return nil } -func (p *EvaluatorServiceListTemplatesResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceGetEvaluatorRecordResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -15404,14 +20921,14 @@ func (p *EvaluatorServiceListTemplatesResult) FastRead(buf []byte) (int, error) ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorRecordResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceListTemplatesResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceGetEvaluatorRecordResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewListTemplatesResponse() + _field := NewGetEvaluatorRecordResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -15421,11 +20938,11 @@ func (p *EvaluatorServiceListTemplatesResult) FastReadField0(buf []byte) (int, e return offset, nil } -func (p *EvaluatorServiceListTemplatesResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceGetEvaluatorRecordResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceListTemplatesResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetEvaluatorRecordResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -15434,7 +20951,7 @@ func (p *EvaluatorServiceListTemplatesResult) FastWriteNocopy(buf []byte, w thri return offset } -func (p *EvaluatorServiceListTemplatesResult) BLength() int { +func (p *EvaluatorServiceGetEvaluatorRecordResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -15443,7 +20960,7 @@ func (p *EvaluatorServiceListTemplatesResult) BLength() int { return l } -func (p *EvaluatorServiceListTemplatesResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceGetEvaluatorRecordResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -15452,7 +20969,7 @@ func (p *EvaluatorServiceListTemplatesResult) fastWriteField0(buf []byte, w thri return offset } -func (p *EvaluatorServiceListTemplatesResult) field0Length() int { +func (p *EvaluatorServiceGetEvaluatorRecordResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -15461,15 +20978,15 @@ func (p *EvaluatorServiceListTemplatesResult) field0Length() int { return l } -func (p *EvaluatorServiceListTemplatesResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceListTemplatesResult) +func (p *EvaluatorServiceGetEvaluatorRecordResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetEvaluatorRecordResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *ListTemplatesResponse + var _success *GetEvaluatorRecordResponse if src.Success != nil { - _success = &ListTemplatesResponse{} + _success = &GetEvaluatorRecordResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -15479,7 +20996,7 @@ func (p *EvaluatorServiceListTemplatesResult) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceGetTemplateInfoArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -15523,28 +21040,28 @@ func (p *EvaluatorServiceGetTemplateInfoArgs) FastRead(buf []byte) (int, error) ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateInfoArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceGetTemplateInfoArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewGetTemplateInfoRequest() + _field := NewBatchGetEvaluatorRecordsRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Request = _field + p.Req = _field return offset, nil } -func (p *EvaluatorServiceGetTemplateInfoArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceGetTemplateInfoArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -15553,7 +21070,7 @@ func (p *EvaluatorServiceGetTemplateInfoArgs) FastWriteNocopy(buf []byte, w thri return offset } -func (p *EvaluatorServiceGetTemplateInfoArgs) BLength() int { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -15562,39 +21079,39 @@ func (p *EvaluatorServiceGetTemplateInfoArgs) BLength() int { return l } -func (p *EvaluatorServiceGetTemplateInfoArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Request.FastWriteNocopy(buf[offset:], w) + offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceGetTemplateInfoArgs) field1Length() int { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Request.BLength() + l += p.Req.BLength() return l } -func (p *EvaluatorServiceGetTemplateInfoArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceGetTemplateInfoArgs) +func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceBatchGetEvaluatorRecordsArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *GetTemplateInfoRequest - if src.Request != nil { - _request = &GetTemplateInfoRequest{} - if err := _request.DeepCopy(src.Request); err != nil { + var _req *BatchGetEvaluatorRecordsRequest + if src.Req != nil { + _req = &BatchGetEvaluatorRecordsRequest{} + if err := _req.DeepCopy(src.Req); err != nil { return err } } - p.Request = _request + p.Req = _req return nil } -func (p *EvaluatorServiceGetTemplateInfoResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -15638,14 +21155,14 @@ func (p *EvaluatorServiceGetTemplateInfoResult) FastRead(buf []byte) (int, error ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateInfoResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceGetTemplateInfoResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewGetTemplateInfoResponse() + _field := NewBatchGetEvaluatorRecordsResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -15655,11 +21172,11 @@ func (p *EvaluatorServiceGetTemplateInfoResult) FastReadField0(buf []byte) (int, return offset, nil } -func (p *EvaluatorServiceGetTemplateInfoResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceGetTemplateInfoResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -15668,7 +21185,7 @@ func (p *EvaluatorServiceGetTemplateInfoResult) FastWriteNocopy(buf []byte, w th return offset } -func (p *EvaluatorServiceGetTemplateInfoResult) BLength() int { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -15677,7 +21194,7 @@ func (p *EvaluatorServiceGetTemplateInfoResult) BLength() int { return l } -func (p *EvaluatorServiceGetTemplateInfoResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -15686,7 +21203,7 @@ func (p *EvaluatorServiceGetTemplateInfoResult) fastWriteField0(buf []byte, w th return offset } -func (p *EvaluatorServiceGetTemplateInfoResult) field0Length() int { +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -15695,15 +21212,15 @@ func (p *EvaluatorServiceGetTemplateInfoResult) field0Length() int { return l } -func (p *EvaluatorServiceGetTemplateInfoResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceGetTemplateInfoResult) +func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceBatchGetEvaluatorRecordsResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *GetTemplateInfoResponse + var _success *BatchGetEvaluatorRecordsResponse if src.Success != nil { - _success = &GetTemplateInfoResponse{} + _success = &BatchGetEvaluatorRecordsResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -15713,7 +21230,7 @@ func (p *EvaluatorServiceGetTemplateInfoResult) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceValidateEvaluatorArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -15757,28 +21274,28 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) FastRead(buf []byte ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceValidateEvaluatorArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceValidateEvaluatorArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewGetDefaultPromptEvaluatorToolsRequest() + _field := NewValidateEvaluatorRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Req = _field + p.Request = _field return offset, nil } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceValidateEvaluatorArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceValidateEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -15787,7 +21304,7 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) FastWriteNocopy(buf return offset } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) BLength() int { +func (p *EvaluatorServiceValidateEvaluatorArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -15796,39 +21313,39 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) BLength() int { return l } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceValidateEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Req.FastWriteNocopy(buf[offset:], w) + offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) field1Length() int { +func (p *EvaluatorServiceValidateEvaluatorArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Req.BLength() + l += p.Request.BLength() return l } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceGetDefaultPromptEvaluatorToolsArgs) +func (p *EvaluatorServiceValidateEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceValidateEvaluatorArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _req *GetDefaultPromptEvaluatorToolsRequest - if src.Req != nil { - _req = &GetDefaultPromptEvaluatorToolsRequest{} - if err := _req.DeepCopy(src.Req); err != nil { + var _request *ValidateEvaluatorRequest + if src.Request != nil { + _request = &ValidateEvaluatorRequest{} + if err := _request.DeepCopy(src.Request); err != nil { return err } } - p.Req = _req + p.Request = _request return nil } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceValidateEvaluatorResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -15872,14 +21389,14 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastRead(buf []by ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetDefaultPromptEvaluatorToolsResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceValidateEvaluatorResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceValidateEvaluatorResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewGetDefaultPromptEvaluatorToolsResponse() + _field := NewValidateEvaluatorResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -15889,11 +21406,11 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastReadField0(bu return offset, nil } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceValidateEvaluatorResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceValidateEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -15902,7 +21419,7 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) FastWriteNocopy(b return offset } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) BLength() int { +func (p *EvaluatorServiceValidateEvaluatorResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -15911,7 +21428,7 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) BLength() int { return l } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceValidateEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -15920,7 +21437,7 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) fastWriteField0(b return offset } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) field0Length() int { +func (p *EvaluatorServiceValidateEvaluatorResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -15929,15 +21446,15 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) field0Length() in return l } -func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) +func (p *EvaluatorServiceValidateEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceValidateEvaluatorResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *GetDefaultPromptEvaluatorToolsResponse + var _success *ValidateEvaluatorResponse if src.Success != nil { - _success = &GetDefaultPromptEvaluatorToolsResponse{} + _success = &ValidateEvaluatorResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -15947,7 +21464,7 @@ func (p *EvaluatorServiceGetDefaultPromptEvaluatorToolsResult) DeepCopy(s interf return nil } -func (p *EvaluatorServiceRunEvaluatorArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceListTemplatesV2Args) FastRead(buf []byte) (int, error) { var err error var offset int @@ -15991,28 +21508,28 @@ func (p *EvaluatorServiceRunEvaluatorArgs) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceRunEvaluatorArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesV2Args[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceRunEvaluatorArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceListTemplatesV2Args) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewRunEvaluatorRequest() + _field := NewListTemplatesV2Request() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Req = _field + p.Request = _field return offset, nil } -func (p *EvaluatorServiceRunEvaluatorArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceListTemplatesV2Args) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceRunEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListTemplatesV2Args) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -16021,7 +21538,7 @@ func (p *EvaluatorServiceRunEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift. return offset } -func (p *EvaluatorServiceRunEvaluatorArgs) BLength() int { +func (p *EvaluatorServiceListTemplatesV2Args) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -16030,39 +21547,39 @@ func (p *EvaluatorServiceRunEvaluatorArgs) BLength() int { return l } -func (p *EvaluatorServiceRunEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListTemplatesV2Args) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Req.FastWriteNocopy(buf[offset:], w) + offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceRunEvaluatorArgs) field1Length() int { +func (p *EvaluatorServiceListTemplatesV2Args) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Req.BLength() + l += p.Request.BLength() return l } -func (p *EvaluatorServiceRunEvaluatorArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceRunEvaluatorArgs) +func (p *EvaluatorServiceListTemplatesV2Args) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceListTemplatesV2Args) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _req *RunEvaluatorRequest - if src.Req != nil { - _req = &RunEvaluatorRequest{} - if err := _req.DeepCopy(src.Req); err != nil { + var _request *ListTemplatesV2Request + if src.Request != nil { + _request = &ListTemplatesV2Request{} + if err := _request.DeepCopy(src.Request); err != nil { return err } } - p.Req = _req + p.Request = _request return nil } -func (p *EvaluatorServiceRunEvaluatorResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceListTemplatesV2Result) FastRead(buf []byte) (int, error) { var err error var offset int @@ -16106,14 +21623,14 @@ func (p *EvaluatorServiceRunEvaluatorResult) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceRunEvaluatorResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListTemplatesV2Result[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceRunEvaluatorResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceListTemplatesV2Result) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewRunEvaluatorResponse() + _field := NewListTemplatesV2Response() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -16123,11 +21640,11 @@ func (p *EvaluatorServiceRunEvaluatorResult) FastReadField0(buf []byte) (int, er return offset, nil } -func (p *EvaluatorServiceRunEvaluatorResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceListTemplatesV2Result) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceRunEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListTemplatesV2Result) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -16136,7 +21653,7 @@ func (p *EvaluatorServiceRunEvaluatorResult) FastWriteNocopy(buf []byte, w thrif return offset } -func (p *EvaluatorServiceRunEvaluatorResult) BLength() int { +func (p *EvaluatorServiceListTemplatesV2Result) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -16145,7 +21662,7 @@ func (p *EvaluatorServiceRunEvaluatorResult) BLength() int { return l } -func (p *EvaluatorServiceRunEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListTemplatesV2Result) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -16154,7 +21671,7 @@ func (p *EvaluatorServiceRunEvaluatorResult) fastWriteField0(buf []byte, w thrif return offset } -func (p *EvaluatorServiceRunEvaluatorResult) field0Length() int { +func (p *EvaluatorServiceListTemplatesV2Result) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -16163,15 +21680,15 @@ func (p *EvaluatorServiceRunEvaluatorResult) field0Length() int { return l } -func (p *EvaluatorServiceRunEvaluatorResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceRunEvaluatorResult) +func (p *EvaluatorServiceListTemplatesV2Result) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceListTemplatesV2Result) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *RunEvaluatorResponse + var _success *ListTemplatesV2Response if src.Success != nil { - _success = &RunEvaluatorResponse{} + _success = &ListTemplatesV2Response{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -16181,7 +21698,7 @@ func (p *EvaluatorServiceRunEvaluatorResult) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceDebugEvaluatorArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -16225,28 +21742,28 @@ func (p *EvaluatorServiceDebugEvaluatorArgs) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugEvaluatorArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorTemplateArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceDebugEvaluatorArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewDebugEvaluatorRequest() + _field := NewCreateEvaluatorTemplateRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Req = _field + p.Request = _field return offset, nil } -func (p *EvaluatorServiceDebugEvaluatorArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceDebugEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -16255,7 +21772,7 @@ func (p *EvaluatorServiceDebugEvaluatorArgs) FastWriteNocopy(buf []byte, w thrif return offset } -func (p *EvaluatorServiceDebugEvaluatorArgs) BLength() int { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -16264,39 +21781,39 @@ func (p *EvaluatorServiceDebugEvaluatorArgs) BLength() int { return l } -func (p *EvaluatorServiceDebugEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Req.FastWriteNocopy(buf[offset:], w) + offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceDebugEvaluatorArgs) field1Length() int { +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Req.BLength() + l += p.Request.BLength() return l } -func (p *EvaluatorServiceDebugEvaluatorArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceDebugEvaluatorArgs) +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceCreateEvaluatorTemplateArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _req *DebugEvaluatorRequest - if src.Req != nil { - _req = &DebugEvaluatorRequest{} - if err := _req.DeepCopy(src.Req); err != nil { + var _request *CreateEvaluatorTemplateRequest + if src.Request != nil { + _request = &CreateEvaluatorTemplateRequest{} + if err := _request.DeepCopy(src.Request); err != nil { return err } } - p.Req = _req + p.Request = _request return nil } -func (p *EvaluatorServiceDebugEvaluatorResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -16340,14 +21857,14 @@ func (p *EvaluatorServiceDebugEvaluatorResult) FastRead(buf []byte) (int, error) ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugEvaluatorResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceCreateEvaluatorTemplateResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceDebugEvaluatorResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewDebugEvaluatorResponse() + _field := NewCreateEvaluatorTemplateResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -16357,11 +21874,11 @@ func (p *EvaluatorServiceDebugEvaluatorResult) FastReadField0(buf []byte) (int, return offset, nil } -func (p *EvaluatorServiceDebugEvaluatorResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceDebugEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -16370,7 +21887,7 @@ func (p *EvaluatorServiceDebugEvaluatorResult) FastWriteNocopy(buf []byte, w thr return offset } -func (p *EvaluatorServiceDebugEvaluatorResult) BLength() int { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -16379,7 +21896,7 @@ func (p *EvaluatorServiceDebugEvaluatorResult) BLength() int { return l } -func (p *EvaluatorServiceDebugEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -16388,7 +21905,7 @@ func (p *EvaluatorServiceDebugEvaluatorResult) fastWriteField0(buf []byte, w thr return offset } -func (p *EvaluatorServiceDebugEvaluatorResult) field0Length() int { +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -16397,15 +21914,15 @@ func (p *EvaluatorServiceDebugEvaluatorResult) field0Length() int { return l } -func (p *EvaluatorServiceDebugEvaluatorResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceDebugEvaluatorResult) +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceCreateEvaluatorTemplateResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *DebugEvaluatorResponse + var _success *CreateEvaluatorTemplateResponse if src.Success != nil { - _success = &DebugEvaluatorResponse{} + _success = &CreateEvaluatorTemplateResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -16415,7 +21932,7 @@ func (p *EvaluatorServiceDebugEvaluatorResult) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -16459,28 +21976,28 @@ func (p *EvaluatorServiceBatchDebugEvaluatorArgs) FastRead(buf []byte) (int, err ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchDebugEvaluatorArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorTemplateArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewBatchDebugEvaluatorRequest() + _field := NewUpdateEvaluatorTemplateRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Req = _field + p.Request = _field return offset, nil } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -16489,7 +22006,7 @@ func (p *EvaluatorServiceBatchDebugEvaluatorArgs) FastWriteNocopy(buf []byte, w return offset } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) BLength() int { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -16498,39 +22015,39 @@ func (p *EvaluatorServiceBatchDebugEvaluatorArgs) BLength() int { return l } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Req.FastWriteNocopy(buf[offset:], w) + offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) field1Length() int { +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Req.BLength() + l += p.Request.BLength() return l } -func (p *EvaluatorServiceBatchDebugEvaluatorArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceBatchDebugEvaluatorArgs) +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceUpdateEvaluatorTemplateArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _req *BatchDebugEvaluatorRequest - if src.Req != nil { - _req = &BatchDebugEvaluatorRequest{} - if err := _req.DeepCopy(src.Req); err != nil { + var _request *UpdateEvaluatorTemplateRequest + if src.Request != nil { + _request = &UpdateEvaluatorTemplateRequest{} + if err := _request.DeepCopy(src.Request); err != nil { return err } } - p.Req = _req + p.Request = _request return nil } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -16574,14 +22091,14 @@ func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastRead(buf []byte) (int, e ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchDebugEvaluatorResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorTemplateResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewBatchDebugEvaluatorResponse() + _field := NewUpdateEvaluatorTemplateResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -16591,11 +22108,11 @@ func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastReadField0(buf []byte) ( return offset, nil } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -16604,7 +22121,7 @@ func (p *EvaluatorServiceBatchDebugEvaluatorResult) FastWriteNocopy(buf []byte, return offset } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) BLength() int { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -16613,7 +22130,7 @@ func (p *EvaluatorServiceBatchDebugEvaluatorResult) BLength() int { return l } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -16622,7 +22139,7 @@ func (p *EvaluatorServiceBatchDebugEvaluatorResult) fastWriteField0(buf []byte, return offset } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) field0Length() int { +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -16631,15 +22148,15 @@ func (p *EvaluatorServiceBatchDebugEvaluatorResult) field0Length() int { return l } -func (p *EvaluatorServiceBatchDebugEvaluatorResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceBatchDebugEvaluatorResult) +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceUpdateEvaluatorTemplateResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *BatchDebugEvaluatorResponse + var _success *UpdateEvaluatorTemplateResponse if src.Success != nil { - _success = &BatchDebugEvaluatorResponse{} + _success = &UpdateEvaluatorTemplateResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -16649,7 +22166,7 @@ func (p *EvaluatorServiceBatchDebugEvaluatorResult) DeepCopy(s interface{}) erro return nil } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -16693,28 +22210,28 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) FastRead(buf []byte) (int, e ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorTemplateArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewUpdateEvaluatorRecordRequest() + _field := NewDeleteEvaluatorTemplateRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Req = _field + p.Request = _field return offset, nil } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -16723,7 +22240,7 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) FastWriteNocopy(buf []byte, return offset } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) BLength() int { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -16732,39 +22249,39 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) BLength() int { return l } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Req.FastWriteNocopy(buf[offset:], w) + offset += p.Request.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) field1Length() int { +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Req.BLength() + l += p.Request.BLength() return l } -func (p *EvaluatorServiceUpdateEvaluatorRecordArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceUpdateEvaluatorRecordArgs) +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceDeleteEvaluatorTemplateArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _req *UpdateEvaluatorRecordRequest - if src.Req != nil { - _req = &UpdateEvaluatorRecordRequest{} - if err := _req.DeepCopy(src.Req); err != nil { + var _request *DeleteEvaluatorTemplateRequest + if src.Request != nil { + _request = &DeleteEvaluatorTemplateRequest{} + if err := _request.DeepCopy(src.Request); err != nil { return err } } - p.Req = _req + p.Request = _request return nil } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -16808,14 +22325,14 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastRead(buf []byte) (int, ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateEvaluatorRecordResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDeleteEvaluatorTemplateResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewUpdateEvaluatorRecordResponse() + _field := NewDeleteEvaluatorTemplateResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -16825,11 +22342,11 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastReadField0(buf []byte) return offset, nil } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -16838,7 +22355,7 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordResult) FastWriteNocopy(buf []byte return offset } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) BLength() int { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -16847,7 +22364,7 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordResult) BLength() int { return l } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -16856,7 +22373,7 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordResult) fastWriteField0(buf []byte return offset } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) field0Length() int { +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -16865,15 +22382,15 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordResult) field0Length() int { return l } -func (p *EvaluatorServiceUpdateEvaluatorRecordResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceUpdateEvaluatorRecordResult) +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceDeleteEvaluatorTemplateResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *UpdateEvaluatorRecordResponse + var _success *DeleteEvaluatorTemplateResponse if src.Success != nil { - _success = &UpdateEvaluatorRecordResponse{} + _success = &DeleteEvaluatorTemplateResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -16883,7 +22400,7 @@ func (p *EvaluatorServiceUpdateEvaluatorRecordResult) DeepCopy(s interface{}) er return nil } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -16927,14 +22444,14 @@ func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastRead(buf []byte) (int, erro ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorRecordArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugBuiltinEvaluatorArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewGetEvaluatorRecordRequest() + _field := NewDebugBuiltinEvaluatorRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -16944,11 +22461,11 @@ func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastReadField1(buf []byte) (int return offset, nil } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -16957,7 +22474,7 @@ func (p *EvaluatorServiceGetEvaluatorRecordArgs) FastWriteNocopy(buf []byte, w t return offset } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) BLength() int { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -16966,29 +22483,29 @@ func (p *EvaluatorServiceGetEvaluatorRecordArgs) BLength() int { return l } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) field1Length() int { +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.Req.BLength() return l } -func (p *EvaluatorServiceGetEvaluatorRecordArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceGetEvaluatorRecordArgs) +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceDebugBuiltinEvaluatorArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _req *GetEvaluatorRecordRequest + var _req *DebugBuiltinEvaluatorRequest if src.Req != nil { - _req = &GetEvaluatorRecordRequest{} + _req = &DebugBuiltinEvaluatorRequest{} if err := _req.DeepCopy(src.Req); err != nil { return err } @@ -16998,7 +22515,7 @@ func (p *EvaluatorServiceGetEvaluatorRecordArgs) DeepCopy(s interface{}) error { return nil } -func (p *EvaluatorServiceGetEvaluatorRecordResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -17042,14 +22559,14 @@ func (p *EvaluatorServiceGetEvaluatorRecordResult) FastRead(buf []byte) (int, er ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetEvaluatorRecordResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceDebugBuiltinEvaluatorResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceGetEvaluatorRecordResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewGetEvaluatorRecordResponse() + _field := NewDebugBuiltinEvaluatorResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -17059,11 +22576,11 @@ func (p *EvaluatorServiceGetEvaluatorRecordResult) FastReadField0(buf []byte) (i return offset, nil } -func (p *EvaluatorServiceGetEvaluatorRecordResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceGetEvaluatorRecordResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -17072,7 +22589,7 @@ func (p *EvaluatorServiceGetEvaluatorRecordResult) FastWriteNocopy(buf []byte, w return offset } -func (p *EvaluatorServiceGetEvaluatorRecordResult) BLength() int { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -17081,7 +22598,7 @@ func (p *EvaluatorServiceGetEvaluatorRecordResult) BLength() int { return l } -func (p *EvaluatorServiceGetEvaluatorRecordResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -17090,7 +22607,7 @@ func (p *EvaluatorServiceGetEvaluatorRecordResult) fastWriteField0(buf []byte, w return offset } -func (p *EvaluatorServiceGetEvaluatorRecordResult) field0Length() int { +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -17099,15 +22616,15 @@ func (p *EvaluatorServiceGetEvaluatorRecordResult) field0Length() int { return l } -func (p *EvaluatorServiceGetEvaluatorRecordResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceGetEvaluatorRecordResult) +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceDebugBuiltinEvaluatorResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *GetEvaluatorRecordResponse + var _success *DebugBuiltinEvaluatorResponse if src.Success != nil { - _success = &GetEvaluatorRecordResponse{} + _success = &DebugBuiltinEvaluatorResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -17117,7 +22634,7 @@ func (p *EvaluatorServiceGetEvaluatorRecordResult) DeepCopy(s interface{}) error return nil } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -17161,14 +22678,14 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastRead(buf []byte) (int ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewBatchGetEvaluatorRecordsRequest() + _field := NewPublishBuiltinEvaluatorRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -17178,11 +22695,11 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastReadField1(buf []byte return offset, nil } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -17191,7 +22708,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) FastWriteNocopy(buf []byt return offset } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) BLength() int { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -17200,29 +22717,29 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) BLength() int { return l } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) field1Length() int { +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.Req.BLength() return l } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceBatchGetEvaluatorRecordsArgs) +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServicePublishBuiltinEvaluatorArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _req *BatchGetEvaluatorRecordsRequest + var _req *PublishBuiltinEvaluatorRequest if src.Req != nil { - _req = &BatchGetEvaluatorRecordsRequest{} + _req = &PublishBuiltinEvaluatorRequest{} if err := _req.DeepCopy(src.Req); err != nil { return err } @@ -17232,7 +22749,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsArgs) DeepCopy(s interface{}) e return nil } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -17276,14 +22793,14 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastRead(buf []byte) (i ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceBatchGetEvaluatorRecordsResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewBatchGetEvaluatorRecordsResponse() + _field := NewPublishBuiltinEvaluatorResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -17293,11 +22810,11 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastReadField0(buf []by return offset, nil } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastWrite(buf []byte) int { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -17306,7 +22823,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) FastWriteNocopy(buf []b return offset } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) BLength() int { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -17315,7 +22832,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) BLength() int { return l } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -17324,7 +22841,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) fastWriteField0(buf []b return offset } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) field0Length() int { +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -17333,15 +22850,15 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) field0Length() int { return l } -func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceBatchGetEvaluatorRecordsResult) +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServicePublishBuiltinEvaluatorResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *BatchGetEvaluatorRecordsResponse + var _success *PublishBuiltinEvaluatorResponse if src.Success != nil { - _success = &BatchGetEvaluatorRecordsResponse{} + _success = &PublishBuiltinEvaluatorResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -17351,7 +22868,7 @@ func (p *EvaluatorServiceBatchGetEvaluatorRecordsResult) DeepCopy(s interface{}) return nil } -func (p *EvaluatorServiceValidateEvaluatorArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceListEvaluatorTagsArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -17395,28 +22912,28 @@ func (p *EvaluatorServiceValidateEvaluatorArgs) FastRead(buf []byte) (int, error ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceValidateEvaluatorArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorTagsArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceValidateEvaluatorArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceListEvaluatorTagsArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewValidateEvaluatorRequest() + _field := NewListEvaluatorTagsRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Request = _field + p.Req = _field return offset, nil } -func (p *EvaluatorServiceValidateEvaluatorArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceListEvaluatorTagsArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceValidateEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListEvaluatorTagsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -17425,7 +22942,7 @@ func (p *EvaluatorServiceValidateEvaluatorArgs) FastWriteNocopy(buf []byte, w th return offset } -func (p *EvaluatorServiceValidateEvaluatorArgs) BLength() int { +func (p *EvaluatorServiceListEvaluatorTagsArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -17434,39 +22951,39 @@ func (p *EvaluatorServiceValidateEvaluatorArgs) BLength() int { return l } -func (p *EvaluatorServiceValidateEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListEvaluatorTagsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Request.FastWriteNocopy(buf[offset:], w) + offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServiceValidateEvaluatorArgs) field1Length() int { +func (p *EvaluatorServiceListEvaluatorTagsArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Request.BLength() + l += p.Req.BLength() return l } -func (p *EvaluatorServiceValidateEvaluatorArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceValidateEvaluatorArgs) +func (p *EvaluatorServiceListEvaluatorTagsArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceListEvaluatorTagsArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _request *ValidateEvaluatorRequest - if src.Request != nil { - _request = &ValidateEvaluatorRequest{} - if err := _request.DeepCopy(src.Request); err != nil { + var _req *ListEvaluatorTagsRequest + if src.Req != nil { + _req = &ListEvaluatorTagsRequest{} + if err := _req.DeepCopy(src.Req); err != nil { return err } } - p.Request = _request + p.Req = _req return nil } -func (p *EvaluatorServiceValidateEvaluatorResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceListEvaluatorTagsResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -17510,14 +23027,14 @@ func (p *EvaluatorServiceValidateEvaluatorResult) FastRead(buf []byte) (int, err ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceValidateEvaluatorResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceListEvaluatorTagsResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServiceValidateEvaluatorResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceListEvaluatorTagsResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewValidateEvaluatorResponse() + _field := NewListEvaluatorTagsResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -17527,11 +23044,11 @@ func (p *EvaluatorServiceValidateEvaluatorResult) FastReadField0(buf []byte) (in return offset, nil } -func (p *EvaluatorServiceValidateEvaluatorResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceListEvaluatorTagsResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServiceValidateEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListEvaluatorTagsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -17540,7 +23057,7 @@ func (p *EvaluatorServiceValidateEvaluatorResult) FastWriteNocopy(buf []byte, w return offset } -func (p *EvaluatorServiceValidateEvaluatorResult) BLength() int { +func (p *EvaluatorServiceListEvaluatorTagsResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -17549,7 +23066,7 @@ func (p *EvaluatorServiceValidateEvaluatorResult) BLength() int { return l } -func (p *EvaluatorServiceValidateEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceListEvaluatorTagsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -17558,7 +23075,7 @@ func (p *EvaluatorServiceValidateEvaluatorResult) fastWriteField0(buf []byte, w return offset } -func (p *EvaluatorServiceValidateEvaluatorResult) field0Length() int { +func (p *EvaluatorServiceListEvaluatorTagsResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -17567,15 +23084,15 @@ func (p *EvaluatorServiceValidateEvaluatorResult) field0Length() int { return l } -func (p *EvaluatorServiceValidateEvaluatorResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServiceValidateEvaluatorResult) +func (p *EvaluatorServiceListEvaluatorTagsResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceListEvaluatorTagsResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *ValidateEvaluatorResponse + var _success *ListEvaluatorTagsResponse if src.Success != nil { - _success = &ValidateEvaluatorResponse{} + _success = &ListEvaluatorTagsResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -17760,3 +23277,59 @@ func (p *EvaluatorServiceValidateEvaluatorArgs) GetFirstArgument() interface{} { func (p *EvaluatorServiceValidateEvaluatorResult) GetResult() interface{} { return p.Success } + +func (p *EvaluatorServiceListTemplatesV2Args) GetFirstArgument() interface{} { + return p.Request +} + +func (p *EvaluatorServiceListTemplatesV2Result) GetResult() interface{} { + return p.Success +} + +func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) GetFirstArgument() interface{} { + return p.Request +} + +func (p *EvaluatorServiceCreateEvaluatorTemplateResult) GetResult() interface{} { + return p.Success +} + +func (p *EvaluatorServiceUpdateEvaluatorTemplateArgs) GetFirstArgument() interface{} { + return p.Request +} + +func (p *EvaluatorServiceUpdateEvaluatorTemplateResult) GetResult() interface{} { + return p.Success +} + +func (p *EvaluatorServiceDeleteEvaluatorTemplateArgs) GetFirstArgument() interface{} { + return p.Request +} + +func (p *EvaluatorServiceDeleteEvaluatorTemplateResult) GetResult() interface{} { + return p.Success +} + +func (p *EvaluatorServiceDebugBuiltinEvaluatorArgs) GetFirstArgument() interface{} { + return p.Req +} + +func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) GetResult() interface{} { + return p.Success +} + +func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) GetFirstArgument() interface{} { + return p.Req +} + +func (p *EvaluatorServicePublishBuiltinEvaluatorResult) GetResult() interface{} { + return p.Success +} + +func (p *EvaluatorServiceListEvaluatorTagsArgs) GetFirstArgument() interface{} { + return p.Req +} + +func (p *EvaluatorServiceListEvaluatorTagsResult) GetResult() interface{} { + return p.Success +} diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go index 4aa1803c0..61edcc981 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go @@ -33,6 +33,13 @@ type Client interface { GetEvaluatorRecord(ctx context.Context, req *evaluator.GetEvaluatorRecordRequest, callOptions ...callopt.Option) (r *evaluator.GetEvaluatorRecordResponse, err error) BatchGetEvaluatorRecords(ctx context.Context, req *evaluator.BatchGetEvaluatorRecordsRequest, callOptions ...callopt.Option) (r *evaluator.BatchGetEvaluatorRecordsResponse, err error) ValidateEvaluator(ctx context.Context, request *evaluator.ValidateEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.ValidateEvaluatorResponse, err error) + ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (r *evaluator.ListTemplatesV2Response, err error) + CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) + UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) + DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) + DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) + PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) + ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) } // NewClient creates a client for the service defined in IDL. @@ -173,3 +180,38 @@ func (p *kEvaluatorServiceClient) ValidateEvaluator(ctx context.Context, request ctx = client.NewCtxWithCallOptions(ctx, callOptions) return p.kClient.ValidateEvaluator(ctx, request) } + +func (p *kEvaluatorServiceClient) ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (r *evaluator.ListTemplatesV2Response, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.ListTemplatesV2(ctx, request) +} + +func (p *kEvaluatorServiceClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.CreateEvaluatorTemplate(ctx, request) +} + +func (p *kEvaluatorServiceClient) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.UpdateEvaluatorTemplate(ctx, request) +} + +func (p *kEvaluatorServiceClient) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.DeleteEvaluatorTemplate(ctx, request) +} + +func (p *kEvaluatorServiceClient) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.DebugBuiltinEvaluator(ctx, req) +} + +func (p *kEvaluatorServiceClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.PublishBuiltinEvaluator(ctx, req) +} + +func (p *kEvaluatorServiceClient) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.ListEvaluatorTags(ctx, req) +} diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go index eb1c6cb62..557f92a15 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go @@ -168,6 +168,55 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), + "ListTemplatesV2": kitex.NewMethodInfo( + listTemplatesV2Handler, + newEvaluatorServiceListTemplatesV2Args, + newEvaluatorServiceListTemplatesV2Result, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "CreateEvaluatorTemplate": kitex.NewMethodInfo( + createEvaluatorTemplateHandler, + newEvaluatorServiceCreateEvaluatorTemplateArgs, + newEvaluatorServiceCreateEvaluatorTemplateResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "UpdateEvaluatorTemplate": kitex.NewMethodInfo( + updateEvaluatorTemplateHandler, + newEvaluatorServiceUpdateEvaluatorTemplateArgs, + newEvaluatorServiceUpdateEvaluatorTemplateResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "DeleteEvaluatorTemplate": kitex.NewMethodInfo( + deleteEvaluatorTemplateHandler, + newEvaluatorServiceDeleteEvaluatorTemplateArgs, + newEvaluatorServiceDeleteEvaluatorTemplateResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "DebugBuiltinEvaluator": kitex.NewMethodInfo( + debugBuiltinEvaluatorHandler, + newEvaluatorServiceDebugBuiltinEvaluatorArgs, + newEvaluatorServiceDebugBuiltinEvaluatorResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "PublishBuiltinEvaluator": kitex.NewMethodInfo( + publishBuiltinEvaluatorHandler, + newEvaluatorServicePublishBuiltinEvaluatorArgs, + newEvaluatorServicePublishBuiltinEvaluatorResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), + "ListEvaluatorTags": kitex.NewMethodInfo( + listEvaluatorTagsHandler, + newEvaluatorServiceListEvaluatorTagsArgs, + newEvaluatorServiceListEvaluatorTagsResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), } var ( @@ -619,6 +668,139 @@ func newEvaluatorServiceValidateEvaluatorResult() interface{} { return evaluator.NewEvaluatorServiceValidateEvaluatorResult() } +func listTemplatesV2Handler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceListTemplatesV2Args) + realResult := result.(*evaluator.EvaluatorServiceListTemplatesV2Result) + success, err := handler.(evaluator.EvaluatorService).ListTemplatesV2(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceListTemplatesV2Args() interface{} { + return evaluator.NewEvaluatorServiceListTemplatesV2Args() +} + +func newEvaluatorServiceListTemplatesV2Result() interface{} { + return evaluator.NewEvaluatorServiceListTemplatesV2Result() +} + +func createEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs) + realResult := result.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateResult) + success, err := handler.(evaluator.EvaluatorService).CreateEvaluatorTemplate(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceCreateEvaluatorTemplateArgs() interface{} { + return evaluator.NewEvaluatorServiceCreateEvaluatorTemplateArgs() +} + +func newEvaluatorServiceCreateEvaluatorTemplateResult() interface{} { + return evaluator.NewEvaluatorServiceCreateEvaluatorTemplateResult() +} + +func updateEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceUpdateEvaluatorTemplateArgs) + realResult := result.(*evaluator.EvaluatorServiceUpdateEvaluatorTemplateResult) + success, err := handler.(evaluator.EvaluatorService).UpdateEvaluatorTemplate(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceUpdateEvaluatorTemplateArgs() interface{} { + return evaluator.NewEvaluatorServiceUpdateEvaluatorTemplateArgs() +} + +func newEvaluatorServiceUpdateEvaluatorTemplateResult() interface{} { + return evaluator.NewEvaluatorServiceUpdateEvaluatorTemplateResult() +} + +func deleteEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceDeleteEvaluatorTemplateArgs) + realResult := result.(*evaluator.EvaluatorServiceDeleteEvaluatorTemplateResult) + success, err := handler.(evaluator.EvaluatorService).DeleteEvaluatorTemplate(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceDeleteEvaluatorTemplateArgs() interface{} { + return evaluator.NewEvaluatorServiceDeleteEvaluatorTemplateArgs() +} + +func newEvaluatorServiceDeleteEvaluatorTemplateResult() interface{} { + return evaluator.NewEvaluatorServiceDeleteEvaluatorTemplateResult() +} + +func debugBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceDebugBuiltinEvaluatorArgs) + realResult := result.(*evaluator.EvaluatorServiceDebugBuiltinEvaluatorResult) + success, err := handler.(evaluator.EvaluatorService).DebugBuiltinEvaluator(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceDebugBuiltinEvaluatorArgs() interface{} { + return evaluator.NewEvaluatorServiceDebugBuiltinEvaluatorArgs() +} + +func newEvaluatorServiceDebugBuiltinEvaluatorResult() interface{} { + return evaluator.NewEvaluatorServiceDebugBuiltinEvaluatorResult() +} + +func publishBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs) + realResult := result.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorResult) + success, err := handler.(evaluator.EvaluatorService).PublishBuiltinEvaluator(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServicePublishBuiltinEvaluatorArgs() interface{} { + return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorArgs() +} + +func newEvaluatorServicePublishBuiltinEvaluatorResult() interface{} { + return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorResult() +} + +func listEvaluatorTagsHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceListEvaluatorTagsArgs) + realResult := result.(*evaluator.EvaluatorServiceListEvaluatorTagsResult) + success, err := handler.(evaluator.EvaluatorService).ListEvaluatorTags(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceListEvaluatorTagsArgs() interface{} { + return evaluator.NewEvaluatorServiceListEvaluatorTagsArgs() +} + +func newEvaluatorServiceListEvaluatorTagsResult() interface{} { + return evaluator.NewEvaluatorServiceListEvaluatorTagsResult() +} + type kClient struct { c client.Client sc client.Streaming @@ -850,3 +1032,73 @@ func (p *kClient) ValidateEvaluator(ctx context.Context, request *evaluator.Vali } return _result.GetSuccess(), nil } + +func (p *kClient) ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request) (r *evaluator.ListTemplatesV2Response, err error) { + var _args evaluator.EvaluatorServiceListTemplatesV2Args + _args.Request = request + var _result evaluator.EvaluatorServiceListTemplatesV2Result + if err = p.c.Call(ctx, "ListTemplatesV2", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { + var _args evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs + _args.Request = request + var _result evaluator.EvaluatorServiceCreateEvaluatorTemplateResult + if err = p.c.Call(ctx, "CreateEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) { + var _args evaluator.EvaluatorServiceUpdateEvaluatorTemplateArgs + _args.Request = request + var _result evaluator.EvaluatorServiceUpdateEvaluatorTemplateResult + if err = p.c.Call(ctx, "UpdateEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) { + var _args evaluator.EvaluatorServiceDeleteEvaluatorTemplateArgs + _args.Request = request + var _result evaluator.EvaluatorServiceDeleteEvaluatorTemplateResult + if err = p.c.Call(ctx, "DeleteEvaluatorTemplate", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) { + var _args evaluator.EvaluatorServiceDebugBuiltinEvaluatorArgs + _args.Req = req + var _result evaluator.EvaluatorServiceDebugBuiltinEvaluatorResult + if err = p.c.Call(ctx, "DebugBuiltinEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { + var _args evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs + _args.Req = req + var _result evaluator.EvaluatorServicePublishBuiltinEvaluatorResult + if err = p.c.Call(ctx, "PublishBuiltinEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +func (p *kClient) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest) (r *evaluator.ListEvaluatorTagsResponse, err error) { + var _args evaluator.EvaluatorServiceListEvaluatorTagsArgs + _args.Req = req + var _result evaluator.EvaluatorServiceListEvaluatorTagsResult + if err = p.c.Call(ctx, "ListEvaluatorTags", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} diff --git a/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go b/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go index 6e194449c..22e8466b6 100644 --- a/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go +++ b/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go @@ -496,6 +496,167 @@ func (l *LocalEvaluatorService) ValidateEvaluator(ctx context.Context, request * return result.GetSuccess(), nil } +// ListTemplatesV2 +// 查询评估器模板 +func (l *LocalEvaluatorService) ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (*evaluator.ListTemplatesV2Response, error) { + chain := l.mds(func(ctx context.Context, in, out interface{}) error { + arg := in.(*evaluator.EvaluatorServiceListTemplatesV2Args) + result := out.(*evaluator.EvaluatorServiceListTemplatesV2Result) + resp, err := l.impl.ListTemplatesV2(ctx, arg.Request) + if err != nil { + return err + } + result.SetSuccess(resp) + return nil + }) + + arg := &evaluator.EvaluatorServiceListTemplatesV2Args{Request: request} + result := &evaluator.EvaluatorServiceListTemplatesV2Result{} + ctx = l.injectRPCInfo(ctx, "ListTemplatesV2") + if err := chain(ctx, arg, result); err != nil { + return nil, err + } + return result.GetSuccess(), nil +} + +// CreateEvaluatorTemplate +// 创建评估器模板 +func (l *LocalEvaluatorService) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (*evaluator.CreateEvaluatorTemplateResponse, error) { + chain := l.mds(func(ctx context.Context, in, out interface{}) error { + arg := in.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs) + result := out.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateResult) + resp, err := l.impl.CreateEvaluatorTemplate(ctx, arg.Request) + if err != nil { + return err + } + result.SetSuccess(resp) + return nil + }) + + arg := &evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs{Request: request} + result := &evaluator.EvaluatorServiceCreateEvaluatorTemplateResult{} + ctx = l.injectRPCInfo(ctx, "CreateEvaluatorTemplate") + if err := chain(ctx, arg, result); err != nil { + return nil, err + } + return result.GetSuccess(), nil +} + +// UpdateEvaluatorTemplate +// 更新评估器模板 +func (l *LocalEvaluatorService) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (*evaluator.UpdateEvaluatorTemplateResponse, error) { + chain := l.mds(func(ctx context.Context, in, out interface{}) error { + arg := in.(*evaluator.EvaluatorServiceUpdateEvaluatorTemplateArgs) + result := out.(*evaluator.EvaluatorServiceUpdateEvaluatorTemplateResult) + resp, err := l.impl.UpdateEvaluatorTemplate(ctx, arg.Request) + if err != nil { + return err + } + result.SetSuccess(resp) + return nil + }) + + arg := &evaluator.EvaluatorServiceUpdateEvaluatorTemplateArgs{Request: request} + result := &evaluator.EvaluatorServiceUpdateEvaluatorTemplateResult{} + ctx = l.injectRPCInfo(ctx, "UpdateEvaluatorTemplate") + if err := chain(ctx, arg, result); err != nil { + return nil, err + } + return result.GetSuccess(), nil +} + +// DeleteEvaluatorTemplate +// 删除 +func (l *LocalEvaluatorService) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (*evaluator.DeleteEvaluatorTemplateResponse, error) { + chain := l.mds(func(ctx context.Context, in, out interface{}) error { + arg := in.(*evaluator.EvaluatorServiceDeleteEvaluatorTemplateArgs) + result := out.(*evaluator.EvaluatorServiceDeleteEvaluatorTemplateResult) + resp, err := l.impl.DeleteEvaluatorTemplate(ctx, arg.Request) + if err != nil { + return err + } + result.SetSuccess(resp) + return nil + }) + + arg := &evaluator.EvaluatorServiceDeleteEvaluatorTemplateArgs{Request: request} + result := &evaluator.EvaluatorServiceDeleteEvaluatorTemplateResult{} + ctx = l.injectRPCInfo(ctx, "DeleteEvaluatorTemplate") + if err := chain(ctx, arg, result); err != nil { + return nil, err + } + return result.GetSuccess(), nil +} + +// DebugBuiltinEvaluator +// 调试预置评估器 +func (l *LocalEvaluatorService) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (*evaluator.DebugBuiltinEvaluatorResponse, error) { + chain := l.mds(func(ctx context.Context, in, out interface{}) error { + arg := in.(*evaluator.EvaluatorServiceDebugBuiltinEvaluatorArgs) + result := out.(*evaluator.EvaluatorServiceDebugBuiltinEvaluatorResult) + resp, err := l.impl.DebugBuiltinEvaluator(ctx, arg.Req) + if err != nil { + return err + } + result.SetSuccess(resp) + return nil + }) + + arg := &evaluator.EvaluatorServiceDebugBuiltinEvaluatorArgs{Req: req} + result := &evaluator.EvaluatorServiceDebugBuiltinEvaluatorResult{} + ctx = l.injectRPCInfo(ctx, "DebugBuiltinEvaluator") + if err := chain(ctx, arg, result); err != nil { + return nil, err + } + return result.GetSuccess(), nil +} + +// PublishBuiltinEvaluator +// 发布预置评估器 +func (l *LocalEvaluatorService) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (*evaluator.PublishBuiltinEvaluatorResponse, error) { + chain := l.mds(func(ctx context.Context, in, out interface{}) error { + arg := in.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs) + result := out.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorResult) + resp, err := l.impl.PublishBuiltinEvaluator(ctx, arg.Req) + if err != nil { + return err + } + result.SetSuccess(resp) + return nil + }) + + arg := &evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs{Req: req} + result := &evaluator.EvaluatorServicePublishBuiltinEvaluatorResult{} + ctx = l.injectRPCInfo(ctx, "PublishBuiltinEvaluator") + if err := chain(ctx, arg, result); err != nil { + return nil, err + } + return result.GetSuccess(), nil +} + +// ListEvaluatorTags +// 查询Tag +func (l *LocalEvaluatorService) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (*evaluator.ListEvaluatorTagsResponse, error) { + chain := l.mds(func(ctx context.Context, in, out interface{}) error { + arg := in.(*evaluator.EvaluatorServiceListEvaluatorTagsArgs) + result := out.(*evaluator.EvaluatorServiceListEvaluatorTagsResult) + resp, err := l.impl.ListEvaluatorTags(ctx, arg.Req) + if err != nil { + return err + } + result.SetSuccess(resp) + return nil + }) + + arg := &evaluator.EvaluatorServiceListEvaluatorTagsArgs{Req: req} + result := &evaluator.EvaluatorServiceListEvaluatorTagsResult{} + ctx = l.injectRPCInfo(ctx, "ListEvaluatorTags") + if err := chain(ctx, arg, result); err != nil { + return nil, err + } + return result.GetSuccess(), nil +} + func (l *LocalEvaluatorService) injectRPCInfo(ctx context.Context, method string) context.Context { rpcStats := rpcinfo.AsMutableRPCStats(rpcinfo.NewRPCStats()) ri := rpcinfo.NewRPCInfo( diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go index 6e3090bdb..c9f82104d 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go @@ -18,7 +18,7 @@ import ( func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.Evaluator { // 从DTO转换为DO - evaluatorDO := &evaluatordo.Evaluator{ + evaluatorDO := &evaluatordo.Evaluator{ ID: evaluatorDTO.GetEvaluatorID(), SpaceID: evaluatorDTO.GetWorkspaceID(), Name: evaluatorDTO.GetName(), @@ -26,8 +26,10 @@ func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.E DraftSubmitted: evaluatorDTO.GetDraftSubmitted(), EvaluatorType: evaluatordo.EvaluatorType(evaluatorDTO.GetEvaluatorType()), LatestVersion: evaluatorDTO.GetLatestVersion(), + Builtin: evaluatorDTO.GetBuiltin(), PromptEvaluatorVersion: nil, BaseInfo: commonconvertor.ConvertBaseInfoDTO2DO(evaluatorDTO.GetBaseInfo()), + Tags: ConvertEvaluatorTagsDTO2DO(evaluatorDTO.GetTags()), } if evaluatorDTO.CurrentVersion != nil { switch evaluatorDTO.GetEvaluatorType() { @@ -61,7 +63,9 @@ func ConvertEvaluatorDO2DTO(do *evaluatordo.Evaluator) *evaluatordto.Evaluator { DraftSubmitted: gptr.Of(do.DraftSubmitted), EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType(do.EvaluatorType)), LatestVersion: gptr.Of(do.LatestVersion), + Builtin: gptr.Of(do.Builtin), BaseInfo: commonconvertor.ConvertBaseInfoDO2DTO(do.BaseInfo), + Tags: ConvertEvaluatorTagsDO2DTO(do.Tags), } switch do.EvaluatorType { @@ -307,3 +311,51 @@ func ConvertPromptEvaluatorVersionDO2DTO(do *evaluatordo.PromptEvaluatorVersion) return dto } + +// ConvertEvaluatorTagsDTO2DO 将DTO的Tags转换为DO的Tags +func ConvertEvaluatorTagsDTO2DO(dtoTags map[evaluatordto.EvaluatorTagKey][]string) map[evaluatordo.EvaluatorTagKey][]string { + if dtoTags == nil { + return nil + } + + doTags := make(map[evaluatordo.EvaluatorTagKey][]string) + for dtoKey, values := range dtoTags { + doKey := ConvertEvaluatorTagKeyDTO2DO(dtoKey) + doTags[doKey] = values + } + return doTags +} + +// ConvertEvaluatorTagsDO2DTO 将DO的Tags转换为DTO的Tags +func ConvertEvaluatorTagsDO2DTO(doTags map[evaluatordo.EvaluatorTagKey][]string) map[evaluatordto.EvaluatorTagKey][]string { + if doTags == nil { + return nil + } + + dtoTags := make(map[evaluatordto.EvaluatorTagKey][]string) + for doKey, values := range doTags { + dtoKey := ConvertEvaluatorTagKeyDO2DTO(doKey) + dtoTags[dtoKey] = values + } + return dtoTags +} + +// ConvertEvaluatorTagKeyDO2DTO 将DO的EvaluatorTagKey转换为DTO的EvaluatorTagKey +func ConvertEvaluatorTagKeyDO2DTO(doKey evaluatordo.EvaluatorTagKey) evaluatordto.EvaluatorTagKey { + switch doKey { + case evaluatordo.EvaluatorTagKey_Category: + return evaluatordto.EvaluatorTagKeyCategory + case evaluatordo.EvaluatorTagKey_TargetType: + return evaluatordto.EvaluatorTagKeyTargetType + case evaluatordo.EvaluatorTagKey_Objective: + return evaluatordto.EvaluatorTagKeyObjective + case evaluatordo.EvaluatorTagKey_BusinessScenario: + return evaluatordto.EvaluatorTagKeyBusinessScenario + case evaluatordo.EvaluatorTagKey_BoxType: + return evaluatordto.EvaluatorTagKeyBoxType + case evaluatordo.EvaluatorTagKey_Name: + return evaluatordto.EvaluatorTagKeyName + default: + return evaluatordto.EvaluatorTagKey(doKey) + } +} diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go new file mode 100644 index 000000000..3e030101d --- /dev/null +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go @@ -0,0 +1,128 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package evaluator + +import ( + evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" + evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" +) + +// ConvertEvaluatorTagKeyDTO2DO 将DTO的EvaluatorTagKey转换为DO的EvaluatorTagKey +func ConvertEvaluatorTagKeyDTO2DO(dtoKey evaluatordto.EvaluatorTagKey) evaluatordo.EvaluatorTagKey { + switch dtoKey { + case evaluatordto.EvaluatorTagKeyCategory: + return evaluatordo.EvaluatorTagKey_Category + case evaluatordto.EvaluatorTagKeyTargetType: + return evaluatordo.EvaluatorTagKey_TargetType + case evaluatordto.EvaluatorTagKeyObjective: + return evaluatordo.EvaluatorTagKey_Objective + case evaluatordto.EvaluatorTagKeyBusinessScenario: + return evaluatordo.EvaluatorTagKey_BusinessScenario + case evaluatordto.EvaluatorTagKeyBoxType: + return evaluatordo.EvaluatorTagKey_BoxType + case evaluatordto.EvaluatorTagKeyName: + return evaluatordo.EvaluatorTagKey_Name + default: + return evaluatordo.EvaluatorTagKey(dtoKey) + } +} + +// ConvertFilterLogicOpDTO2DO 将DTO的FilterLogicOp转换为DO的FilterLogicOp +func ConvertFilterLogicOpDTO2DO(dtoOp evaluatordto.FilterLogicOp) evaluatordo.FilterLogicOp { + switch dtoOp { + case evaluatordto.FilterLogicOpAnd: + return evaluatordo.FilterLogicOp_And + case evaluatordto.FilterLogicOpOr: + return evaluatordo.FilterLogicOp_Or + default: + return evaluatordo.FilterLogicOp_Unknown + } +} + +// ConvertEvaluatorFilterOperatorTypeDTO2DO 将DTO的EvaluatorFilterOperatorType转换为DO的EvaluatorFilterOperatorType +func ConvertEvaluatorFilterOperatorTypeDTO2DO(dtoOp evaluatordto.EvaluatorFilterOperatorType) evaluatordo.EvaluatorFilterOperatorType { + switch dtoOp { + case evaluatordto.EvaluatorFilterOperatorTypeEqual: + return evaluatordo.EvaluatorFilterOperatorType_Equal + case evaluatordto.EvaluatorFilterOperatorTypeNotEqual: + return evaluatordo.EvaluatorFilterOperatorType_NotEqual + case evaluatordto.EvaluatorFilterOperatorTypeIn: + return evaluatordo.EvaluatorFilterOperatorType_In + case evaluatordto.EvaluatorFilterOperatorTypeNotIn: + return evaluatordo.EvaluatorFilterOperatorType_NotIn + case evaluatordto.EvaluatorFilterOperatorTypeLike: + return evaluatordo.EvaluatorFilterOperatorType_Like + case evaluatordto.EvaluatorFilterOperatorTypeIsNull: + return evaluatordo.EvaluatorFilterOperatorType_IsNull + case evaluatordto.EvaluatorFilterOperatorTypeIsNotNull: + return evaluatordo.EvaluatorFilterOperatorType_IsNotNull + default: + return evaluatordo.EvaluatorFilterOperatorType_Unknown + } +} + +// ConvertEvaluatorFilterConditionDTO2DO 将DTO的EvaluatorFilterCondition转换为DO的EvaluatorFilterCondition +func ConvertEvaluatorFilterConditionDTO2DO(dto *evaluatordto.EvaluatorFilterCondition) *evaluatordo.EvaluatorFilterCondition { + if dto == nil { + return nil + } + + return &evaluatordo.EvaluatorFilterCondition{ + TagKey: ConvertEvaluatorTagKeyDTO2DO(dto.GetTagKey()), + Operator: ConvertEvaluatorFilterOperatorTypeDTO2DO(dto.GetOperator()), + Value: dto.GetValue(), + } +} + +// ConvertEvaluatorFiltersDTO2DO 将DTO的EvaluatorFilters转换为DO的EvaluatorFilters +func ConvertEvaluatorFiltersDTO2DO(dto *evaluatordto.EvaluatorFilters) *evaluatordo.EvaluatorFilters { + if dto == nil { + return nil + } + + // 转换筛选条件列表 + var filterConditions []*evaluatordo.EvaluatorFilterCondition + if dto.GetFilterConditions() != nil { + filterConditions = make([]*evaluatordo.EvaluatorFilterCondition, 0, len(dto.GetFilterConditions())) + for _, condition := range dto.GetFilterConditions() { + if convertedCondition := ConvertEvaluatorFilterConditionDTO2DO(condition); convertedCondition != nil { + filterConditions = append(filterConditions, convertedCondition) + } + } + } + + // 转换逻辑操作符 + var logicOp *evaluatordo.FilterLogicOp + if dto.GetLogicOp() != "" { + convertedLogicOp := ConvertFilterLogicOpDTO2DO(dto.GetLogicOp()) + logicOp = &convertedLogicOp + } + + return &evaluatordo.EvaluatorFilters{ + FilterConditions: filterConditions, + LogicOp: logicOp, + } +} + +// ConvertEvaluatorFilterOptionDTO2DO 将DTO的EvaluatorFilterOption转换为DO的EvaluatorFilterOption +func ConvertEvaluatorFilterOptionDTO2DO(dto *evaluatordto.EvaluatorFilterOption) *evaluatordo.EvaluatorFilterOption { + if dto == nil { + return nil + } + + // 转换搜索关键词 + var searchKeyword *string + if dto.GetSearchKeyword() != "" { + keyword := dto.GetSearchKeyword() + searchKeyword = &keyword + } + + // 转换筛选条件 + filters := ConvertEvaluatorFiltersDTO2DO(dto.GetFilters()) + + return &evaluatordo.EvaluatorFilterOption{ + SearchKeyword: searchKeyword, + Filters: filters, + } +} diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go new file mode 100644 index 000000000..bc1b57cf9 --- /dev/null +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go @@ -0,0 +1,196 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package evaluator + +import ( + "testing" + + evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" + evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + "github.com/stretchr/testify/assert" +) + +func TestConvertEvaluatorFilterOptionDTO2DO(t *testing.T) { + t.Parallel() + + // 测试空值 + result := ConvertEvaluatorFilterOptionDTO2DO(nil) + assert.Nil(t, result) + + // 测试只有搜索关键词的情况 + searchKeyword := "test keyword" + dto := &evaluatordto.EvaluatorFilterOption{ + SearchKeyword: &searchKeyword, + } + result = ConvertEvaluatorFilterOptionDTO2DO(dto) + assert.NotNil(t, result) + assert.NotNil(t, result.SearchKeyword) + assert.Equal(t, searchKeyword, *result.SearchKeyword) + assert.Nil(t, result.Filters) + + // 测试只有筛选条件的情况 + filterCondition := &evaluatordto.EvaluatorFilterCondition{ + TagKey: evaluatordto.EvaluatorTagKeyCategory, + Operator: evaluatordto.EvaluatorFilterOperatorTypeEqual, + Value: "LLM", + } + logicOp := evaluatordto.FilterLogicOpAnd + filters := &evaluatordto.EvaluatorFilters{ + FilterConditions: []*evaluatordto.EvaluatorFilterCondition{filterCondition}, + LogicOp: &logicOp, + } + dto = &evaluatordto.EvaluatorFilterOption{ + Filters: filters, + } + result = ConvertEvaluatorFilterOptionDTO2DO(dto) + assert.NotNil(t, result) + assert.Nil(t, result.SearchKeyword) + assert.NotNil(t, result.Filters) + assert.Len(t, result.Filters.FilterConditions, 1) + assert.Equal(t, evaluatordo.EvaluatorTagKey_Category, result.Filters.FilterConditions[0].TagKey) + assert.Equal(t, evaluatordo.EvaluatorFilterOperatorType_Equal, result.Filters.FilterConditions[0].Operator) + assert.Equal(t, "LLM", result.Filters.FilterConditions[0].Value) + assert.NotNil(t, result.Filters.LogicOp) + assert.Equal(t, evaluatordo.FilterLogicOp_And, *result.Filters.LogicOp) + + // 测试完整的情况 + dto = &evaluatordto.EvaluatorFilterOption{ + SearchKeyword: &searchKeyword, + Filters: filters, + } + result = ConvertEvaluatorFilterOptionDTO2DO(dto) + assert.NotNil(t, result) + assert.NotNil(t, result.SearchKeyword) + assert.Equal(t, searchKeyword, *result.SearchKeyword) + assert.NotNil(t, result.Filters) + assert.Len(t, result.Filters.FilterConditions, 1) +} + +func TestConvertEvaluatorTagKeyDTO2DO(t *testing.T) { + t.Parallel() + + testCases := []struct { + dtoKey evaluatordto.EvaluatorTagKey + expected evaluatordo.EvaluatorTagKey + }{ + {evaluatordto.EvaluatorTagKeyCategory, evaluatordo.EvaluatorTagKey_Category}, + {evaluatordto.EvaluatorTagKeyTargetType, evaluatordo.EvaluatorTagKey_TargetType}, + {evaluatordto.EvaluatorTagKeyObjective, evaluatordo.EvaluatorTagKey_Objective}, + {evaluatordto.EvaluatorTagKeyBusinessScenario, evaluatordo.EvaluatorTagKey_BusinessScenario}, + {evaluatordto.EvaluatorTagKeyBoxType, evaluatordo.EvaluatorTagKey_BoxType}, + {evaluatordto.EvaluatorTagKeyName, evaluatordo.EvaluatorTagKey_Name}, + } + + for _, tc := range testCases { + result := ConvertEvaluatorTagKeyDTO2DO(tc.dtoKey) + assert.Equal(t, tc.expected, result) + } +} + +func TestConvertFilterLogicOpDTO2DO(t *testing.T) { + t.Parallel() + + testCases := []struct { + dtoOp evaluatordto.FilterLogicOp + expected evaluatordo.FilterLogicOp + }{ + {evaluatordto.FilterLogicOpAnd, evaluatordo.FilterLogicOp_And}, + {evaluatordto.FilterLogicOpOr, evaluatordo.FilterLogicOp_Or}, + {evaluatordto.FilterLogicOpUnknown, evaluatordo.FilterLogicOp_Unknown}, + {"", evaluatordo.FilterLogicOp_Unknown}, + } + + for _, tc := range testCases { + result := ConvertFilterLogicOpDTO2DO(tc.dtoOp) + assert.Equal(t, tc.expected, result) + } +} + +func TestConvertEvaluatorFilterOperatorTypeDTO2DO(t *testing.T) { + t.Parallel() + + testCases := []struct { + dtoOp evaluatordto.EvaluatorFilterOperatorType + expected evaluatordo.EvaluatorFilterOperatorType + }{ + {evaluatordto.EvaluatorFilterOperatorTypeEqual, evaluatordo.EvaluatorFilterOperatorType_Equal}, + {evaluatordto.EvaluatorFilterOperatorTypeNotEqual, evaluatordo.EvaluatorFilterOperatorType_NotEqual}, + {evaluatordto.EvaluatorFilterOperatorTypeIn, evaluatordo.EvaluatorFilterOperatorType_In}, + {evaluatordto.EvaluatorFilterOperatorTypeNotIn, evaluatordo.EvaluatorFilterOperatorType_NotIn}, + {evaluatordto.EvaluatorFilterOperatorTypeLike, evaluatordo.EvaluatorFilterOperatorType_Like}, + {evaluatordto.EvaluatorFilterOperatorTypeIsNull, evaluatordo.EvaluatorFilterOperatorType_IsNull}, + {evaluatordto.EvaluatorFilterOperatorTypeIsNotNull, evaluatordo.EvaluatorFilterOperatorType_IsNotNull}, + {evaluatordto.EvaluatorFilterOperatorTypeUnknown, evaluatordo.EvaluatorFilterOperatorType_Unknown}, + {"", evaluatordo.EvaluatorFilterOperatorType_Unknown}, + } + + for _, tc := range testCases { + result := ConvertEvaluatorFilterOperatorTypeDTO2DO(tc.dtoOp) + assert.Equal(t, tc.expected, result) + } +} + +func TestConvertEvaluatorFilterConditionDTO2DO(t *testing.T) { + t.Parallel() + + // 测试空值 + result := ConvertEvaluatorFilterConditionDTO2DO(nil) + assert.Nil(t, result) + + // 测试正常情况 + dto := &evaluatordto.EvaluatorFilterCondition{ + TagKey: evaluatordto.EvaluatorTagKeyCategory, + Operator: evaluatordto.EvaluatorFilterOperatorTypeEqual, + Value: "LLM", + } + result = ConvertEvaluatorFilterConditionDTO2DO(dto) + assert.NotNil(t, result) + assert.Equal(t, evaluatordo.EvaluatorTagKey_Category, result.TagKey) + assert.Equal(t, evaluatordo.EvaluatorFilterOperatorType_Equal, result.Operator) + assert.Equal(t, "LLM", result.Value) +} + +func TestConvertEvaluatorFiltersDTO2DO(t *testing.T) { + t.Parallel() + + // 测试空值 + result := ConvertEvaluatorFiltersDTO2DO(nil) + assert.Nil(t, result) + + // 测试只有逻辑操作符的情况 + logicOp := evaluatordto.FilterLogicOpOr + dto := &evaluatordto.EvaluatorFilters{ + LogicOp: &logicOp, + } + result = ConvertEvaluatorFiltersDTO2DO(dto) + assert.NotNil(t, result) + assert.Empty(t, result.FilterConditions) + assert.NotNil(t, result.LogicOp) + assert.Equal(t, evaluatordo.FilterLogicOp_Or, *result.LogicOp) + + // 测试只有筛选条件的情况 + filterCondition := &evaluatordto.EvaluatorFilterCondition{ + TagKey: evaluatordto.EvaluatorTagKeyCategory, + Operator: evaluatordto.EvaluatorFilterOperatorTypeEqual, + Value: "LLM", + } + dto = &evaluatordto.EvaluatorFilters{ + FilterConditions: []*evaluatordto.EvaluatorFilterCondition{filterCondition}, + } + result = ConvertEvaluatorFiltersDTO2DO(dto) + assert.NotNil(t, result) + assert.Len(t, result.FilterConditions, 1) + assert.Nil(t, result.LogicOp) + + // 测试完整的情况 + dto = &evaluatordto.EvaluatorFilters{ + FilterConditions: []*evaluatordto.EvaluatorFilterCondition{filterCondition}, + LogicOp: &logicOp, + } + result = ConvertEvaluatorFiltersDTO2DO(dto) + assert.NotNil(t, result) + assert.Len(t, result.FilterConditions, 1) + assert.NotNil(t, result.LogicOp) + assert.Equal(t, evaluatordo.FilterLogicOp_Or, *result.LogicOp) +} diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go new file mode 100644 index 000000000..fba5f13d4 --- /dev/null +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go @@ -0,0 +1,249 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package evaluator + +import ( + "github.com/bytedance/gg/gptr" + + commondto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" + evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" + commonconvertor "github.com/coze-dev/coze-loop/backend/modules/evaluation/application/convertor/common" + evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" +) + +// ConvertEvaluatorTemplateDTO2DO 将 EvaluatorTemplate DTO 转换为 DO +func ConvertEvaluatorTemplateDTO2DO(dto *evaluatordto.EvaluatorTemplate) *evaluatordo.EvaluatorTemplate { + if dto == nil { + return nil + } + + do := &evaluatordo.EvaluatorTemplate{ + ID: dto.GetID(), + SpaceID: dto.GetWorkspaceID(), + Name: dto.GetName(), + Description: dto.GetDescription(), + EvaluatorType: evaluatordo.EvaluatorType(dto.GetEvaluatorType()), + Popularity: dto.GetPopularity(), + Benchmark: dto.GetBenchmark(), + Vendor: dto.GetVendor(), + InputSchemas: make([]*evaluatordo.ArgsSchema, 0), + OutputSchemas: make([]*evaluatordo.ArgsSchema, 0), + Tags: make(map[evaluatordo.EvaluatorTagKey][]string), + } + + // 处理标签 + if len(dto.GetTags()) > 0 { + for key, values := range dto.GetTags() { + do.Tags[evaluatordo.EvaluatorTagKey(key)] = values + } + } + + // 处理基础信息 + if dto.GetBaseInfo() != nil { + do.BaseInfo = commonconvertor.ConvertBaseInfoDTO2DO(dto.GetBaseInfo()) + } + + // 处理评估器内容 + if dto.GetEvaluatorContent() != nil { + // 处理输入模式 + if len(dto.GetEvaluatorContent().GetInputSchemas()) > 0 { + for _, schema := range dto.GetEvaluatorContent().GetInputSchemas() { + do.InputSchemas = append(do.InputSchemas, commonconvertor.ConvertArgsSchemaDTO2DO(schema)) + } + } + + // 处理输出模式 + if len(dto.GetEvaluatorContent().GetOutputSchemas()) > 0 { + for _, schema := range dto.GetEvaluatorContent().GetOutputSchemas() { + do.OutputSchemas = append(do.OutputSchemas, commonconvertor.ConvertArgsSchemaDTO2DO(schema)) + } + } + + // 处理接收聊天历史 + do.ReceiveChatHistory = dto.GetEvaluatorContent().ReceiveChatHistory + + // 根据评估器类型处理具体内容 + switch do.EvaluatorType { + case evaluatordo.EvaluatorTypePrompt: + if dto.GetEvaluatorContent().PromptEvaluator != nil { + do.PromptEvaluatorContent = ConvertPromptEvaluatorContentDTO2DO(dto.GetEvaluatorContent().PromptEvaluator) + } + case evaluatordo.EvaluatorTypeCode: + if dto.GetEvaluatorContent().CodeEvaluator != nil { + do.CodeEvaluatorContent = ConvertCodeEvaluatorContentDTO2DO(dto.GetEvaluatorContent().CodeEvaluator) + } + } + } + + return do +} + +// ConvertEvaluatorTemplateDO2DTO 将 EvaluatorTemplate DO 转换为 DTO +func ConvertEvaluatorTemplateDO2DTO(do *evaluatordo.EvaluatorTemplate) *evaluatordto.EvaluatorTemplate { + if do == nil { + return nil + } + + dto := &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(do.ID), + WorkspaceID: gptr.Of(do.SpaceID), + Name: gptr.Of(do.Name), + Description: gptr.Of(do.Description), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType(do.EvaluatorType)), + Popularity: gptr.Of(do.Popularity), + Benchmark: gptr.Of(do.Benchmark), + Vendor: gptr.Of(do.Vendor), + Tags: make(map[evaluatordto.EvaluatorTagKey][]string), + } + + // 处理标签 + if len(do.Tags) > 0 { + for key, values := range do.Tags { + dto.Tags[evaluatordto.EvaluatorTagKey(key)] = values + } + } + + // 处理基础信息 + if do.BaseInfo != nil { + dto.BaseInfo = commonconvertor.ConvertBaseInfoDO2DTO(do.BaseInfo) + } + + // 构建评估器内容 + dto.EvaluatorContent = &evaluatordto.EvaluatorContent{ + InputSchemas: make([]*commondto.ArgsSchema, 0), + OutputSchemas: make([]*commondto.ArgsSchema, 0), + ReceiveChatHistory: do.ReceiveChatHistory, + } + + // 处理输入模式 + if len(do.InputSchemas) > 0 { + for _, schema := range do.InputSchemas { + dto.EvaluatorContent.InputSchemas = append(dto.EvaluatorContent.InputSchemas, commonconvertor.ConvertArgsSchemaDO2DTO(schema)) + } + } + + // 处理输出模式 + if len(do.OutputSchemas) > 0 { + for _, schema := range do.OutputSchemas { + dto.EvaluatorContent.OutputSchemas = append(dto.EvaluatorContent.OutputSchemas, commonconvertor.ConvertArgsSchemaDO2DTO(schema)) + } + } + + // 根据评估器类型处理具体内容 + switch do.EvaluatorType { + case evaluatordo.EvaluatorTypePrompt: + if do.PromptEvaluatorContent != nil { + dto.EvaluatorContent.PromptEvaluator = ConvertPromptEvaluatorContentDO2DTO(do.PromptEvaluatorContent) + } + case evaluatordo.EvaluatorTypeCode: + if do.CodeEvaluatorContent != nil { + dto.EvaluatorContent.CodeEvaluator = ConvertCodeEvaluatorContentDO2DTO(do.CodeEvaluatorContent) + } + } + + return dto +} + +// ConvertEvaluatorTemplateDOList2DTO 将 EvaluatorTemplate DO 列表转换为 DTO 列表 +func ConvertEvaluatorTemplateDOList2DTO(doList []*evaluatordo.EvaluatorTemplate) []*evaluatordto.EvaluatorTemplate { + if doList == nil { + return nil + } + + dtoList := make([]*evaluatordto.EvaluatorTemplate, 0, len(doList)) + for _, do := range doList { + dtoList = append(dtoList, ConvertEvaluatorTemplateDO2DTO(do)) + } + return dtoList +} + +// ConvertPromptEvaluatorContentDTO2DO 将 PromptEvaluator DTO 转换为 DO +func ConvertPromptEvaluatorContentDTO2DO(dto *evaluatordto.PromptEvaluator) *evaluatordo.PromptEvaluatorContent { + if dto == nil { + return nil + } + + do := &evaluatordo.PromptEvaluatorContent{ + // ParseType和PromptSuffix在IDL中没有对应字段，使用默认值 + ParseType: evaluatordo.ParseTypeContent, + PromptSuffix: "", + } + + // 转换消息列表 + if len(dto.GetMessageList()) > 0 { + do.MessageList = make([]*evaluatordo.Message, 0, len(dto.GetMessageList())) + for _, msg := range dto.GetMessageList() { + do.MessageList = append(do.MessageList, commonconvertor.ConvertMessageDTO2DO(msg)) + } + } + + // 转换模型配置 + do.ModelConfig = commonconvertor.ConvertModelConfigDTO2DO(dto.GetModelConfig()) + + // 转换工具列表 + if len(dto.GetTools()) > 0 { + do.Tools = make([]*evaluatordo.Tool, 0, len(dto.GetTools())) + for _, tool := range dto.GetTools() { + do.Tools = append(do.Tools, ConvertToolDTO2DO(tool)) + } + } + + return do +} + +// ConvertPromptEvaluatorContentDO2DTO 将 PromptEvaluatorContent DO 转换为 DTO +func ConvertPromptEvaluatorContentDO2DTO(do *evaluatordo.PromptEvaluatorContent) *evaluatordto.PromptEvaluator { + if do == nil { + return nil + } + + dto := &evaluatordto.PromptEvaluator{ + // ParseType和PromptSuffix在IDL中没有对应字段，不设置 + } + + // 转换消息列表 + if len(do.MessageList) > 0 { + dto.MessageList = make([]*commondto.Message, 0, len(do.MessageList)) + for _, msg := range do.MessageList { + dto.MessageList = append(dto.MessageList, commonconvertor.ConvertMessageDO2DTO(msg)) + } + } + + // 转换模型配置 + dto.ModelConfig = commonconvertor.ConvertModelConfigDO2DTO(do.ModelConfig) + + // 转换工具列表 + if len(do.Tools) > 0 { + dto.Tools = make([]*evaluatordto.Tool, 0, len(do.Tools)) + for _, tool := range do.Tools { + dto.Tools = append(dto.Tools, ConvertToolDO2DTO(tool)) + } + } + + return dto +} + +// ConvertCodeEvaluatorContentDTO2DO 将 CodeEvaluator DTO 转换为 DO +func ConvertCodeEvaluatorContentDTO2DO(dto *evaluatordto.CodeEvaluator) *evaluatordo.CodeEvaluatorContent { + if dto == nil { + return nil + } + + return &evaluatordo.CodeEvaluatorContent{ + CodeContent: dto.GetCodeContent(), + LanguageType: evaluatordo.LanguageType(dto.GetLanguageType()), + } +} + +// ConvertCodeEvaluatorContentDO2DTO 将 CodeEvaluatorContent DO 转换为 DTO +func ConvertCodeEvaluatorContentDO2DTO(do *evaluatordo.CodeEvaluatorContent) *evaluatordto.CodeEvaluator { + if do == nil { + return nil + } + + return &evaluatordto.CodeEvaluator{ + CodeContent: gptr.Of(do.CodeContent), + LanguageType: gptr.Of(evaluatordto.LanguageType(do.LanguageType)), + } +} diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go index f4925c077..2a4b3702f 100755 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go @@ -34,6 +34,10 @@ func TestConvertEvaluatorDTO2DO(t *testing.T) { DraftSubmitted: gptr.Of(true), EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), LatestVersion: gptr.Of("1"), + Tags: map[evaluatordto.EvaluatorTagKey][]string{ + evaluatordto.EvaluatorTagKeyCategory: {"LLM", "Code"}, + evaluatordto.EvaluatorTagKeyObjective: {"Quality"}, + }, }, expected: &evaluatordo.Evaluator{ ID: 123, @@ -43,6 +47,10 @@ func TestConvertEvaluatorDTO2DO(t *testing.T) { DraftSubmitted: true, EvaluatorType: evaluatordo.EvaluatorTypePrompt, LatestVersion: "1", + Tags: map[evaluatordo.EvaluatorTagKey][]string{ + evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, + evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, + }, }, }, { @@ -103,6 +111,10 @@ func TestConvertEvaluatorDO2DTO(t *testing.T) { DraftSubmitted: true, EvaluatorType: evaluatordo.EvaluatorTypePrompt, LatestVersion: "1", + Tags: map[evaluatordo.EvaluatorTagKey][]string{ + evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, + evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, + }, }, expectedType: evaluatordto.EvaluatorType_Prompt, }, @@ -907,3 +919,138 @@ func TestConvertPromptEvaluatorVersionDO2DTO(t *testing.T) { }) } } + +func TestConvertEvaluatorTagsDTO2DO(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + dtoTags map[evaluatordto.EvaluatorTagKey][]string + expected map[evaluatordo.EvaluatorTagKey][]string + }{ + { + name: "正常转换", + dtoTags: map[evaluatordto.EvaluatorTagKey][]string{ + evaluatordto.EvaluatorTagKeyCategory: {"LLM", "Code"}, + evaluatordto.EvaluatorTagKeyObjective: {"Quality"}, + evaluatordto.EvaluatorTagKeyBusinessScenario: {"AI Coding"}, + }, + expected: map[evaluatordo.EvaluatorTagKey][]string{ + evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, + evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, + evaluatordo.EvaluatorTagKey_BusinessScenario: {"AI Coding"}, + }, + }, + { + name: "空Tags", + dtoTags: nil, + expected: nil, + }, + { + name: "空map", + dtoTags: map[evaluatordto.EvaluatorTagKey][]string{}, + expected: map[evaluatordo.EvaluatorTagKey][]string{}, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + result := ConvertEvaluatorTagsDTO2DO(tt.dtoTags) + assert.Equal(t, tt.expected, result) + }) + } +} + +func TestConvertEvaluatorTagsDO2DTO(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + doTags map[evaluatordo.EvaluatorTagKey][]string + expected map[evaluatordto.EvaluatorTagKey][]string + }{ + { + name: "正常转换", + doTags: map[evaluatordo.EvaluatorTagKey][]string{ + evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, + evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, + evaluatordo.EvaluatorTagKey_BusinessScenario: {"AI Coding"}, + }, + expected: map[evaluatordto.EvaluatorTagKey][]string{ + evaluatordto.EvaluatorTagKeyCategory: {"LLM", "Code"}, + evaluatordto.EvaluatorTagKeyObjective: {"Quality"}, + evaluatordto.EvaluatorTagKeyBusinessScenario: {"AI Coding"}, + }, + }, + { + name: "空Tags", + doTags: nil, + expected: nil, + }, + { + name: "空map", + doTags: map[evaluatordo.EvaluatorTagKey][]string{}, + expected: map[evaluatordto.EvaluatorTagKey][]string{}, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + result := ConvertEvaluatorTagsDO2DTO(tt.doTags) + assert.Equal(t, tt.expected, result) + }) + } +} + +func TestConvertEvaluatorTagKeyDO2DTO(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + doKey evaluatordo.EvaluatorTagKey + expected evaluatordto.EvaluatorTagKey + }{ + { + name: "Category", + doKey: evaluatordo.EvaluatorTagKey_Category, + expected: evaluatordto.EvaluatorTagKeyCategory, + }, + { + name: "TargetType", + doKey: evaluatordo.EvaluatorTagKey_TargetType, + expected: evaluatordto.EvaluatorTagKeyTargetType, + }, + { + name: "Objective", + doKey: evaluatordo.EvaluatorTagKey_Objective, + expected: evaluatordto.EvaluatorTagKeyObjective, + }, + { + name: "BusinessScenario", + doKey: evaluatordo.EvaluatorTagKey_BusinessScenario, + expected: evaluatordto.EvaluatorTagKeyBusinessScenario, + }, + { + name: "BoxType", + doKey: evaluatordo.EvaluatorTagKey_BoxType, + expected: evaluatordto.EvaluatorTagKeyBoxType, + }, + { + name: "Name", + doKey: evaluatordo.EvaluatorTagKey_Name, + expected: evaluatordto.EvaluatorTagKeyName, + }, + { + name: "未知类型", + doKey: evaluatordo.EvaluatorTagKey("Unknown"), + expected: evaluatordto.EvaluatorTagKey("Unknown"), + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + result := ConvertEvaluatorTagKeyDO2DTO(tt.doKey) + assert.Equal(t, tt.expected, result) + }) + } +} diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index 060feba92..fe886b206 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -23,6 +23,7 @@ import ( "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation" evaluatorcommon "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" + "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" evaluatorservice "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" evaluatorconvertor "github.com/coze-dev/coze-loop/backend/modules/evaluation/application/convertor/evaluator" "github.com/coze-dev/coze-loop/backend/modules/evaluation/consts" @@ -47,6 +48,7 @@ func NewEvaluatorHandlerImpl(idgen idgen.IIDGenerator, auth rpc.IAuthProvider, evaluatorService service.EvaluatorService, evaluatorRecordService service.EvaluatorRecordService, + evaluatorTemplateService service.EvaluatorTemplateService, metrics metrics.EvaluatorExecMetrics, userInfoService userinfo.UserInfoService, auditClient audit.IAuditService, @@ -55,34 +57,36 @@ func NewEvaluatorHandlerImpl(idgen idgen.IIDGenerator, evaluatorSourceServices map[entity.EvaluatorType]service.EvaluatorSourceService, ) evaluation.EvaluatorService { handler := &EvaluatorHandlerImpl{ - idgen: idgen, - auth: auth, - auditClient: auditClient, - configer: configer, - evaluatorService: evaluatorService, - evaluatorRecordService: evaluatorRecordService, - metrics: metrics, - userInfoService: userInfoService, - benefitService: benefitService, - fileProvider: fileProvider, - evaluatorSourceServices: evaluatorSourceServices, + idgen: idgen, + auth: auth, + auditClient: auditClient, + configer: configer, + evaluatorService: evaluatorService, + evaluatorRecordService: evaluatorRecordService, + evaluatorTemplateService: evaluatorTemplateService, + metrics: metrics, + userInfoService: userInfoService, + benefitService: benefitService, + fileProvider: fileProvider, + evaluatorSourceServices: evaluatorSourceServices, } return handler } // EvaluatorHandlerImpl 实现 EvaluatorService 接口 type EvaluatorHandlerImpl struct { - idgen idgen.IIDGenerator - auth rpc.IAuthProvider - auditClient audit.IAuditService - configer conf.IConfiger - evaluatorService service.EvaluatorService - evaluatorRecordService service.EvaluatorRecordService - metrics metrics.EvaluatorExecMetrics - userInfoService userinfo.UserInfoService - benefitService benefit.IBenefitService - fileProvider rpc.IFileProvider - evaluatorSourceServices map[entity.EvaluatorType]service.EvaluatorSourceService + idgen idgen.IIDGenerator + auth rpc.IAuthProvider + auditClient audit.IAuditService + configer conf.IConfiger + evaluatorService service.EvaluatorService + evaluatorRecordService service.EvaluatorRecordService + evaluatorTemplateService service.EvaluatorTemplateService + metrics metrics.EvaluatorExecMetrics + userInfoService userinfo.UserInfoService + benefitService benefit.IBenefitService + fileProvider rpc.IFileProvider + evaluatorSourceServices map[entity.EvaluatorType]service.EvaluatorSourceService } // ListEvaluators 按查询条件查询 evaluator @@ -96,10 +100,23 @@ func (e *EvaluatorHandlerImpl) ListEvaluators(ctx context.Context, request *eval if err != nil { return nil, err } - evaluatorDOS, total, err := e.evaluatorService.ListEvaluator(ctx, buildSrvListEvaluatorRequest(request)) + + var evaluatorDOS []*entity.Evaluator + var total int64 + + // 根据Builtin参数进行分流 + if request.GetBuiltin() { + // 查询内置评估器 + evaluatorDOS, total, err = e.evaluatorService.ListBuiltinEvaluator(ctx, buildSrvListBuiltinEvaluatorRequest(request)) + } else { + // 查询普通评估器 + evaluatorDOS, total, err = e.evaluatorService.ListEvaluator(ctx, buildSrvListEvaluatorRequest(request)) + } + if err != nil { return nil, err } + dtoList := make([]*evaluatordto.Evaluator, 0, len(evaluatorDOS)) for _, evaluatorDO := range evaluatorDOS { dtoList = append(dtoList, evaluatorconvertor.ConvertEvaluatorDO2DTO(evaluatorDO)) @@ -133,6 +150,35 @@ func buildSrvListEvaluatorRequest(request *evaluatorservice.ListEvaluatorsReques }) } srvReq.OrderBys = orderBys + + // 转换FilterOption + if request.GetFilterOption() != nil { + srvReq.FilterOption = evaluatorconvertor.ConvertEvaluatorFilterOptionDTO2DO(request.GetFilterOption()) + } + + return srvReq +} + +func buildSrvListBuiltinEvaluatorRequest(request *evaluatorservice.ListEvaluatorsRequest) *entity.ListBuiltinEvaluatorRequest { + srvReq := &entity.ListBuiltinEvaluatorRequest{ + SpaceID: request.WorkspaceID, + SearchName: request.GetSearchName(), + CreatorIDs: request.GetCreatorIds(), + PageSize: request.GetPageSize(), + PageNum: request.GetPageNumber(), + WithVersion: request.GetWithVersion(), + } + evaluatorType := make([]entity.EvaluatorType, 0, len(request.GetEvaluatorType())) + for _, et := range request.GetEvaluatorType() { + evaluatorType = append(evaluatorType, entity.EvaluatorType(et)) + } + srvReq.EvaluatorType = evaluatorType + + // 转换FilterOption + if request.GetFilterOption() != nil { + srvReq.FilterOption = evaluatorconvertor.ConvertEvaluatorFilterOptionDTO2DO(request.GetFilterOption()) + } + return srvReq } @@ -211,7 +257,10 @@ func (e *EvaluatorHandlerImpl) CreateEvaluator(ctx context.Context, request *eva }() // 转换请求参数为领域对象 evaluatorDO := evaluatorconvertor.ConvertEvaluatorDTO2DO(request.GetEvaluator()) - evaluatorID, err := e.evaluatorService.CreateEvaluator(ctx, evaluatorDO, request.GetCid()) + + // 统一走 CreateEvaluator，是否创建tag由repo层依据 do.Builtin 决定 + var evaluatorID int64 + evaluatorID, err = e.evaluatorService.CreateEvaluator(ctx, evaluatorDO, request.GetCid()) if err != nil { return nil, err } @@ -319,8 +368,15 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluator(ctx context.Context, request *eva return nil, errorx.NewByCode(errno.RiskContentDetectedCode) } userIDInContext := session.UserIDInCtxOrEmpty(ctx) - if err = e.evaluatorService.UpdateEvaluatorMeta(ctx, request.GetEvaluatorID(), request.GetWorkspaceID(), request.GetName(), request.GetDescription(), userIDInContext); err != nil { - return nil, err + if request.GetBuiltin() { + // 内置评估器更新元信息（允许更新 benchmark/vendor） + if err = e.evaluatorService.UpdateBuiltinEvaluatorMeta(ctx, request.GetEvaluatorID(), request.GetWorkspaceID(), request.GetName(), request.GetDescription(), request.GetBenchmark(), request.GetVendor(), userIDInContext); err != nil { + return nil, err + } + } else { + if err = e.evaluatorService.UpdateEvaluatorMeta(ctx, request.GetEvaluatorID(), request.GetWorkspaceID(), request.GetName(), request.GetDescription(), userIDInContext); err != nil { + return nil, err + } } return &evaluatorservice.UpdateEvaluatorResponse{}, nil } @@ -365,7 +421,29 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluatorDraft(ctx context.Context, request evaluatorDTO := evaluatorconvertor.ConvertEvaluatorDO2DTO(evaluatorDO) evaluatorDTO.CurrentVersion.EvaluatorContent = request.EvaluatorContent evaluatorDTO.DraftSubmitted = ptr.Of(false) - err = e.evaluatorService.UpdateEvaluatorDraft(ctx, evaluatorconvertor.ConvertEvaluatorDTO2DO(evaluatorDTO)) + + // 根据Builtin参数选择不同的更新方法 + if request.GetBuiltin() { + // auth builtin evaluator + err = e.authBuiltinManagement(ctx, request.GetWorkspaceID(), spaceTypeBuiltin) + if err != nil { + return nil, err + } + // 处理 Tags 字段 + if request.Tags != nil { + // 将 DTO 的 Tags 转换为 DO 的 Tags + tags := make(map[entity.EvaluatorTagKey][]string) + for tagKey, tagValues := range request.Tags { + convertedTagKey := evaluatorconvertor.ConvertEvaluatorTagKeyDTO2DO(tagKey) + tags[convertedTagKey] = tagValues + } + // 将转换后的 tags 设置到 evaluatorDTO 中 + evaluatorDTO.Tags = request.Tags // 直接使用 request.Tags，因为 evaluatorDTO.Tags 的类型与 request.Tags 相同 + } + err = e.evaluatorService.UpdateBuiltinEvaluatorDraft(ctx, evaluatorconvertor.ConvertEvaluatorDTO2DO(evaluatorDTO)) + } else { + err = e.evaluatorService.UpdateEvaluatorDraft(ctx, evaluatorconvertor.ConvertEvaluatorDTO2DO(evaluatorDTO)) + } if err != nil { return nil, err } @@ -479,7 +557,7 @@ func buildListEvaluatorVersionRequest(request *evaluatorservice.ListEvaluatorVer // GetEvaluatorVersion 按 id 和版本号单个查询 evaluator_version version func (e *EvaluatorHandlerImpl) GetEvaluatorVersion(ctx context.Context, request *evaluatorservice.GetEvaluatorVersionRequest) (resp *evaluatorservice.GetEvaluatorVersionResponse, err error) { - evaluatorDO, err := e.evaluatorService.GetEvaluatorVersion(ctx, request.GetEvaluatorVersionID(), request.GetIncludeDeleted()) + evaluatorDO, err := e.evaluatorService.GetEvaluatorVersion(ctx, gptr.Of(request.WorkspaceID), request.GetEvaluatorVersionID(), request.GetIncludeDeleted(), request.GetBuiltin()) if err != nil { return nil, err } @@ -766,7 +844,7 @@ func (e *EvaluatorHandlerImpl) GetTemplateInfo(ctx context.Context, request *eva // RunEvaluator evaluator_version 运行 func (e *EvaluatorHandlerImpl) RunEvaluator(ctx context.Context, request *evaluatorservice.RunEvaluatorRequest) (resp *evaluatorservice.RunEvaluatorResponse, err error) { - evaluatorDO, err := e.evaluatorService.GetEvaluatorVersion(ctx, request.GetEvaluatorVersionID(), false) + evaluatorDO, err := e.evaluatorService.GetEvaluatorVersion(ctx, nil, request.GetEvaluatorVersionID(), false, false) if err != nil { return nil, err } @@ -872,7 +950,7 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluatorRecord(ctx context.Context, reques return nil, errorx.NewByCode(errno.EvaluatorRecordNotFoundCode) } // 鉴权 - evaluatorDO, err := e.evaluatorService.GetEvaluatorVersion(ctx, evaluatorRecord.EvaluatorVersionID, false) + evaluatorDO, err := e.evaluatorService.GetEvaluatorVersion(ctx, nil, evaluatorRecord.EvaluatorVersionID, false, false) if err != nil { return nil, err } @@ -926,7 +1004,7 @@ func (e *EvaluatorHandlerImpl) GetEvaluatorRecord(ctx context.Context, request * return &evaluatorservice.GetEvaluatorRecordResponse{}, nil } // 鉴权 - evaluatorDO, err := e.evaluatorService.GetEvaluatorVersion(ctx, evaluatorRecord.EvaluatorVersionID, request.GetIncludeDeleted()) + evaluatorDO, err := e.evaluatorService.GetEvaluatorVersion(ctx, nil, evaluatorRecord.EvaluatorVersionID, request.GetIncludeDeleted(), false) if err != nil { return nil, err } @@ -1250,3 +1328,290 @@ func (e *EvaluatorHandlerImpl) batchDebugWithConcurrency(ctx context.Context, ev EvaluatorOutputData: results, }, nil } + +// ListTemplatesV2 查询评估器模板列表 +func (e *EvaluatorHandlerImpl) ListTemplatesV2(ctx context.Context, request *evaluatorservice.ListTemplatesV2Request) (resp *evaluatorservice.ListTemplatesV2Response, err error) { + // List接口无需鉴权 + + // 构建service层请求 + serviceReq := &entity.ListEvaluatorTemplateRequest{ + SpaceID: 0, // 模板查询不需要空间ID + FilterOption: nil, // 默认无筛选条件 + PageSize: 20, // 默认分页大小 + PageNum: 1, // 默认页码 + IncludeDeleted: false, + } + + // 转换FilterOption + if request.GetFilterOption() != nil { + serviceReq.FilterOption = evaluatorconvertor.ConvertEvaluatorFilterOptionDTO2DO(request.GetFilterOption()) + } + + // 调用service层 + serviceResp, err := e.evaluatorTemplateService.ListEvaluatorTemplate(ctx, serviceReq) + if err != nil { + return nil, err + } + + // 转换结果 + templates := make([]*evaluatordto.EvaluatorTemplate, 0, len(serviceResp.Templates)) + for _, template := range serviceResp.Templates { + templates = append(templates, evaluatorconvertor.ConvertEvaluatorTemplateDO2DTO(template)) + } + + return &evaluatorservice.ListTemplatesV2Response{ + EvaluatorTemplates: templates, + }, nil +} + +// GetTemplateInfoV2 获取评估器模板详情 +func (e *EvaluatorHandlerImpl) GetTemplateInfoV2(ctx context.Context, request *evaluatorservice.GetTemplateInfoV2Request) (resp *evaluatorservice.GetTemplateInfoV2Response, err error) { + // get接口无需鉴权 + // 构建service层请求 + serviceReq := &entity.GetEvaluatorTemplateRequest{ + ID: request.GetEvaluatorTemplateID(), + IncludeDeleted: false, + } + + // 调用service层 + serviceResp, err := e.evaluatorTemplateService.GetEvaluatorTemplate(ctx, serviceReq) + if err != nil { + return nil, err + } + + if serviceResp.Template == nil { + return &evaluatorservice.GetTemplateInfoV2Response{}, nil + } + + // 转换结果 + template := evaluatorconvertor.ConvertEvaluatorTemplateDO2DTO(serviceResp.Template) + + return &evaluatorservice.GetTemplateInfoV2Response{ + EvaluatorTemplate: template, + }, nil +} + +// CreateEvaluatorTemplate 创建评估器模板 +func (e *EvaluatorHandlerImpl) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest) (resp *evaluator.CreateEvaluatorTemplateResponse, err error) { + // 参数验证 + if request.GetEvaluatorTemplate() == nil { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("evaluator_template is nil")) + } + + // 校验评估器模板管理权限 + err = e.authBuiltinManagement(ctx, request.GetEvaluatorTemplate().GetWorkspaceID(), spaceTypeTemplate) + if err != nil { + return nil, err + } + + // 转换DTO到DO + templateDO := evaluatorconvertor.ConvertEvaluatorTemplateDTO2DO(request.GetEvaluatorTemplate()) + + // 构建service层请求 + serviceReq := &entity.CreateEvaluatorTemplateRequest{ + SpaceID: templateDO.SpaceID, + Name: templateDO.Name, + Description: templateDO.Description, + EvaluatorType: templateDO.EvaluatorType, + Benchmark: templateDO.Benchmark, + Vendor: templateDO.Vendor, + InputSchemas: templateDO.InputSchemas, + OutputSchemas: templateDO.OutputSchemas, + ReceiveChatHistory: templateDO.ReceiveChatHistory, + Tags: templateDO.Tags, + PromptEvaluatorContent: templateDO.PromptEvaluatorContent, + CodeEvaluatorContent: templateDO.CodeEvaluatorContent, + } + + // 调用service层 + serviceResp, err := e.evaluatorTemplateService.CreateEvaluatorTemplate(ctx, serviceReq) + if err != nil { + return nil, err + } + + // 转换结果 + template := evaluatorconvertor.ConvertEvaluatorTemplateDO2DTO(serviceResp.Template) + + return &evaluator.CreateEvaluatorTemplateResponse{ + EvaluatorTemplate: template, + }, nil +} + +// UpdateEvaluatorTemplate 更新评估器模板 +func (e *EvaluatorHandlerImpl) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest) (resp *evaluator.UpdateEvaluatorTemplateResponse, err error) { + // 参数验证 + if request.GetEvaluatorTemplate() == nil { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("evaluator_template is nil")) + } + + // 校验评估器模板管理权限 + err = e.authBuiltinManagement(ctx, request.GetEvaluatorTemplate().GetWorkspaceID(), spaceTypeTemplate) + if err != nil { + return nil, err + } + + // 转换DTO到DO + templateDO := evaluatorconvertor.ConvertEvaluatorTemplateDTO2DO(request.GetEvaluatorTemplate()) + + // 构建service层请求 + serviceReq := &entity.UpdateEvaluatorTemplateRequest{ + ID: templateDO.ID, + Name: gptr.Of(templateDO.Name), + Description: gptr.Of(templateDO.Description), + Benchmark: gptr.Of(templateDO.Benchmark), + Vendor: gptr.Of(templateDO.Vendor), + InputSchemas: templateDO.InputSchemas, + OutputSchemas: templateDO.OutputSchemas, + ReceiveChatHistory: templateDO.ReceiveChatHistory, + Tags: templateDO.Tags, + PromptEvaluatorContent: templateDO.PromptEvaluatorContent, + CodeEvaluatorContent: templateDO.CodeEvaluatorContent, + } + + // 调用service层 + serviceResp, err := e.evaluatorTemplateService.UpdateEvaluatorTemplate(ctx, serviceReq) + if err != nil { + return nil, err + } + + // 转换结果 + template := evaluatorconvertor.ConvertEvaluatorTemplateDO2DTO(serviceResp.Template) + + return &evaluator.UpdateEvaluatorTemplateResponse{ + EvaluatorTemplate: template, + }, nil +} + +// DeleteEvaluatorTemplate 删除评估器模板 +func (e *EvaluatorHandlerImpl) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest) (resp *evaluator.DeleteEvaluatorTemplateResponse, err error) { + // 参数验证 + if request.GetEvaluatorTemplateID() == 0 { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("evaluator_template_id is 0")) + } + + // 鉴权 - 需要先获取模板信息来确定空间ID + templateDO, err := e.evaluatorTemplateService.GetEvaluatorTemplate(ctx, &entity.GetEvaluatorTemplateRequest{ + ID: request.GetEvaluatorTemplateID(), + IncludeDeleted: false, + }) + if err != nil { + return nil, err + } + if templateDO.Template == nil { + return nil, errorx.NewByCode(errno.ResourceNotFoundCode) + } + + // 校验评估器模板管理权限 + err = e.authBuiltinManagement(ctx, templateDO.Template.SpaceID, spaceTypeTemplate) + if err != nil { + return nil, err + } + + // 构建service层请求 + serviceReq := &entity.DeleteEvaluatorTemplateRequest{ + ID: request.GetEvaluatorTemplateID(), + } + + // 调用service层 + _, err = e.evaluatorTemplateService.DeleteEvaluatorTemplate(ctx, serviceReq) + if err != nil { + return nil, err + } + + return &evaluator.DeleteEvaluatorTemplateResponse{}, nil +} + +// DebugBuiltinEvaluator 调试预置评估器 +func (e *EvaluatorHandlerImpl) DebugBuiltinEvaluator(ctx context.Context, request *evaluator.DebugBuiltinEvaluatorRequest) (resp *evaluator.DebugBuiltinEvaluatorResponse, err error) { + // 鉴权 + err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(request.GetEvaluatorID(), 10), + SpaceID: 0, // 预置评估器不需要空间权限 + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("debugLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, + }) + if err != nil { + return nil, err + } + + // TODO: 实现预置评估器调试逻辑 + // 这里需要根据具体的预置评估器调试需求来实现 + return &evaluator.DebugBuiltinEvaluatorResponse{ + OutputData: &evaluatordto.EvaluatorOutputData{ + // 返回空的输出数据，具体实现需要根据业务需求 + }, + }, nil +} + +// PublishBuiltinEvaluator 发布预置评估器 +func (e *EvaluatorHandlerImpl) PublishBuiltinEvaluator(ctx context.Context, request *evaluator.PublishBuiltinEvaluatorRequest) (resp *evaluator.PublishBuiltinEvaluatorResponse, err error) { + // 鉴权 + err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(request.GetEvaluatorID(), 10), + SpaceID: 0, // 预置评估器不需要空间权限 + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, + }) + if err != nil { + return nil, err + } + + // TODO: 实现预置评估器发布逻辑 + // 这里需要根据具体的预置评估器发布需求来实现 + return &evaluator.PublishBuiltinEvaluatorResponse{ + Version: &evaluatordto.EvaluatorVersion{ + // 返回空的版本信息，具体实现需要根据业务需求 + }, + }, nil +} + +func (e *EvaluatorHandlerImpl) ListEvaluatorTags(ctx context.Context, request *evaluatorservice.ListEvaluatorTagsRequest) (resp *evaluatorservice.ListEvaluatorTagsResponse, err error) { + // 直接从配置获取可用的标签配置 + tags := e.configer.GetEvaluatorTagConf(ctx) + return &evaluatorservice.ListEvaluatorTagsResponse{ + Tags: tags, + }, nil +} + +type SpaceType string + +const ( + spaceTypeBuiltin SpaceType = "builtin" + spaceTypeTemplate SpaceType = "template" +) + +// validate 校验评估器管理权限 +func (e *EvaluatorHandlerImpl) authBuiltinManagement(ctx context.Context, workspaceID int64, spaceType SpaceType) error { + var allowedSpaceIDs []string + switch spaceType { + case spaceTypeBuiltin: + allowedSpaceIDs = e.configer.GetBuiltinEvaluatorSpaceConf(ctx) + default: + allowedSpaceIDs = e.configer.GetEvaluatorTemplateSpaceConf(ctx) + } + + // 如果配置为空，则不允许任何空间ID + if len(allowedSpaceIDs) == 0 { + return errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("evaluator template space not configured")) + } + + // 将空间ID转换为字符串进行比较 + workspaceIDStr := strconv.FormatInt(workspaceID, 10) + + // 检查空间ID是否在允许列表中 + for _, allowedID := range allowedSpaceIDs { + if allowedID == workspaceIDStr { + return nil + } + } + + // 鉴权 + err := e.auth.Authorization(ctx, &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(workspaceID, 10), + SpaceID: workspaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, + }) + if err != nil { + return err + } + + return errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("workspace_id not in allowed evaluator template spaces")) +} diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index ffc4fe4f0..3c989eacc 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -111,6 +111,36 @@ func TestEvaluatorHandlerImpl_ListEvaluators(t *testing.T) { }, wantErr: false, }, + { + name: "success - builtin evaluators request", + req: &evaluatorservice.ListEvaluatorsRequest{ + WorkspaceID: validSpaceID, + Builtin: gptr.Of(true), + }, + mockSetup: func() { + // Mock auth + mockAuth.EXPECT().Authorization(gomock.Any(), &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(validSpaceID, 10), + SpaceID: validSpaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, + }).Return(nil) + + // Mock builtin evaluator service call + mockEvaluatorService.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Any()). + Return(validEvaluators, int64(2), nil) + + // Mock user info service + mockUserInfoService.EXPECT().PackUserInfo(gomock.Any(), gomock.Any()).Return() + }, + wantResp: &evaluatorservice.ListEvaluatorsResponse{ + Total: gptr.Of(int64(2)), + Evaluators: []*evaluatordto.Evaluator{ + evaluator.ConvertEvaluatorDO2DTO(validEvaluators[0]), + evaluator.ConvertEvaluatorDO2DTO(validEvaluators[1]), + }, + }, + wantErr: false, + }, { name: "error - auth failed", req: &evaluatorservice.ListEvaluatorsRequest{ @@ -384,6 +414,7 @@ func TestEvaluatorHandlerImpl_ComplexBusinessScenarios(t *testing.T) { mockAuth, mockEvaluatorService, mockEvaluatorRecordService, + nil, // mockEvaluatorTemplateService - 暂时设为nil mockMetrics, mockUserInfoService, mockAuditClient, @@ -800,6 +831,7 @@ func TestEvaluatorHandlerImpl_ComplexBusinessScenarios(t *testing.T) { mockAuth, mockEvaluatorService, mockEvaluatorRecordService, + nil, // mockEvaluatorTemplateService - 暂时设为nil mockMetrics, mockUserInfoService, mockAuditClient, diff --git a/backend/modules/evaluation/application/wire.go b/backend/modules/evaluation/application/wire.go index 42259da08..72a43a23e 100644 --- a/backend/modules/evaluation/application/wire.go +++ b/backend/modules/evaluation/application/wire.go @@ -137,6 +137,7 @@ var ( evaluatorDomainService = wire.NewSet( domainservice.NewEvaluatorServiceImpl, domainservice.NewEvaluatorRecordServiceImpl, + domainservice.NewEvaluatorTemplateService, NewEvaluatorSourceServices, llm.NewLLMRPCProvider, NewRuntimeFactory, @@ -147,9 +148,12 @@ var ( service.NewCodeBuilderFactory, evaluatorrepo.NewEvaluatorRepo, evaluatorrepo.NewEvaluatorRecordRepo, + evaluatorrepo.NewEvaluatorTemplateRepo, evaluatormysql.NewEvaluatorDAO, evaluatormysql.NewEvaluatorVersionDAO, evaluatormysql.NewEvaluatorRecordDAO, + evaluatormysql.NewEvaluatorTemplateDAO, + evaluatormysql.NewEvaluatorTagDAO, evaluatorrepo.NewRateLimiterImpl, evalconf.NewEvaluatorConfiger, evaluatormtr.NewEvaluatorMetrics, diff --git a/backend/modules/evaluation/application/wire_gen.go b/backend/modules/evaluation/application/wire_gen.go index cba660758..3985d5a8a 100644 --- a/backend/modules/evaluation/application/wire_gen.go +++ b/backend/modules/evaluation/application/wire_gen.go @@ -80,8 +80,9 @@ func InitExperimentApplication(ctx context.Context, idgen2 idgen.IIDGenerator, d rateLimiter := evaluator.NewRateLimiterImpl(ctx, limiterFactory, iConfiger) evaluatorDAO := mysql2.NewEvaluatorDAO(db2) evaluatorVersionDAO := mysql2.NewEvaluatorVersionDAO(db2) + evaluatorTagDAO := mysql2.NewEvaluatorTagDAO(db2) iLatestWriteTracker := platestwrite.NewLatestWriteTracker(cmdable) - iEvaluatorRepo := evaluator.NewEvaluatorRepo(idgen2, db2, evaluatorDAO, evaluatorVersionDAO, iLatestWriteTracker) + iEvaluatorRepo := evaluator.NewEvaluatorRepo(idgen2, db2, evaluatorDAO, evaluatorVersionDAO, evaluatorTagDAO, iLatestWriteTracker) evaluatorRecordDAO := mysql2.NewEvaluatorRecordDAO(db2) iEvaluatorRecordRepo := evaluator.NewEvaluatorRecordRepo(idgen2, db2, evaluatorRecordDAO) iIdemDAO := redis2.NewIdemDAO(cmdable) @@ -169,8 +170,9 @@ func InitEvaluatorApplication(ctx context.Context, idgen2 idgen.IIDGenerator, au rateLimiter := evaluator.NewRateLimiterImpl(ctx, limiterFactory, iConfiger) evaluatorDAO := mysql2.NewEvaluatorDAO(db2) evaluatorVersionDAO := mysql2.NewEvaluatorVersionDAO(db2) + evaluatorTagDAO := mysql2.NewEvaluatorTagDAO(db2) iLatestWriteTracker := platestwrite.NewLatestWriteTracker(cmdable) - iEvaluatorRepo := evaluator.NewEvaluatorRepo(idgen2, db2, evaluatorDAO, evaluatorVersionDAO, iLatestWriteTracker) + iEvaluatorRepo := evaluator.NewEvaluatorRepo(idgen2, db2, evaluatorDAO, evaluatorVersionDAO, evaluatorTagDAO, iLatestWriteTracker) evaluatorRecordDAO := mysql2.NewEvaluatorRecordDAO(db2) iEvaluatorRecordRepo := evaluator.NewEvaluatorRecordRepo(idgen2, db2, evaluatorRecordDAO) iIdemDAO := redis2.NewIdemDAO(cmdable) @@ -198,8 +200,11 @@ func InitEvaluatorApplication(ctx context.Context, idgen2 idgen.IIDGenerator, au iExptEvaluatorRefDAO := mysql.NewExptEvaluatorRefDAO(db2) iExperimentRepo := experiment.NewExptRepo(iExptDAO, iExptEvaluatorRefDAO, idgen2) evaluatorRecordService := service.NewEvaluatorRecordServiceImpl(idgen2, iEvaluatorRecordRepo, exptEventPublisher, evaluatorEventPublisher, userInfoService, iExperimentRepo) + evaluatorTemplateDAO := mysql2.NewEvaluatorTemplateDAO(db2) + evaluatorTemplateRepo := evaluator.NewEvaluatorTemplateRepo(evaluatorTagDAO, evaluatorTemplateDAO) + evaluatorTemplateService := service.NewEvaluatorTemplateService(evaluatorTemplateRepo) iFileProvider := foundation.NewFileRPCProvider(fileClient) - evaluationEvaluatorService := NewEvaluatorHandlerImpl(idgen2, iConfiger, iAuthProvider, evaluatorService, evaluatorRecordService, evaluatorExecMetrics, userInfoService, auditClient, benefitSvc, iFileProvider, v) + evaluationEvaluatorService := NewEvaluatorHandlerImpl(idgen2, iConfiger, iAuthProvider, evaluatorService, evaluatorRecordService, evaluatorTemplateService, evaluatorExecMetrics, userInfoService, auditClient, benefitSvc, iFileProvider, v) return evaluationEvaluatorService, nil } @@ -268,10 +273,10 @@ var ( evalAsyncRepoSet, ) - evaluatorDomainService = wire.NewSet(service.NewEvaluatorServiceImpl, service.NewEvaluatorRecordServiceImpl, NewEvaluatorSourceServices, llm.NewLLMRPCProvider, NewRuntimeFactory, + evaluatorDomainService = wire.NewSet(service.NewEvaluatorServiceImpl, service.NewEvaluatorRecordServiceImpl, service.NewEvaluatorTemplateService, NewEvaluatorSourceServices, llm.NewLLMRPCProvider, NewRuntimeFactory, NewRuntimeManagerFromFactory, NewSandboxConfig, - NewLogger, service.NewCodeBuilderFactory, evaluator.NewEvaluatorRepo, evaluator.NewEvaluatorRecordRepo, mysql2.NewEvaluatorDAO, mysql2.NewEvaluatorVersionDAO, mysql2.NewEvaluatorRecordDAO, evaluator.NewRateLimiterImpl, conf2.NewEvaluatorConfiger, evaluator2.NewEvaluatorMetrics, producer.NewEvaluatorEventPublisher, + NewLogger, service.NewCodeBuilderFactory, evaluator.NewEvaluatorRepo, evaluator.NewEvaluatorRecordRepo, evaluator.NewEvaluatorTemplateRepo, mysql2.NewEvaluatorDAO, mysql2.NewEvaluatorVersionDAO, mysql2.NewEvaluatorRecordDAO, mysql2.NewEvaluatorTemplateDAO, mysql2.NewEvaluatorTagDAO, evaluator.NewRateLimiterImpl, conf2.NewEvaluatorConfiger, evaluator2.NewEvaluatorMetrics, producer.NewEvaluatorEventPublisher, ) evaluatorSet = wire.NewSet( diff --git a/backend/modules/evaluation/consts/common.go b/backend/modules/evaluation/consts/common.go index cef1e6240..10bf33d0a 100644 --- a/backend/modules/evaluation/consts/common.go +++ b/backend/modules/evaluation/consts/common.go @@ -57,3 +57,9 @@ const ( MaxEvaluatorVersionLength = 50 MaxEvaluatorVersionDescLength = 200 ) + +const ( + // EvaluatorTagType 评估器标签类型 + EvaluatorTagTypeEvaluator int32 = 1 // 评估器标签 + EvaluatorTagTypeEvaluatorTemplate int32 = 2 // 评估器模板标签 +) diff --git a/backend/modules/evaluation/domain/entity/evaluator.go b/backend/modules/evaluation/domain/entity/evaluator.go index 88bdd1e54..281f4965b 100644 --- a/backend/modules/evaluation/domain/entity/evaluator.go +++ b/backend/modules/evaluation/domain/entity/evaluator.go @@ -13,6 +13,11 @@ type Evaluator struct { LatestVersion string BaseInfo *BaseInfo + Builtin bool + Benchmark string + Vendor string + Tags map[EvaluatorTagKey][]string `json:"tags"` + PromptEvaluatorVersion *PromptEvaluatorVersion CodeEvaluatorVersion *CodeEvaluatorVersion } diff --git a/backend/modules/evaluation/domain/entity/evaluator_tag.go b/backend/modules/evaluation/domain/entity/evaluator_tag.go new file mode 100644 index 000000000..b3c126a03 --- /dev/null +++ b/backend/modules/evaluation/domain/entity/evaluator_tag.go @@ -0,0 +1,156 @@ +package entity + +// EvaluatorTagKey Evaluator筛选字段 +type EvaluatorTagKey string + +const ( + EvaluatorTagKey_Category EvaluatorTagKey = "Category" // 类型筛选 (LLM/Code) + EvaluatorTagKey_TargetType EvaluatorTagKey = "TargetType" // 评估对象 (文本/图片/视频等) + EvaluatorTagKey_Objective EvaluatorTagKey = "Objective" // 评估目标 (任务完成/内容质量等) + EvaluatorTagKey_BusinessScenario EvaluatorTagKey = "BusinessScenario" // 业务场景 (安全风控/AI Coding等) + EvaluatorTagKey_BoxType EvaluatorTagKey = "BoxType" // 黑白盒类型 + EvaluatorTagKey_Name EvaluatorTagKey = "Name" // 评估器名称 + EvaluatorTagKey_Visible EvaluatorTagKey = "Visible" // 是否发布 +) + +type EvaluatorTagKeyType int32 + +const ( + EvaluatorTagKeyType_Evaluator EvaluatorTagKeyType = 1 // 评估器标签 + EvaluatorTagKeyType_EvaluatorTemplate EvaluatorTagKeyType = 2 // 评估器模板标签 +) + +// EvaluatorFilterOption Evaluator筛选器选项 +type EvaluatorFilterOption struct { + SearchKeyword *string `json:"search_keyword,omitempty"` // 模糊搜索关键词，在所有tag中搜索 + Filters *EvaluatorFilters `json:"filters,omitempty"` // 筛选条件 +} + +// EvaluatorFilters Evaluator筛选条件 +type EvaluatorFilters struct { + FilterConditions []*EvaluatorFilterCondition `json:"filter_conditions,omitempty"` // 筛选条件列表 + LogicOp *FilterLogicOp `json:"logic_op,omitempty"` // 逻辑操作符 +} + +// FilterLogicOp 筛选逻辑操作符 +type FilterLogicOp int32 + +const ( + FilterLogicOp_Unknown FilterLogicOp = 0 + FilterLogicOp_And FilterLogicOp = 1 // 与操作 + FilterLogicOp_Or FilterLogicOp = 2 // 或操作 +) + +// EvaluatorFilterCondition Evaluator筛选条件 +type EvaluatorFilterCondition struct { + TagKey EvaluatorTagKey `json:"tag_key"` // 筛选字段 + Operator EvaluatorFilterOperatorType `json:"operator"` // 操作符 + Value string `json:"value"` // 操作值 +} + +// EvaluatorFilterOperatorType Evaluator筛选操作符 +type EvaluatorFilterOperatorType int32 + +const ( + EvaluatorFilterOperatorType_Unknown EvaluatorFilterOperatorType = 0 + EvaluatorFilterOperatorType_Equal EvaluatorFilterOperatorType = 1 // 等于 + EvaluatorFilterOperatorType_NotEqual EvaluatorFilterOperatorType = 2 // 不等于 + EvaluatorFilterOperatorType_In EvaluatorFilterOperatorType = 3 // 包含于 + EvaluatorFilterOperatorType_NotIn EvaluatorFilterOperatorType = 4 // 不包含于 + EvaluatorFilterOperatorType_Like EvaluatorFilterOperatorType = 5 // 模糊匹配 + EvaluatorFilterOperatorType_IsNull EvaluatorFilterOperatorType = 6 // 为空 + EvaluatorFilterOperatorType_IsNotNull EvaluatorFilterOperatorType = 7 // 非空 +) + +// String 返回FilterLogicOp的字符串表示 +func (f FilterLogicOp) String() string { + switch f { + case FilterLogicOp_And: + return "AND" + case FilterLogicOp_Or: + return "OR" + default: + return "UNKNOWN" + } +} + +// String 返回EvaluatorFilterOperatorType的字符串表示 +func (e EvaluatorFilterOperatorType) String() string { + switch e { + case EvaluatorFilterOperatorType_Equal: + return "EQUAL" + case EvaluatorFilterOperatorType_NotEqual: + return "NOT_EQUAL" + case EvaluatorFilterOperatorType_In: + return "IN" + case EvaluatorFilterOperatorType_NotIn: + return "NOT_IN" + case EvaluatorFilterOperatorType_Like: + return "LIKE" + case EvaluatorFilterOperatorType_IsNull: + return "IS_NULL" + case EvaluatorFilterOperatorType_IsNotNull: + return "IS_NOT_NULL" + default: + return "UNKNOWN" + } +} + +// IsValid 检查FilterLogicOp是否有效 +func (f FilterLogicOp) IsValid() bool { + return f == FilterLogicOp_And || f == FilterLogicOp_Or +} + +// IsValid 检查EvaluatorFilterOperatorType是否有效 +func (e EvaluatorFilterOperatorType) IsValid() bool { + return e >= EvaluatorFilterOperatorType_Equal && e <= EvaluatorFilterOperatorType_IsNotNull +} + +// NewEvaluatorFilterOption 创建新的EvaluatorFilterOption +func NewEvaluatorFilterOption() *EvaluatorFilterOption { + return &EvaluatorFilterOption{} +} + +// WithSearchKeyword 设置搜索关键词 +func (f *EvaluatorFilterOption) WithSearchKeyword(keyword string) *EvaluatorFilterOption { + f.SearchKeyword = &keyword + return f +} + +// WithFilters 设置筛选条件 +func (f *EvaluatorFilterOption) WithFilters(filters *EvaluatorFilters) *EvaluatorFilterOption { + f.Filters = filters + return f +} + +// NewEvaluatorFilters 创建新的EvaluatorFilters +func NewEvaluatorFilters() *EvaluatorFilters { + logicOp := FilterLogicOp_And + return &EvaluatorFilters{ + LogicOp: &logicOp, // 默认为AND操作 + } +} + +// WithLogicOp 设置逻辑操作符 +func (f *EvaluatorFilters) WithLogicOp(logicOp FilterLogicOp) *EvaluatorFilters { + f.LogicOp = &logicOp + return f +} + +// AddCondition 添加筛选条件 +func (f *EvaluatorFilters) AddCondition(condition *EvaluatorFilterCondition) *EvaluatorFilters { + if f.FilterConditions == nil { + f.FilterConditions = make([]*EvaluatorFilterCondition, 0) + } + f.FilterConditions = append(f.FilterConditions, condition) + return f +} + +// NewEvaluatorFilterCondition 创建新的筛选条件 +func NewEvaluatorFilterCondition(tagKey EvaluatorTagKey, operator EvaluatorFilterOperatorType, value string) *EvaluatorFilterCondition { + return &EvaluatorFilterCondition{ + TagKey: tagKey, + Operator: operator, + Value: value, + } +} diff --git a/backend/modules/evaluation/domain/entity/evaluator_tag_test.go b/backend/modules/evaluation/domain/entity/evaluator_tag_test.go new file mode 100644 index 000000000..93d7d125a --- /dev/null +++ b/backend/modules/evaluation/domain/entity/evaluator_tag_test.go @@ -0,0 +1,170 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package entity + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestEvaluatorFilterOption(t *testing.T) { + t.Parallel() + + // 测试创建空的筛选选项 + option := NewEvaluatorFilterOption() + assert.NotNil(t, option) + assert.Nil(t, option.SearchKeyword) + assert.Nil(t, option.Filters) + + // 测试设置搜索关键词 + keyword := "test keyword" + option = NewEvaluatorFilterOption().WithSearchKeyword(keyword) + assert.NotNil(t, option.SearchKeyword) + assert.Equal(t, keyword, *option.SearchKeyword) + + // 测试设置筛选条件 + filters := NewEvaluatorFilters() + option = NewEvaluatorFilterOption().WithFilters(filters) + assert.NotNil(t, option.Filters) + assert.Equal(t, filters, option.Filters) +} + +func TestEvaluatorFilters(t *testing.T) { + t.Parallel() + + // 测试创建筛选器 + filters := NewEvaluatorFilters() + assert.NotNil(t, filters) + assert.NotNil(t, filters.LogicOp) + assert.Equal(t, FilterLogicOp_And, *filters.LogicOp) + assert.Empty(t, filters.FilterConditions) + + // 测试设置逻辑操作符 + filters = NewEvaluatorFilters().WithLogicOp(FilterLogicOp_Or) + assert.Equal(t, FilterLogicOp_Or, *filters.LogicOp) + + // 测试添加筛选条件 + condition1 := NewEvaluatorFilterCondition( + EvaluatorTagKey_Category, + EvaluatorFilterOperatorType_Equal, + "LLM", + ) + condition2 := NewEvaluatorFilterCondition( + EvaluatorTagKey_TargetType, + EvaluatorFilterOperatorType_In, + "Text,Image", + ) + + filters = NewEvaluatorFilters(). + AddCondition(condition1). + AddCondition(condition2) + + assert.Len(t, filters.FilterConditions, 2) + assert.Equal(t, condition1, filters.FilterConditions[0]) + assert.Equal(t, condition2, filters.FilterConditions[1]) +} + +func TestEvaluatorFilterCondition(t *testing.T) { + t.Parallel() + + // 测试创建筛选条件 + condition := NewEvaluatorFilterCondition( + EvaluatorTagKey_Category, + EvaluatorFilterOperatorType_Equal, + "LLM", + ) + + assert.Equal(t, EvaluatorTagKey_Category, condition.TagKey) + assert.Equal(t, EvaluatorFilterOperatorType_Equal, condition.Operator) + assert.Equal(t, "LLM", condition.Value) +} + +func TestFilterLogicOp(t *testing.T) { + t.Parallel() + + // 测试字符串表示 + assert.Equal(t, "AND", FilterLogicOp_And.String()) + assert.Equal(t, "OR", FilterLogicOp_Or.String()) + assert.Equal(t, "UNKNOWN", FilterLogicOp_Unknown.String()) + + // 测试有效性检查 + assert.True(t, FilterLogicOp_And.IsValid()) + assert.True(t, FilterLogicOp_Or.IsValid()) + assert.False(t, FilterLogicOp_Unknown.IsValid()) +} + +func TestEvaluatorFilterOperatorType(t *testing.T) { + t.Parallel() + + // 测试字符串表示 + assert.Equal(t, "EQUAL", EvaluatorFilterOperatorType_Equal.String()) + assert.Equal(t, "NOT_EQUAL", EvaluatorFilterOperatorType_NotEqual.String()) + assert.Equal(t, "IN", EvaluatorFilterOperatorType_In.String()) + assert.Equal(t, "NOT_IN", EvaluatorFilterOperatorType_NotIn.String()) + assert.Equal(t, "LIKE", EvaluatorFilterOperatorType_Like.String()) + assert.Equal(t, "IS_NULL", EvaluatorFilterOperatorType_IsNull.String()) + assert.Equal(t, "IS_NOT_NULL", EvaluatorFilterOperatorType_IsNotNull.String()) + assert.Equal(t, "UNKNOWN", EvaluatorFilterOperatorType_Unknown.String()) + + // 测试有效性检查 + assert.True(t, EvaluatorFilterOperatorType_Equal.IsValid()) + assert.True(t, EvaluatorFilterOperatorType_NotEqual.IsValid()) + assert.True(t, EvaluatorFilterOperatorType_In.IsValid()) + assert.True(t, EvaluatorFilterOperatorType_NotIn.IsValid()) + assert.True(t, EvaluatorFilterOperatorType_Like.IsValid()) + assert.True(t, EvaluatorFilterOperatorType_IsNull.IsValid()) + assert.True(t, EvaluatorFilterOperatorType_IsNotNull.IsValid()) + assert.False(t, EvaluatorFilterOperatorType_Unknown.IsValid()) +} + +func TestComplexFilterScenario(t *testing.T) { + t.Parallel() + + // 测试复杂筛选场景：搜索关键词 + 多个筛选条件 + keyword := "AI evaluation" + option := NewEvaluatorFilterOption(). + WithSearchKeyword(keyword). + WithFilters( + NewEvaluatorFilters(). + WithLogicOp(FilterLogicOp_And). + AddCondition(NewEvaluatorFilterCondition( + EvaluatorTagKey_Category, + EvaluatorFilterOperatorType_Equal, + "LLM", + )). + AddCondition(NewEvaluatorFilterCondition( + EvaluatorTagKey_TargetType, + EvaluatorFilterOperatorType_In, + "Text,Image", + )). + AddCondition(NewEvaluatorFilterCondition( + EvaluatorTagKey_Objective, + EvaluatorFilterOperatorType_Like, + "Quality", + )), + ) + + // 验证结果 + assert.NotNil(t, option) + assert.NotNil(t, option.SearchKeyword) + assert.Equal(t, keyword, *option.SearchKeyword) + assert.NotNil(t, option.Filters) + assert.Equal(t, FilterLogicOp_And, *option.Filters.LogicOp) + assert.Len(t, option.Filters.FilterConditions, 3) + + // 验证各个条件 + conditions := option.Filters.FilterConditions + assert.Equal(t, EvaluatorTagKey_Category, conditions[0].TagKey) + assert.Equal(t, EvaluatorFilterOperatorType_Equal, conditions[0].Operator) + assert.Equal(t, "LLM", conditions[0].Value) + + assert.Equal(t, EvaluatorTagKey_TargetType, conditions[1].TagKey) + assert.Equal(t, EvaluatorFilterOperatorType_In, conditions[1].Operator) + assert.Equal(t, "Text,Image", conditions[1].Value) + + assert.Equal(t, EvaluatorTagKey_Objective, conditions[2].TagKey) + assert.Equal(t, EvaluatorFilterOperatorType_Like, conditions[2].Operator) + assert.Equal(t, "Quality", conditions[2].Value) +} diff --git a/backend/modules/evaluation/domain/entity/evaluator_template.go b/backend/modules/evaluation/domain/entity/evaluator_template.go new file mode 100644 index 000000000..c93dfbd0d --- /dev/null +++ b/backend/modules/evaluation/domain/entity/evaluator_template.go @@ -0,0 +1,44 @@ +package entity + +type EvaluatorTemplate struct { + ID int64 + SpaceID int64 + Name string + Description string + EvaluatorType EvaluatorType + + Benchmark string + Vendor string + Popularity int64 + + InputSchemas []*ArgsSchema `json:"input_schemas"` + OutputSchemas []*ArgsSchema `json:"output_schemas"` + ReceiveChatHistory *bool `json:"receive_chat_history"` + Tags map[EvaluatorTagKey][]string `json:"tags"` + + PromptEvaluatorContent *PromptEvaluatorContent + CodeEvaluatorContent *CodeEvaluatorContent + + BaseInfo *BaseInfo `json:"base_info"` +} + +type PromptEvaluatorContent struct { + MessageList []*Message `json:"message_list"` + ModelConfig *ModelConfig `json:"model_config"` + Tools []*Tool `json:"tools"` + ParseType ParseType `json:"parse_type"` + PromptSuffix string `json:"prompt_suffix"` +} + +type CodeEvaluatorContent struct { + CodeContent string `json:"code_content"` + LanguageType LanguageType `json:"language_type"` +} + +func (do *EvaluatorTemplate) SetBaseInfo(baseInfo *BaseInfo) { + do.BaseInfo = baseInfo +} + +func (do *EvaluatorTemplate) GetBaseInfo() *BaseInfo { + return do.BaseInfo +} diff --git a/backend/modules/evaluation/domain/entity/param.go b/backend/modules/evaluation/domain/entity/param.go index d937505a6..5b15d0c74 100644 --- a/backend/modules/evaluation/domain/entity/param.go +++ b/backend/modules/evaluation/domain/entity/param.go @@ -133,14 +133,26 @@ type ExecuteEvalTargetParam struct { } type ListEvaluatorRequest struct { - SpaceID int64 `json:"space_id"` - SearchName string `json:"search_name,omitempty"` - CreatorIDs []int64 `json:"creator_ids,omitempty"` - EvaluatorType []EvaluatorType `json:"evaluator_type,omitempty"` - PageSize int32 `json:"page_size,omitempty"` - PageNum int32 `json:"page_num,omitempty"` - OrderBys []*OrderBy `json:"order_bys,omitempty"` - WithVersion bool `json:"with_version,omitempty"` + SpaceID int64 `json:"space_id"` + SearchName string `json:"search_name,omitempty"` + CreatorIDs []int64 `json:"creator_ids,omitempty"` + EvaluatorType []EvaluatorType `json:"evaluator_type,omitempty"` + FilterOption *EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 + PageSize int32 `json:"page_size,omitempty"` + PageNum int32 `json:"page_num,omitempty"` + OrderBys []*OrderBy `json:"order_bys,omitempty"` + WithVersion bool `json:"with_version,omitempty"` +} + +type ListBuiltinEvaluatorRequest struct { + SpaceID int64 `json:"space_id"` + SearchName string `json:"search_name,omitempty"` + CreatorIDs []int64 `json:"creator_ids,omitempty"` + EvaluatorType []EvaluatorType `json:"evaluator_type,omitempty"` + FilterOption *EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 + PageSize int32 `json:"page_size,omitempty"` + PageNum int32 `json:"page_num,omitempty"` + WithVersion bool `json:"with_version,omitempty"` } type ListEvaluatorVersionRequest struct { @@ -305,3 +317,87 @@ type DebugTargetParam struct { PatchyTarget *EvalTarget InputData *EvalTargetInputData } + +// CreateEvaluatorTemplateRequest 创建评估器模板请求 +type CreateEvaluatorTemplateRequest struct { + SpaceID int64 `json:"space_id" validate:"required,gt=0"` // 空间ID + Name string `json:"name" validate:"required,min=1,max=100"` // 模板名称 + Description string `json:"description" validate:"max=500"` // 模板描述 + EvaluatorType EvaluatorType `json:"evaluator_type" validate:"required"` // 评估器类型 + Benchmark string `json:"benchmark,omitempty" validate:"max=100"` // 基准 + Vendor string `json:"vendor,omitempty" validate:"max=100"` // 供应商 + InputSchemas []*ArgsSchema `json:"input_schemas,omitempty"` // 输入模式 + OutputSchemas []*ArgsSchema `json:"output_schemas,omitempty"` // 输出模式 + ReceiveChatHistory *bool `json:"receive_chat_history,omitempty"` // 是否接收聊天历史 + Tags map[EvaluatorTagKey][]string `json:"tags,omitempty"` // 标签 + + // 评估器内容 + PromptEvaluatorContent *PromptEvaluatorContent `json:"prompt_evaluator_content,omitempty"` // Prompt评估器内容 + CodeEvaluatorContent *CodeEvaluatorContent `json:"code_evaluator_content,omitempty"` // Code评估器内容 +} + +// CreateEvaluatorTemplateResponse 创建评估器模板响应 +type CreateEvaluatorTemplateResponse struct { + Template *EvaluatorTemplate `json:"template"` // 创建的模板 +} + +// UpdateEvaluatorTemplateRequest 更新评估器模板请求 +type UpdateEvaluatorTemplateRequest struct { + ID int64 `json:"id" validate:"required,gt=0"` // 模板ID + Name *string `json:"name,omitempty" validate:"omitempty,min=1,max=100"` // 模板名称 + Description *string `json:"description,omitempty" validate:"omitempty,max=500"` // 模板描述 + Benchmark *string `json:"benchmark,omitempty" validate:"omitempty,max=100"` // 基准 + Vendor *string `json:"vendor,omitempty" validate:"omitempty,max=100"` // 供应商 + InputSchemas []*ArgsSchema `json:"input_schemas,omitempty"` // 输入模式 + OutputSchemas []*ArgsSchema `json:"output_schemas,omitempty"` // 输出模式 + ReceiveChatHistory *bool `json:"receive_chat_history,omitempty"` // 是否接收聊天历史 + Tags map[EvaluatorTagKey][]string `json:"tags,omitempty"` // 标签 + + // 评估器内容 + PromptEvaluatorContent *PromptEvaluatorContent `json:"prompt_evaluator_content,omitempty"` // Prompt评估器内容 + CodeEvaluatorContent *CodeEvaluatorContent `json:"code_evaluator_content,omitempty"` // Code评估器内容 +} + +// UpdateEvaluatorTemplateResponse 更新评估器模板响应 +type UpdateEvaluatorTemplateResponse struct { + Template *EvaluatorTemplate `json:"template"` // 更新后的模板 +} + +// DeleteEvaluatorTemplateRequest 删除评估器模板请求 +type DeleteEvaluatorTemplateRequest struct { + ID int64 `json:"id" validate:"required,gt=0"` // 模板ID +} + +// DeleteEvaluatorTemplateResponse 删除评估器模板响应 +type DeleteEvaluatorTemplateResponse struct { + Success bool `json:"success"` // 删除是否成功 +} + +// GetEvaluatorTemplateRequest 获取评估器模板请求 +type GetEvaluatorTemplateRequest struct { + ID int64 `json:"id" validate:"required,gt=0"` // 模板ID + IncludeDeleted bool `json:"include_deleted,omitempty"` // 是否包含已删除记录 +} + +// GetEvaluatorTemplateResponse 获取评估器模板响应 +type GetEvaluatorTemplateResponse struct { + Template *EvaluatorTemplate `json:"template"` // 模板详情 +} + +// ListEvaluatorTemplateRequest 查询评估器模板列表请求 +type ListEvaluatorTemplateRequest struct { + SpaceID int64 `json:"space_id" validate:"required,gt=0"` // 空间ID + FilterOption *EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 + PageSize int32 `json:"page_size" validate:"required,min=1,max=100"` // 分页大小 + PageNum int32 `json:"page_num" validate:"required,min=1"` // 页码 + IncludeDeleted bool `json:"include_deleted,omitempty"` // 是否包含已删除记录 +} + +// ListEvaluatorTemplateResponse 查询评估器模板列表响应 +type ListEvaluatorTemplateResponse struct { + TotalCount int64 `json:"total_count"` // 总数量 + Templates []*EvaluatorTemplate `json:"templates"` // 模板列表 + PageSize int32 `json:"page_size"` // 分页大小 + PageNum int32 `json:"page_num"` // 页码 + TotalPages int32 `json:"total_pages"` // 总页数 +} diff --git a/backend/modules/evaluation/domain/repo/evaluator.go b/backend/modules/evaluation/domain/repo/evaluator.go index 4f33aa2be..29a7e791f 100644 --- a/backend/modules/evaluation/domain/repo/evaluator.go +++ b/backend/modules/evaluation/domain/repo/evaluator.go @@ -19,7 +19,9 @@ type IEvaluatorRepo interface { BatchDeleteEvaluator(ctx context.Context, ids []int64, userID string) error UpdateEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error + UpdateBuiltinEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error UpdateEvaluatorMeta(ctx context.Context, id int64, name, description, userID string) error + UpdateBuiltinEvaluatorMeta(ctx context.Context, id int64, name, description, benchmark, vendor, userID string) error BatchGetEvaluatorMetaByID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) BatchGetEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) @@ -30,6 +32,11 @@ type IEvaluatorRepo interface { CheckNameExist(ctx context.Context, spaceID, evaluatorID int64, name string) (bool, error) CheckVersionExist(ctx context.Context, evaluatorID int64, version string) (bool, error) + + // ListBuiltinEvaluator 根据筛选条件查询内置评估器列表，支持tag筛选和分页 + ListBuiltinEvaluator(ctx context.Context, req *ListBuiltinEvaluatorRequest) (*ListBuiltinEvaluatorResponse, error) + // BatchGetBuiltinEvaluatorByVersionID 批量根据版本ID获取内置评估器，包含tag信息 + BatchGetBuiltinEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) } type ListEvaluatorRequest struct { @@ -37,6 +44,7 @@ type ListEvaluatorRequest struct { SearchName string CreatorIDs []int64 EvaluatorType []entity.EvaluatorType + FilterOption *entity.EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 PageSize int32 PageNum int32 OrderBy []*entity.OrderBy @@ -59,3 +67,18 @@ type ListEvaluatorVersionResponse struct { TotalCount int64 Versions []*entity.Evaluator } + +// ListBuiltinEvaluatorRequest 查询内置评估器的请求参数 +type ListBuiltinEvaluatorRequest struct { + SpaceID int64 `json:"space_id"` + FilterOption *entity.EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 + PageSize int32 `json:"page_size"` // 分页大小 + PageNum int32 `json:"page_num"` // 页码 + IncludeDeleted bool `json:"include_deleted,omitempty"` // 是否包含已删除记录 +} + +// ListBuiltinEvaluatorResponse 查询内置评估器的响应 +type ListBuiltinEvaluatorResponse struct { + TotalCount int64 `json:"total_count"` // 总数量 + Evaluators []*entity.Evaluator `json:"evaluators"` // 评估器列表 +} diff --git a/backend/modules/evaluation/domain/repo/evaluator_template.go b/backend/modules/evaluation/domain/repo/evaluator_template.go new file mode 100644 index 000000000..5068e065c --- /dev/null +++ b/backend/modules/evaluation/domain/repo/evaluator_template.go @@ -0,0 +1,45 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package repo + +import ( + "context" + + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" +) + +// EvaluatorTemplateRepo 定义 EvaluatorTemplate 的 Repo 接口 +// +//go:generate mockgen -destination mocks/evaluator_template_mock.go -package=mocks . EvaluatorTemplateRepo +type EvaluatorTemplateRepo interface { + // CreateEvaluatorTemplate 创建评估器模板 + CreateEvaluatorTemplate(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) + + // UpdateEvaluatorTemplate 更新评估器模板 + UpdateEvaluatorTemplate(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) + + // DeleteEvaluatorTemplate 删除评估器模板（软删除） + DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string) error + + // GetEvaluatorTemplate 根据ID获取评估器模板 + GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool) (*entity.EvaluatorTemplate, error) + + // ListEvaluatorTemplate 根据筛选条件查询evaluator_template列表，支持tag筛选和分页 + ListEvaluatorTemplate(ctx context.Context, req *ListEvaluatorTemplateRequest) (*ListEvaluatorTemplateResponse, error) +} + +// ListEvaluatorTemplateRequest 查询evaluator_template的请求参数 +type ListEvaluatorTemplateRequest struct { + SpaceID int64 `json:"space_id"` + FilterOption *entity.EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 + PageSize int32 `json:"page_size"` // 分页大小 + PageNum int32 `json:"page_num"` // 页码 + IncludeDeleted bool `json:"include_deleted,omitempty"` // 是否包含已删除记录 +} + +// ListEvaluatorTemplateResponse 查询evaluator_template的响应 +type ListEvaluatorTemplateResponse struct { + TotalCount int64 `json:"total_count"` // 总数量 + Templates []*entity.EvaluatorTemplate `json:"templates"` // 模板列表 +} diff --git a/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go b/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go index 29a9ac313..0855ebcff 100644 --- a/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go +++ b/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo (interfaces: IEvaluatorRepo) +// +// Generated by this command: +// +// mockgen -destination mocks/evaluator_mock.go -package mocks . IEvaluatorRepo +// // Package mocks is a generated GoMock package. package mocks @@ -17,6 +22,7 @@ import ( type MockIEvaluatorRepo struct { ctrl *gomock.Controller recorder *MockIEvaluatorRepoMockRecorder + isgomock struct{} } // MockIEvaluatorRepoMockRecorder is the mock recorder for MockIEvaluatorRepo. @@ -37,192 +43,251 @@ func (m *MockIEvaluatorRepo) EXPECT() *MockIEvaluatorRepoMockRecorder { } // BatchDeleteEvaluator mocks base method. -func (m *MockIEvaluatorRepo) BatchDeleteEvaluator(arg0 context.Context, arg1 []int64, arg2 string) error { +func (m *MockIEvaluatorRepo) BatchDeleteEvaluator(ctx context.Context, ids []int64, userID string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BatchDeleteEvaluator", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "BatchDeleteEvaluator", ctx, ids, userID) ret0, _ := ret[0].(error) return ret0 } // BatchDeleteEvaluator indicates an expected call of BatchDeleteEvaluator. -func (mr *MockIEvaluatorRepoMockRecorder) BatchDeleteEvaluator(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) BatchDeleteEvaluator(ctx, ids, userID any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchDeleteEvaluator", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchDeleteEvaluator), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchDeleteEvaluator", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchDeleteEvaluator), ctx, ids, userID) +} + +// BatchGetBuiltinEvaluatorByVersionID mocks base method. +func (m *MockIEvaluatorRepo) BatchGetBuiltinEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "BatchGetBuiltinEvaluatorByVersionID", ctx, spaceID, ids, includeDeleted) + ret0, _ := ret[0].([]*entity.Evaluator) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// BatchGetBuiltinEvaluatorByVersionID indicates an expected call of BatchGetBuiltinEvaluatorByVersionID. +func (mr *MockIEvaluatorRepoMockRecorder) BatchGetBuiltinEvaluatorByVersionID(ctx, spaceID, ids, includeDeleted any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetBuiltinEvaluatorByVersionID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetBuiltinEvaluatorByVersionID), ctx, spaceID, ids, includeDeleted) } // BatchGetEvaluatorByVersionID mocks base method. -func (m *MockIEvaluatorRepo) BatchGetEvaluatorByVersionID(arg0 context.Context, arg1 *int64, arg2 []int64, arg3 bool) ([]*entity.Evaluator, error) { +func (m *MockIEvaluatorRepo) BatchGetEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BatchGetEvaluatorByVersionID", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "BatchGetEvaluatorByVersionID", ctx, spaceID, ids, includeDeleted) ret0, _ := ret[0].([]*entity.Evaluator) ret1, _ := ret[1].(error) return ret0, ret1 } // BatchGetEvaluatorByVersionID indicates an expected call of BatchGetEvaluatorByVersionID. -func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorByVersionID(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorByVersionID(ctx, spaceID, ids, includeDeleted any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorByVersionID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorByVersionID), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorByVersionID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorByVersionID), ctx, spaceID, ids, includeDeleted) } // BatchGetEvaluatorDraftByEvaluatorID mocks base method. -func (m *MockIEvaluatorRepo) BatchGetEvaluatorDraftByEvaluatorID(arg0 context.Context, arg1 int64, arg2 []int64, arg3 bool) ([]*entity.Evaluator, error) { +func (m *MockIEvaluatorRepo) BatchGetEvaluatorDraftByEvaluatorID(ctx context.Context, spaceID int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BatchGetEvaluatorDraftByEvaluatorID", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "BatchGetEvaluatorDraftByEvaluatorID", ctx, spaceID, ids, includeDeleted) ret0, _ := ret[0].([]*entity.Evaluator) ret1, _ := ret[1].(error) return ret0, ret1 } // BatchGetEvaluatorDraftByEvaluatorID indicates an expected call of BatchGetEvaluatorDraftByEvaluatorID. -func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorDraftByEvaluatorID(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorDraftByEvaluatorID(ctx, spaceID, ids, includeDeleted any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorDraftByEvaluatorID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorDraftByEvaluatorID), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorDraftByEvaluatorID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorDraftByEvaluatorID), ctx, spaceID, ids, includeDeleted) } // BatchGetEvaluatorMetaByID mocks base method. -func (m *MockIEvaluatorRepo) BatchGetEvaluatorMetaByID(arg0 context.Context, arg1 []int64, arg2 bool) ([]*entity.Evaluator, error) { +func (m *MockIEvaluatorRepo) BatchGetEvaluatorMetaByID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BatchGetEvaluatorMetaByID", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "BatchGetEvaluatorMetaByID", ctx, ids, includeDeleted) ret0, _ := ret[0].([]*entity.Evaluator) ret1, _ := ret[1].(error) return ret0, ret1 } // BatchGetEvaluatorMetaByID indicates an expected call of BatchGetEvaluatorMetaByID. -func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorMetaByID(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorMetaByID(ctx, ids, includeDeleted any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorMetaByID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorMetaByID), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorMetaByID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorMetaByID), ctx, ids, includeDeleted) } // BatchGetEvaluatorVersionsByEvaluatorIDs mocks base method. -func (m *MockIEvaluatorRepo) BatchGetEvaluatorVersionsByEvaluatorIDs(arg0 context.Context, arg1 []int64, arg2 bool) ([]*entity.Evaluator, error) { +func (m *MockIEvaluatorRepo) BatchGetEvaluatorVersionsByEvaluatorIDs(ctx context.Context, evaluatorIDs []int64, includeDeleted bool) ([]*entity.Evaluator, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BatchGetEvaluatorVersionsByEvaluatorIDs", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "BatchGetEvaluatorVersionsByEvaluatorIDs", ctx, evaluatorIDs, includeDeleted) ret0, _ := ret[0].([]*entity.Evaluator) ret1, _ := ret[1].(error) return ret0, ret1 } // BatchGetEvaluatorVersionsByEvaluatorIDs indicates an expected call of BatchGetEvaluatorVersionsByEvaluatorIDs. -func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorVersionsByEvaluatorIDs(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorVersionsByEvaluatorIDs(ctx, evaluatorIDs, includeDeleted any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorVersionsByEvaluatorIDs", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorVersionsByEvaluatorIDs), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorVersionsByEvaluatorIDs", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorVersionsByEvaluatorIDs), ctx, evaluatorIDs, includeDeleted) } // CheckNameExist mocks base method. -func (m *MockIEvaluatorRepo) CheckNameExist(arg0 context.Context, arg1, arg2 int64, arg3 string) (bool, error) { +func (m *MockIEvaluatorRepo) CheckNameExist(ctx context.Context, spaceID, evaluatorID int64, name string) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CheckNameExist", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "CheckNameExist", ctx, spaceID, evaluatorID, name) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // CheckNameExist indicates an expected call of CheckNameExist. -func (mr *MockIEvaluatorRepoMockRecorder) CheckNameExist(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) CheckNameExist(ctx, spaceID, evaluatorID, name any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckNameExist", reflect.TypeOf((*MockIEvaluatorRepo)(nil).CheckNameExist), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckNameExist", reflect.TypeOf((*MockIEvaluatorRepo)(nil).CheckNameExist), ctx, spaceID, evaluatorID, name) } // CheckVersionExist mocks base method. -func (m *MockIEvaluatorRepo) CheckVersionExist(arg0 context.Context, arg1 int64, arg2 string) (bool, error) { +func (m *MockIEvaluatorRepo) CheckVersionExist(ctx context.Context, evaluatorID int64, version string) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CheckVersionExist", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "CheckVersionExist", ctx, evaluatorID, version) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // CheckVersionExist indicates an expected call of CheckVersionExist. -func (mr *MockIEvaluatorRepoMockRecorder) CheckVersionExist(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) CheckVersionExist(ctx, evaluatorID, version any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckVersionExist", reflect.TypeOf((*MockIEvaluatorRepo)(nil).CheckVersionExist), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckVersionExist", reflect.TypeOf((*MockIEvaluatorRepo)(nil).CheckVersionExist), ctx, evaluatorID, version) } + // CreateEvaluator mocks base method. -func (m *MockIEvaluatorRepo) CreateEvaluator(arg0 context.Context, arg1 *entity.Evaluator) (int64, error) { +func (m *MockIEvaluatorRepo) CreateEvaluator(ctx context.Context, evaluator *entity.Evaluator) (int64, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateEvaluator", arg0, arg1) + ret := m.ctrl.Call(m, "CreateEvaluator", ctx, evaluator) ret0, _ := ret[0].(int64) ret1, _ := ret[1].(error) return ret0, ret1 } // CreateEvaluator indicates an expected call of CreateEvaluator. -func (mr *MockIEvaluatorRepoMockRecorder) CreateEvaluator(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) CreateEvaluator(ctx, evaluator any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateEvaluator", reflect.TypeOf((*MockIEvaluatorRepo)(nil).CreateEvaluator), ctx, evaluator) +} + +// ListBuiltinEvaluator mocks base method. +func (m *MockIEvaluatorRepo) ListBuiltinEvaluator(ctx context.Context, req *repo.ListBuiltinEvaluatorRequest) (*repo.ListBuiltinEvaluatorResponse, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "ListBuiltinEvaluator", ctx, req) + ret0, _ := ret[0].(*repo.ListBuiltinEvaluatorResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// ListBuiltinEvaluator indicates an expected call of ListBuiltinEvaluator. +func (mr *MockIEvaluatorRepoMockRecorder) ListBuiltinEvaluator(ctx, req any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateEvaluator", reflect.TypeOf((*MockIEvaluatorRepo)(nil).CreateEvaluator), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBuiltinEvaluator", reflect.TypeOf((*MockIEvaluatorRepo)(nil).ListBuiltinEvaluator), ctx, req) } // ListEvaluator mocks base method. -func (m *MockIEvaluatorRepo) ListEvaluator(arg0 context.Context, arg1 *repo.ListEvaluatorRequest) (*repo.ListEvaluatorResponse, error) { +func (m *MockIEvaluatorRepo) ListEvaluator(ctx context.Context, req *repo.ListEvaluatorRequest) (*repo.ListEvaluatorResponse, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ListEvaluator", arg0, arg1) + ret := m.ctrl.Call(m, "ListEvaluator", ctx, req) ret0, _ := ret[0].(*repo.ListEvaluatorResponse) ret1, _ := ret[1].(error) return ret0, ret1 } // ListEvaluator indicates an expected call of ListEvaluator. -func (mr *MockIEvaluatorRepoMockRecorder) ListEvaluator(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) ListEvaluator(ctx, req any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluator", reflect.TypeOf((*MockIEvaluatorRepo)(nil).ListEvaluator), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluator", reflect.TypeOf((*MockIEvaluatorRepo)(nil).ListEvaluator), ctx, req) } // ListEvaluatorVersion mocks base method. -func (m *MockIEvaluatorRepo) ListEvaluatorVersion(arg0 context.Context, arg1 *repo.ListEvaluatorVersionRequest) (*repo.ListEvaluatorVersionResponse, error) { +func (m *MockIEvaluatorRepo) ListEvaluatorVersion(ctx context.Context, req *repo.ListEvaluatorVersionRequest) (*repo.ListEvaluatorVersionResponse, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ListEvaluatorVersion", arg0, arg1) + ret := m.ctrl.Call(m, "ListEvaluatorVersion", ctx, req) ret0, _ := ret[0].(*repo.ListEvaluatorVersionResponse) ret1, _ := ret[1].(error) return ret0, ret1 } // ListEvaluatorVersion indicates an expected call of ListEvaluatorVersion. -func (mr *MockIEvaluatorRepoMockRecorder) ListEvaluatorVersion(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) ListEvaluatorVersion(ctx, req any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluatorVersion", reflect.TypeOf((*MockIEvaluatorRepo)(nil).ListEvaluatorVersion), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluatorVersion", reflect.TypeOf((*MockIEvaluatorRepo)(nil).ListEvaluatorVersion), ctx, req) } // SubmitEvaluatorVersion mocks base method. -func (m *MockIEvaluatorRepo) SubmitEvaluatorVersion(arg0 context.Context, arg1 *entity.Evaluator) error { +func (m *MockIEvaluatorRepo) SubmitEvaluatorVersion(ctx context.Context, evaluatorVersionDO *entity.Evaluator) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SubmitEvaluatorVersion", arg0, arg1) + ret := m.ctrl.Call(m, "SubmitEvaluatorVersion", ctx, evaluatorVersionDO) ret0, _ := ret[0].(error) return ret0 } // SubmitEvaluatorVersion indicates an expected call of SubmitEvaluatorVersion. -func (mr *MockIEvaluatorRepoMockRecorder) SubmitEvaluatorVersion(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) SubmitEvaluatorVersion(ctx, evaluatorVersionDO any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitEvaluatorVersion", reflect.TypeOf((*MockIEvaluatorRepo)(nil).SubmitEvaluatorVersion), ctx, evaluatorVersionDO) +} + +// UpdateBuiltinEvaluatorDraft mocks base method. +func (m *MockIEvaluatorRepo) UpdateBuiltinEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "UpdateBuiltinEvaluatorDraft", ctx, version) + ret0, _ := ret[0].(error) + return ret0 +} + +// UpdateBuiltinEvaluatorDraft indicates an expected call of UpdateBuiltinEvaluatorDraft. +func (mr *MockIEvaluatorRepoMockRecorder) UpdateBuiltinEvaluatorDraft(ctx, version any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateBuiltinEvaluatorDraft", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateBuiltinEvaluatorDraft), ctx, version) +} + +// UpdateBuiltinEvaluatorMeta mocks base method. +func (m *MockIEvaluatorRepo) UpdateBuiltinEvaluatorMeta(ctx context.Context, id int64, name, description, benchmark, vendor, userID string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "UpdateBuiltinEvaluatorMeta", ctx, id, name, description, benchmark, vendor, userID) + ret0, _ := ret[0].(error) + return ret0 +} + +// UpdateBuiltinEvaluatorMeta indicates an expected call of UpdateBuiltinEvaluatorMeta. +func (mr *MockIEvaluatorRepoMockRecorder) UpdateBuiltinEvaluatorMeta(ctx, id, name, description, benchmark, vendor, userID any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitEvaluatorVersion", reflect.TypeOf((*MockIEvaluatorRepo)(nil).SubmitEvaluatorVersion), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateBuiltinEvaluatorMeta", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateBuiltinEvaluatorMeta), ctx, id, name, description, benchmark, vendor, userID) } // UpdateEvaluatorDraft mocks base method. -func (m *MockIEvaluatorRepo) UpdateEvaluatorDraft(arg0 context.Context, arg1 *entity.Evaluator) error { +func (m *MockIEvaluatorRepo) UpdateEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateEvaluatorDraft", arg0, arg1) + ret := m.ctrl.Call(m, "UpdateEvaluatorDraft", ctx, version) ret0, _ := ret[0].(error) return ret0 } // UpdateEvaluatorDraft indicates an expected call of UpdateEvaluatorDraft. -func (mr *MockIEvaluatorRepoMockRecorder) UpdateEvaluatorDraft(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) UpdateEvaluatorDraft(ctx, version any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorDraft", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateEvaluatorDraft), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorDraft", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateEvaluatorDraft), ctx, version) } // UpdateEvaluatorMeta mocks base method. -func (m *MockIEvaluatorRepo) UpdateEvaluatorMeta(arg0 context.Context, arg1 int64, arg2, arg3, arg4 string) error { +func (m *MockIEvaluatorRepo) UpdateEvaluatorMeta(ctx context.Context, id int64, name, description, userID string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateEvaluatorMeta", arg0, arg1, arg2, arg3, arg4) + ret := m.ctrl.Call(m, "UpdateEvaluatorMeta", ctx, id, name, description, userID) ret0, _ := ret[0].(error) return ret0 } // UpdateEvaluatorMeta indicates an expected call of UpdateEvaluatorMeta. -func (mr *MockIEvaluatorRepoMockRecorder) UpdateEvaluatorMeta(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) UpdateEvaluatorMeta(ctx, id, name, description, userID any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorMeta", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateEvaluatorMeta), arg0, arg1, arg2, arg3, arg4) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorMeta", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateEvaluatorMeta), ctx, id, name, description, userID) } diff --git a/backend/modules/evaluation/domain/repo/mocks/evaluator_record_mock.go b/backend/modules/evaluation/domain/repo/mocks/evaluator_record_mock.go index 30bd9b3a2..e0ca5d9e1 100644 --- a/backend/modules/evaluation/domain/repo/mocks/evaluator_record_mock.go +++ b/backend/modules/evaluation/domain/repo/mocks/evaluator_record_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo (interfaces: IEvaluatorRecordRepo) +// +// Generated by this command: +// +// mockgen -destination mocks/evaluator_record_mock.go -package mocks . IEvaluatorRecordRepo +// // Package mocks is a generated GoMock package. package mocks @@ -16,6 +21,7 @@ import ( type MockIEvaluatorRecordRepo struct { ctrl *gomock.Controller recorder *MockIEvaluatorRecordRepoMockRecorder + isgomock struct{} } // MockIEvaluatorRecordRepoMockRecorder is the mock recorder for MockIEvaluatorRecordRepo. @@ -36,59 +42,59 @@ func (m *MockIEvaluatorRecordRepo) EXPECT() *MockIEvaluatorRecordRepoMockRecorde } // BatchGetEvaluatorRecord mocks base method. -func (m *MockIEvaluatorRecordRepo) BatchGetEvaluatorRecord(arg0 context.Context, arg1 []int64, arg2 bool) ([]*entity.EvaluatorRecord, error) { +func (m *MockIEvaluatorRecordRepo) BatchGetEvaluatorRecord(ctx context.Context, evaluatorRecordIDs []int64, includeDeleted bool) ([]*entity.EvaluatorRecord, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BatchGetEvaluatorRecord", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "BatchGetEvaluatorRecord", ctx, evaluatorRecordIDs, includeDeleted) ret0, _ := ret[0].([]*entity.EvaluatorRecord) ret1, _ := ret[1].(error) return ret0, ret1 } // BatchGetEvaluatorRecord indicates an expected call of BatchGetEvaluatorRecord. -func (mr *MockIEvaluatorRecordRepoMockRecorder) BatchGetEvaluatorRecord(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRecordRepoMockRecorder) BatchGetEvaluatorRecord(ctx, evaluatorRecordIDs, includeDeleted any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorRecord", reflect.TypeOf((*MockIEvaluatorRecordRepo)(nil).BatchGetEvaluatorRecord), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorRecord", reflect.TypeOf((*MockIEvaluatorRecordRepo)(nil).BatchGetEvaluatorRecord), ctx, evaluatorRecordIDs, includeDeleted) } // CorrectEvaluatorRecord mocks base method. -func (m *MockIEvaluatorRecordRepo) CorrectEvaluatorRecord(arg0 context.Context, arg1 *entity.EvaluatorRecord) error { +func (m *MockIEvaluatorRecordRepo) CorrectEvaluatorRecord(ctx context.Context, evaluatorRecordDO *entity.EvaluatorRecord) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CorrectEvaluatorRecord", arg0, arg1) + ret := m.ctrl.Call(m, "CorrectEvaluatorRecord", ctx, evaluatorRecordDO) ret0, _ := ret[0].(error) return ret0 } // CorrectEvaluatorRecord indicates an expected call of CorrectEvaluatorRecord. -func (mr *MockIEvaluatorRecordRepoMockRecorder) CorrectEvaluatorRecord(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRecordRepoMockRecorder) CorrectEvaluatorRecord(ctx, evaluatorRecordDO any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CorrectEvaluatorRecord", reflect.TypeOf((*MockIEvaluatorRecordRepo)(nil).CorrectEvaluatorRecord), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CorrectEvaluatorRecord", reflect.TypeOf((*MockIEvaluatorRecordRepo)(nil).CorrectEvaluatorRecord), ctx, evaluatorRecordDO) } // CreateEvaluatorRecord mocks base method. -func (m *MockIEvaluatorRecordRepo) CreateEvaluatorRecord(arg0 context.Context, arg1 *entity.EvaluatorRecord) error { +func (m *MockIEvaluatorRecordRepo) CreateEvaluatorRecord(ctx context.Context, evaluatorRecord *entity.EvaluatorRecord) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateEvaluatorRecord", arg0, arg1) + ret := m.ctrl.Call(m, "CreateEvaluatorRecord", ctx, evaluatorRecord) ret0, _ := ret[0].(error) return ret0 } // CreateEvaluatorRecord indicates an expected call of CreateEvaluatorRecord. -func (mr *MockIEvaluatorRecordRepoMockRecorder) CreateEvaluatorRecord(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRecordRepoMockRecorder) CreateEvaluatorRecord(ctx, evaluatorRecord any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateEvaluatorRecord", reflect.TypeOf((*MockIEvaluatorRecordRepo)(nil).CreateEvaluatorRecord), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateEvaluatorRecord", reflect.TypeOf((*MockIEvaluatorRecordRepo)(nil).CreateEvaluatorRecord), ctx, evaluatorRecord) } // GetEvaluatorRecord mocks base method. -func (m *MockIEvaluatorRecordRepo) GetEvaluatorRecord(arg0 context.Context, arg1 int64, arg2 bool) (*entity.EvaluatorRecord, error) { +func (m *MockIEvaluatorRecordRepo) GetEvaluatorRecord(ctx context.Context, evaluatorRecordID int64, includeDeleted bool) (*entity.EvaluatorRecord, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetEvaluatorRecord", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "GetEvaluatorRecord", ctx, evaluatorRecordID, includeDeleted) ret0, _ := ret[0].(*entity.EvaluatorRecord) ret1, _ := ret[1].(error) return ret0, ret1 } // GetEvaluatorRecord indicates an expected call of GetEvaluatorRecord. -func (mr *MockIEvaluatorRecordRepoMockRecorder) GetEvaluatorRecord(arg0, arg1, arg2 interface{}) *gomock.Call { +func (mr *MockIEvaluatorRecordRepoMockRecorder) GetEvaluatorRecord(ctx, evaluatorRecordID, includeDeleted any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorRecord", reflect.TypeOf((*MockIEvaluatorRecordRepo)(nil).GetEvaluatorRecord), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorRecord", reflect.TypeOf((*MockIEvaluatorRecordRepo)(nil).GetEvaluatorRecord), ctx, evaluatorRecordID, includeDeleted) } diff --git a/backend/modules/evaluation/domain/repo/mocks/evaluator_template_mock.go b/backend/modules/evaluation/domain/repo/mocks/evaluator_template_mock.go new file mode 100644 index 000000000..2480e19ff --- /dev/null +++ b/backend/modules/evaluation/domain/repo/mocks/evaluator_template_mock.go @@ -0,0 +1,117 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo (interfaces: EvaluatorTemplateRepo) +// +// Generated by this command: +// +// mockgen -destination mocks/evaluator_template_mock.go -package=mocks . EvaluatorTemplateRepo +// + +// Package mocks is a generated GoMock package. +package mocks + +import ( + context "context" + reflect "reflect" + + entity "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + repo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" + gomock "go.uber.org/mock/gomock" +) + +// MockEvaluatorTemplateRepo is a mock of EvaluatorTemplateRepo interface. +type MockEvaluatorTemplateRepo struct { + ctrl *gomock.Controller + recorder *MockEvaluatorTemplateRepoMockRecorder + isgomock struct{} +} + +// MockEvaluatorTemplateRepoMockRecorder is the mock recorder for MockEvaluatorTemplateRepo. +type MockEvaluatorTemplateRepoMockRecorder struct { + mock *MockEvaluatorTemplateRepo +} + +// NewMockEvaluatorTemplateRepo creates a new mock instance. +func NewMockEvaluatorTemplateRepo(ctrl *gomock.Controller) *MockEvaluatorTemplateRepo { + mock := &MockEvaluatorTemplateRepo{ctrl: ctrl} + mock.recorder = &MockEvaluatorTemplateRepoMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockEvaluatorTemplateRepo) EXPECT() *MockEvaluatorTemplateRepoMockRecorder { + return m.recorder +} + +// CreateEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateRepo) CreateEvaluatorTemplate(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateEvaluatorTemplate", ctx, template) + ret0, _ := ret[0].(*entity.EvaluatorTemplate) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateEvaluatorTemplate indicates an expected call of CreateEvaluatorTemplate. +func (mr *MockEvaluatorTemplateRepoMockRecorder) CreateEvaluatorTemplate(ctx, template any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateRepo)(nil).CreateEvaluatorTemplate), ctx, template) +} + +// DeleteEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateRepo) DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DeleteEvaluatorTemplate", ctx, id, userID) + ret0, _ := ret[0].(error) + return ret0 +} + +// DeleteEvaluatorTemplate indicates an expected call of DeleteEvaluatorTemplate. +func (mr *MockEvaluatorTemplateRepoMockRecorder) DeleteEvaluatorTemplate(ctx, id, userID any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateRepo)(nil).DeleteEvaluatorTemplate), ctx, id, userID) +} + +// GetEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateRepo) GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool) (*entity.EvaluatorTemplate, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetEvaluatorTemplate", ctx, id, includeDeleted) + ret0, _ := ret[0].(*entity.EvaluatorTemplate) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetEvaluatorTemplate indicates an expected call of GetEvaluatorTemplate. +func (mr *MockEvaluatorTemplateRepoMockRecorder) GetEvaluatorTemplate(ctx, id, includeDeleted any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateRepo)(nil).GetEvaluatorTemplate), ctx, id, includeDeleted) +} + +// ListEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateRepo) ListEvaluatorTemplate(ctx context.Context, req *repo.ListEvaluatorTemplateRequest) (*repo.ListEvaluatorTemplateResponse, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "ListEvaluatorTemplate", ctx, req) + ret0, _ := ret[0].(*repo.ListEvaluatorTemplateResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// ListEvaluatorTemplate indicates an expected call of ListEvaluatorTemplate. +func (mr *MockEvaluatorTemplateRepoMockRecorder) ListEvaluatorTemplate(ctx, req any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateRepo)(nil).ListEvaluatorTemplate), ctx, req) +} + +// UpdateEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateRepo) UpdateEvaluatorTemplate(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "UpdateEvaluatorTemplate", ctx, template) + ret0, _ := ret[0].(*entity.EvaluatorTemplate) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// UpdateEvaluatorTemplate indicates an expected call of UpdateEvaluatorTemplate. +func (mr *MockEvaluatorTemplateRepoMockRecorder) UpdateEvaluatorTemplate(ctx, template any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateRepo)(nil).UpdateEvaluatorTemplate), ctx, template) +} diff --git a/backend/modules/evaluation/domain/repo/mocks/ratelimiter_mock.go b/backend/modules/evaluation/domain/repo/mocks/ratelimiter_mock.go index 4303f9745..55d4b8839 100644 --- a/backend/modules/evaluation/domain/repo/mocks/ratelimiter_mock.go +++ b/backend/modules/evaluation/domain/repo/mocks/ratelimiter_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo (interfaces: RateLimiter) +// +// Generated by this command: +// +// mockgen -destination mocks/ratelimiter_mock.go -package mocks . RateLimiter +// // Package mocks is a generated GoMock package. package mocks @@ -15,6 +20,7 @@ import ( type MockRateLimiter struct { ctrl *gomock.Controller recorder *MockRateLimiterMockRecorder + isgomock struct{} } // MockRateLimiterMockRecorder is the mock recorder for MockRateLimiter. @@ -35,15 +41,15 @@ func (m *MockRateLimiter) EXPECT() *MockRateLimiterMockRecorder { } // AllowInvoke mocks base method. -func (m *MockRateLimiter) AllowInvoke(arg0 context.Context, arg1 int64) bool { +func (m *MockRateLimiter) AllowInvoke(ctx context.Context, spaceID int64) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AllowInvoke", arg0, arg1) + ret := m.ctrl.Call(m, "AllowInvoke", ctx, spaceID) ret0, _ := ret[0].(bool) return ret0 } // AllowInvoke indicates an expected call of AllowInvoke. -func (mr *MockRateLimiterMockRecorder) AllowInvoke(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockRateLimiterMockRecorder) AllowInvoke(ctx, spaceID any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllowInvoke", reflect.TypeOf((*MockRateLimiter)(nil).AllowInvoke), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllowInvoke", reflect.TypeOf((*MockRateLimiter)(nil).AllowInvoke), ctx, spaceID) } diff --git a/backend/modules/evaluation/domain/service/evaluator.go b/backend/modules/evaluation/domain/service/evaluator.go index 1dfd18c39..3ffca720c 100644 --- a/backend/modules/evaluation/domain/service/evaluator.go +++ b/backend/modules/evaluation/domain/service/evaluator.go @@ -13,6 +13,8 @@ import ( type EvaluatorService interface { // ListEvaluator 按查询条件查询 evaluator_version ListEvaluator(ctx context.Context, request *entity.ListEvaluatorRequest) ([]*entity.Evaluator, int64, error) + // ListBuiltinEvaluator 查询内置评估器 + ListBuiltinEvaluator(ctx context.Context, request *entity.ListBuiltinEvaluatorRequest) ([]*entity.Evaluator, int64, error) // BatchGetEvaluator 按 id 批量查询 evaluator_version BatchGetEvaluator(ctx context.Context, spaceID int64, evaluatorIDs []int64, includeDeleted bool) ([]*entity.Evaluator, error) // GetEvaluator 按 id 单个查询 evaluator_version @@ -21,16 +23,21 @@ type EvaluatorService interface { CreateEvaluator(ctx context.Context, evaluator *entity.Evaluator, cid string) (int64, error) // UpdateEvaluatorMeta 修改 evaluator_version UpdateEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, userID string) error + // UpdateBuiltinEvaluatorMeta 修改内置评估器元信息（包含benchmark/vendor） + UpdateBuiltinEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, benchmark, vendor, userID string) error // UpdateEvaluatorDraft 修改 evaluator_version draft UpdateEvaluatorDraft(ctx context.Context, versionDO *entity.Evaluator) error + // UpdateBuiltinEvaluatorDraft 修改内置评估器草稿，包括tag的增量更新 + UpdateBuiltinEvaluatorDraft(ctx context.Context, versionDO *entity.Evaluator) error // DeleteEvaluator 删除 evaluator_version DeleteEvaluator(ctx context.Context, evaluatorIDs []int64, userID string) error // RunEvaluator evaluator_version 运行 RunEvaluator(ctx context.Context, request *entity.RunEvaluatorRequest) (*entity.EvaluatorRecord, error) // DebugEvaluator 调试 evaluator_version DebugEvaluator(ctx context.Context, evaluatorDO *entity.Evaluator, inputData *entity.EvaluatorInputData) (*entity.EvaluatorOutputData, error) - // GetEvaluatorVersion 按 version id 单个查询 evaluator_version version - GetEvaluatorVersion(ctx context.Context, evaluatorVersionID int64, includeDeleted bool) (*entity.Evaluator, error) + // GetEvaluatorVersion 按 version id 单个查询 evaluator_version version + // builtin=true 时查询内置评估器，需传入 spaceID；否则查询普通评估器 + GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, builtin bool) (*entity.Evaluator, error) // BatchGetEvaluatorVersion 按 version id 批量查询 evaluator_version version BatchGetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionIDs []int64, includeDeleted bool) ([]*entity.Evaluator, error) // ListEvaluatorVersion 按条件查询 evaluator_version version diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index c8e93738a..7d624ab8a 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -122,11 +122,12 @@ func (e *EvaluatorServiceImpl) ListEvaluator(ctx context.Context, request *entit func buildListEvaluatorRequest(ctx context.Context, request *entity.ListEvaluatorRequest) (*repo.ListEvaluatorRequest, error) { // 转换请求参数为repo层结构 req := &repo.ListEvaluatorRequest{ - SpaceID: request.SpaceID, - SearchName: request.SearchName, - CreatorIDs: request.CreatorIDs, - PageSize: request.PageSize, - PageNum: request.PageNum, + SpaceID: request.SpaceID, + SearchName: request.SearchName, + CreatorIDs: request.CreatorIDs, + FilterOption: request.FilterOption, // 传递FilterOption + PageSize: request.PageSize, + PageNum: request.PageNum, } evaluatorType := make([]entity.EvaluatorType, 0, len(request.EvaluatorType)) evaluatorType = append(evaluatorType, request.EvaluatorType...) @@ -200,6 +201,10 @@ func (e *EvaluatorServiceImpl) makeCreateIdemKey(cid string) string { return consts.IdemKeyCreateEvaluator + cid } +func (e *EvaluatorServiceImpl) makeCreateBuiltinIdemKey(cid string) string { + return consts.IdemKeyCreateEvaluator + "_builtin_" + cid +} + // 校验CreateEvaluator参数合法性 func (e *EvaluatorServiceImpl) validateCreateEvaluatorRequest(ctx context.Context, evaluator *entity.Evaluator) error { // 校验参数是否为空 @@ -235,6 +240,24 @@ func (e *EvaluatorServiceImpl) UpdateEvaluatorMeta(ctx context.Context, id, spac return nil } +// UpdateBuiltinEvaluatorMeta 修改内置评估器元信息（包含benchmark/vendor） +func (e *EvaluatorServiceImpl) UpdateBuiltinEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, benchmark, vendor, userID string) error { + // 仅当修改了名称时校验重名；description/benchmark/vendor 不需要重名校验 + if name != "" { + exist, err := e.evaluatorRepo.CheckNameExist(ctx, spaceID, id, name) + if err != nil { + return err + } + if exist { + return errorx.NewByCode(errno.EvaluatorNameExistCode) + } + } + if err := e.evaluatorRepo.UpdateBuiltinEvaluatorMeta(ctx, id, name, description, benchmark, vendor, userID); err != nil { + return err + } + return nil +} + // 校验UpdateEvaluator参数合法性 func (e *EvaluatorServiceImpl) validateUpdateEvaluatorMetaRequest(ctx context.Context, id, spaceID int64, name string) error { // 校验评估器名称是否已存在 @@ -260,6 +283,16 @@ func (e *EvaluatorServiceImpl) UpdateEvaluatorDraft(ctx context.Context, version return e.evaluatorRepo.UpdateEvaluatorDraft(ctx, versionDO) } +// UpdateBuiltinEvaluatorDraft 修改内置评估器草稿，包括tag的增量更新 +func (e *EvaluatorServiceImpl) UpdateBuiltinEvaluatorDraft(ctx context.Context, versionDO *entity.Evaluator) error { + versionDO.BaseInfo.SetUpdatedAt(gptr.Of(time.Now().UnixMilli())) + userIDInContext := session.UserIDInCtxOrEmpty(ctx) + versionDO.BaseInfo.SetUpdatedBy(&entity.UserInfo{ + UserID: gptr.Of(userIDInContext), + }) + return e.evaluatorRepo.UpdateBuiltinEvaluatorDraft(ctx, versionDO) +} + // DeleteEvaluator 删除 evaluator_version func (e *EvaluatorServiceImpl) DeleteEvaluator(ctx context.Context, evaluatorIDs []int64, userID string) error { return e.evaluatorRepo.BatchDeleteEvaluator(ctx, evaluatorIDs, userID) @@ -312,9 +345,15 @@ func buildListEvaluatorVersionRequest(ctx context.Context, request *entity.ListE } // GetEvaluatorVersion 按 id 和版本号单个查询 evaluator_version version -func (e *EvaluatorServiceImpl) GetEvaluatorVersion(ctx context.Context, evaluatorVersionID int64, includeDeleted bool) (*entity.Evaluator, error) { - // 获取 evaluator_version 元信息和版本内容 - evaluatorDOList, err := e.evaluatorRepo.BatchGetEvaluatorByVersionID(ctx, nil, []int64{evaluatorVersionID}, includeDeleted) +func (e *EvaluatorServiceImpl) GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, builtin bool) (*entity.Evaluator, error) { + // 根据 builtin 分流 + var evaluatorDOList []*entity.Evaluator + var err error + if builtin { + evaluatorDOList, err = e.evaluatorRepo.BatchGetBuiltinEvaluatorByVersionID(ctx, spaceID, []int64{evaluatorVersionID}, includeDeleted) + } else { + evaluatorDOList, err = e.evaluatorRepo.BatchGetEvaluatorByVersionID(ctx, spaceID, []int64{evaluatorVersionID}, includeDeleted) + } if err != nil { return nil, err } @@ -500,3 +539,62 @@ func (e *EvaluatorServiceImpl) injectUserInfo(ctx context.Context, evaluatorDO * UpdatedAt: gptr.Of(time.Now().UnixMilli()), }) } + +// ListBuiltinEvaluator 查询内置评估器 +func (e *EvaluatorServiceImpl) ListBuiltinEvaluator(ctx context.Context, request *entity.ListBuiltinEvaluatorRequest) ([]*entity.Evaluator, int64, error) { + // 构建ListBuiltinEvaluator请求 + repoReq := &repo.ListBuiltinEvaluatorRequest{ + SpaceID: request.SpaceID, + FilterOption: request.FilterOption, // 直接使用传入的FilterOption + PageSize: request.PageSize, + PageNum: request.PageNum, + IncludeDeleted: false, // 内置评估器不包含已删除的 + } + + // 调用repo层的ListBuiltinEvaluator方法 + result, err := e.evaluatorRepo.ListBuiltinEvaluator(ctx, repoReq) + if err != nil { + return nil, 0, err + } + + // 如果不需要版本信息，直接返回 + if !request.WithVersion { + return result.Evaluators, result.TotalCount, nil + } + + // 如果需要版本信息，获取版本数据 + evaluatorID2DO := make(map[int64]*entity.Evaluator, len(result.Evaluators)) + for _, evaluator := range result.Evaluators { + evaluatorID2DO[evaluator.ID] = evaluator + } + + // 批量获取版本信息 + evaluatorIDs := make([]int64, 0, len(result.Evaluators)) + for _, evaluator := range result.Evaluators { + evaluatorIDs = append(evaluatorIDs, evaluator.ID) + } + evaluatorVersions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDs(ctx, evaluatorIDs, false) + if err != nil { + return nil, 0, err + } + + // 组装版本信息 + for _, evaluatorVersion := range evaluatorVersions { + evaluatorDO, ok := evaluatorID2DO[evaluatorVersion.GetEvaluatorID()] + if !ok { + continue + } + // 设置 Evaluator.ID 为评估器ID（不是评估器版本ID） + evaluatorVersion.ID = evaluatorDO.ID + evaluatorVersion.SpaceID = evaluatorDO.SpaceID + evaluatorVersion.Description = evaluatorDO.Description + evaluatorVersion.BaseInfo = evaluatorDO.BaseInfo + evaluatorVersion.Name = evaluatorDO.Name + evaluatorVersion.EvaluatorType = evaluatorDO.EvaluatorType + evaluatorVersion.Description = evaluatorDO.Description + evaluatorVersion.DraftSubmitted = evaluatorDO.DraftSubmitted + evaluatorVersion.LatestVersion = evaluatorDO.LatestVersion + } + + return evaluatorVersions, int64(len(evaluatorVersions)), nil +} diff --git a/backend/modules/evaluation/domain/service/evaluator_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_impl_test.go index 7989a8209..2f6a71f73 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl_test.go @@ -19,16 +19,45 @@ import ( "github.com/coze-dev/coze-loop/backend/modules/evaluation/consts" idemmocks "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/component/idem/mocks" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/service/mocks" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" repomocks "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo/mocks" - "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/service/mocks" confmocks "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/conf/mocks" "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/errno" "github.com/coze-dev/coze-loop/backend/pkg/errorx" "github.com/coze-dev/coze-loop/backend/pkg/lang/ptr" ) +// MockEvaluatorSourceService 简单的mock实现 +type MockEvaluatorSourceService struct { + ctrl *gomock.Controller +} + +func NewMockEvaluatorSourceService(ctrl *gomock.Controller) *MockEvaluatorSourceService { + return &MockEvaluatorSourceService{ctrl: ctrl} +} + +func (m *MockEvaluatorSourceService) EvaluatorType() entity.EvaluatorType { + return entity.EvaluatorTypeLLM +} + +func (m *MockEvaluatorSourceService) Run(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, disableTracing bool) (output *entity.EvaluatorOutputData, runStatus entity.EvaluatorRunStatus, traceID string) { + return &entity.EvaluatorOutputData{}, entity.EvaluatorRunStatusSuccess, "trace-id" +} + +func (m *MockEvaluatorSourceService) Debug(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData) (output *entity.EvaluatorOutputData, err error) { + return &entity.EvaluatorOutputData{}, nil +} + +func (m *MockEvaluatorSourceService) PreHandle(ctx context.Context, evaluator *entity.Evaluator) error { + return nil +} + +func (m *MockEvaluatorSourceService) Validate(ctx context.Context, evaluator *entity.Evaluator) error { + return nil +} + func TestNewEvaluatorServiceImpl(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() @@ -40,7 +69,7 @@ func TestNewEvaluatorServiceImpl(t *testing.T) { mockEvaluatorRecordRepo := repomocks.NewMockIEvaluatorRecordRepo(ctrl) mockIdem := idemmocks.NewMockIdempotentService(ctrl) mockConfiger := confmocks.NewMockIConfiger(ctrl) - mockSourceService := mocks.NewMockEvaluatorSourceService(ctrl) + mockSourceService := NewMockEvaluatorSourceService(ctrl) // 这里需要传递一个 EvaluatorSourceService 的 slice service := NewEvaluatorServiceImpl( @@ -817,6 +846,72 @@ func TestEvaluatorServiceImpl_UpdateEvaluatorDraft(t *testing.T) { } } +// TestEvaluatorServiceImpl_UpdateBuiltinEvaluatorDraft 测试 UpdateBuiltinEvaluatorDraft 方法 +func TestEvaluatorServiceImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockEvaluatorRepo := repomocks.NewMockIEvaluatorRepo(ctrl) + + s := &EvaluatorServiceImpl{ + evaluatorRepo: mockEvaluatorRepo, + } + + ctx := context.Background() + testEvaluator := &entity.Evaluator{ + ID: 1, + SpaceID: 100, + Name: "Test Builtin Evaluator", + Tags: map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagKey_Category: {"LLM", "Code"}, + entity.EvaluatorTagKey_Objective: {"Quality"}, + }, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + ID: 10, + BaseInfo: &entity.BaseInfo{}, + }, + BaseInfo: &entity.BaseInfo{}, + } + + tests := []struct { + name string + evaluatorDO *entity.Evaluator + setupMock func(mockRepo *repomocks.MockIEvaluatorRepo) + expectedError error + }{ + { + name: "成功更新内置评估器草稿", + evaluatorDO: testEvaluator, + setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { + mockRepo.EXPECT().UpdateBuiltinEvaluatorDraft(gomock.Any(), gomock.Any()).Return(nil) + }, + expectedError: nil, + }, + { + name: "更新内置评估器草稿失败 - repo返回错误", + evaluatorDO: testEvaluator, + setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { + mockRepo.EXPECT().UpdateBuiltinEvaluatorDraft(gomock.Any(), testEvaluator).Return(errors.New("repo error")) + }, + expectedError: errors.New("repo error"), + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.setupMock(mockEvaluatorRepo) + err := s.UpdateBuiltinEvaluatorDraft(ctx, tt.evaluatorDO) + + if tt.expectedError != nil { + assert.Error(t, err) + assert.Equal(t, tt.expectedError, err) + } else { + assert.NoError(t, err, "不期望得到错误") + } + }) + } +} + // TestEvaluatorServiceImpl_DeleteEvaluator 测试 DeleteEvaluator 方法 func TestEvaluatorServiceImpl_DeleteEvaluator(t *testing.T) { ctrl := gomock.NewController(t) @@ -1412,7 +1507,7 @@ func TestEvaluatorServiceImpl_RunEvaluator(t *testing.T) { mockLimiter := repomocks.NewMockRateLimiter(ctrl) mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) mockEvaluatorRecordRepo := repomocks.NewMockIEvaluatorRecordRepo(ctrl) - mockEvaluatorSourceService := mocks.NewMockEvaluatorSourceService(ctrl) + mockEvaluatorSourceService := NewMockEvaluatorSourceService(ctrl) s := &EvaluatorServiceImpl{ evaluatorRepo: mockEvaluatorRepo, limiter: mockLimiter, @@ -1659,7 +1754,7 @@ func Test_EvaluatorServiceImpl_DebugEvaluator(t *testing.T) { mockLimiter := repomocks.NewMockRateLimiter(ctrl) mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) mockEvaluatorRecordRepo := repomocks.NewMockIEvaluatorRecordRepo(ctrl) - mockEvaluatorSourceService := mocks.NewMockEvaluatorSourceService(ctrl) + mockEvaluatorSourceService := NewMockEvaluatorSourceService(ctrl) mockService := &EvaluatorServiceImpl{ evaluatorRepo: mockEvaluatorRepo, limiter: mockLimiter, @@ -1758,7 +1853,7 @@ func Test_EvaluatorServiceImpl_injectUserInfo(t *testing.T) { mockLimiter := repomocks.NewMockRateLimiter(ctrl) mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) mockEvaluatorRecordRepo := repomocks.NewMockIEvaluatorRecordRepo(ctrl) - mockEvaluatorSourceService := mocks.NewMockEvaluatorSourceService(ctrl) + mockEvaluatorSourceService := NewMockEvaluatorSourceService(ctrl) mockService := &EvaluatorServiceImpl{ evaluatorRepo: mockEvaluatorRepo, limiter: mockLimiter, @@ -1797,7 +1892,7 @@ func TestEvaluatorServiceImpl_RunEvaluator_DisableTracing(t *testing.T) { mockLimiter := repomocks.NewMockRateLimiter(ctrl) mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) mockEvaluatorRecordRepo := repomocks.NewMockIEvaluatorRecordRepo(ctrl) - mockEvaluatorSourceService := mocks.NewMockEvaluatorSourceService(ctrl) + mockEvaluatorSourceService := NewMockEvaluatorSourceService(ctrl) s := &EvaluatorServiceImpl{ evaluatorRepo: mockEvaluatorRepo, @@ -1892,3 +1987,141 @@ func TestEvaluatorServiceImpl_RunEvaluator_DisableTracing(t *testing.T) { }) } } + +// TestEvaluatorServiceImpl_ListBuiltinEvaluator 测试 ListBuiltinEvaluator 方法 +func TestEvaluatorServiceImpl_ListBuiltinEvaluator(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockEvaluatorRepo := repomocks.NewMockIEvaluatorRepo(ctrl) + s := &EvaluatorServiceImpl{ + evaluatorRepo: mockEvaluatorRepo, + } + + ctx := context.Background() + + // 定义测试用例 + testCases := []struct { + name string + request *entity.ListBuiltinEvaluatorRequest + setupMock func(mockRepo *repomocks.MockIEvaluatorRepo) + expectedList []*entity.Evaluator + expectedTotal int64 + expectedErr error + }{ + { + name: "成功 - 不带版本信息 (WithVersion = false)", + request: &entity.ListBuiltinEvaluatorRequest{ + SpaceID: 1, + PageSize: 10, + PageNum: 1, + WithVersion: false, + }, + setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { + expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ + SpaceID: 1, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + FilterOption: nil, // 没有筛选条件 + } + mockRepo.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Eq(expectedRepoReq)).Return( + &repo.ListBuiltinEvaluatorResponse{ + Evaluators: []*entity.Evaluator{ + {ID: 1, Name: "BuiltinEval1", SpaceID: 1, Description: "Builtin Desc1"}, + {ID: 2, Name: "BuiltinEval2", SpaceID: 1, Description: "Builtin Desc2"}, + }, + TotalCount: 2, + }, nil) + }, + expectedList: []*entity.Evaluator{ + {ID: 1, Name: "BuiltinEval1", SpaceID: 1, Description: "Builtin Desc1"}, + {ID: 2, Name: "BuiltinEval2", SpaceID: 1, Description: "Builtin Desc2"}, + }, + expectedTotal: 2, + expectedErr: nil, + }, + { + name: "成功 - 带版本信息 (WithVersion = true)", + request: &entity.ListBuiltinEvaluatorRequest{ + SpaceID: 1, + PageSize: 10, + PageNum: 1, + WithVersion: true, + }, + setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { + expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ + SpaceID: 1, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + FilterOption: nil, + } + mockRepo.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Eq(expectedRepoReq)).Return( + &repo.ListBuiltinEvaluatorResponse{ + Evaluators: []*entity.Evaluator{ + {ID: 1, Name: "BuiltinEval1", SpaceID: 1, Description: "Builtin Desc1"}, + }, + TotalCount: 1, + }, nil) + + // 模拟版本查询 + mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDs(gomock.Any(), []int64{1}, false).Return( + []*entity.Evaluator{ + {ID: 1, Name: "BuiltinEval1", SpaceID: 1, Description: "Builtin Desc1"}, + }, nil) + }, + expectedList: []*entity.Evaluator{ + {ID: 1, Name: "BuiltinEval1", SpaceID: 1, Description: "Builtin Desc1"}, + }, + expectedTotal: 1, + expectedErr: nil, + }, + { + name: "失败 - repo返回错误", + request: &entity.ListBuiltinEvaluatorRequest{ + SpaceID: 1, + PageSize: 10, + PageNum: 1, + WithVersion: false, + }, + setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { + expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ + SpaceID: 1, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + FilterOption: nil, + } + mockRepo.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Eq(expectedRepoReq)).Return( + nil, errors.New("repo error")) + }, + expectedList: nil, + expectedTotal: 0, + expectedErr: errors.New("repo error"), + }, + } + + for _, tt := range testCases { + t.Run(tt.name, func(t *testing.T) { + tt.setupMock(mockEvaluatorRepo) + + result, total, err := s.ListBuiltinEvaluator(ctx, tt.request) + + if tt.expectedErr != nil { + assert.Error(t, err) + assert.Equal(t, tt.expectedErr.Error(), err.Error()) + } else { + assert.NoError(t, err) + assert.Equal(t, tt.expectedTotal, total) + assert.Equal(t, len(tt.expectedList), len(result)) + for i, expected := range tt.expectedList { + assert.Equal(t, expected.ID, result[i].ID) + assert.Equal(t, expected.Name, result[i].Name) + assert.Equal(t, expected.SpaceID, result[i].SpaceID) + assert.Equal(t, expected.Description, result[i].Description) + } + } + }) + } +} diff --git a/backend/modules/evaluation/domain/service/evaluator_template.go b/backend/modules/evaluation/domain/service/evaluator_template.go new file mode 100644 index 000000000..348d59ed9 --- /dev/null +++ b/backend/modules/evaluation/domain/service/evaluator_template.go @@ -0,0 +1,31 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package service + +import ( + "context" + + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" +) + +// EvaluatorTemplateService 定义 EvaluatorTemplate 的 Service 接口 +// +//go:generate mockgen -destination mocks/evaluator_template_service_mock.go -package=mocks . EvaluatorTemplateService +type EvaluatorTemplateService interface { + // CreateEvaluatorTemplate 创建评估器模板 + CreateEvaluatorTemplate(ctx context.Context, req *entity.CreateEvaluatorTemplateRequest) (*entity.CreateEvaluatorTemplateResponse, error) + + // UpdateEvaluatorTemplate 更新评估器模板 + UpdateEvaluatorTemplate(ctx context.Context, req *entity.UpdateEvaluatorTemplateRequest) (*entity.UpdateEvaluatorTemplateResponse, error) + + // DeleteEvaluatorTemplate 删除评估器模板 + DeleteEvaluatorTemplate(ctx context.Context, req *entity.DeleteEvaluatorTemplateRequest) (*entity.DeleteEvaluatorTemplateResponse, error) + + // GetEvaluatorTemplate 获取评估器模板详情 + GetEvaluatorTemplate(ctx context.Context, req *entity.GetEvaluatorTemplateRequest) (*entity.GetEvaluatorTemplateResponse, error) + + // ListEvaluatorTemplate 查询评估器模板列表 + ListEvaluatorTemplate(ctx context.Context, req *entity.ListEvaluatorTemplateRequest) (*entity.ListEvaluatorTemplateResponse, error) +} + diff --git a/backend/modules/evaluation/domain/service/evaluator_template_impl.go b/backend/modules/evaluation/domain/service/evaluator_template_impl.go new file mode 100644 index 000000000..4d54d9f0e --- /dev/null +++ b/backend/modules/evaluation/domain/service/evaluator_template_impl.go @@ -0,0 +1,324 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package service + +import ( + "context" + "errors" + + "github.com/coze-dev/coze-loop/backend/infra/middleware/session" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/errno" + "github.com/coze-dev/coze-loop/backend/pkg/errorx" +) + +// EvaluatorTemplateServiceImpl 实现 EvaluatorTemplateService 接口 +type EvaluatorTemplateServiceImpl struct { + templateRepo repo.EvaluatorTemplateRepo +} + +// NewEvaluatorTemplateService 创建 EvaluatorTemplateService 实例 +func NewEvaluatorTemplateService(templateRepo repo.EvaluatorTemplateRepo) EvaluatorTemplateService { + return &EvaluatorTemplateServiceImpl{ + templateRepo: templateRepo, + } +} + +// CreateEvaluatorTemplate 创建评估器模板 +func (s *EvaluatorTemplateServiceImpl) CreateEvaluatorTemplate(ctx context.Context, req *entity.CreateEvaluatorTemplateRequest) (*entity.CreateEvaluatorTemplateResponse, error) { + // 参数验证 + if err := s.validateCreateRequest(req); err != nil { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode) + } + + // 从context获取用户ID + userID := session.UserIDInCtxOrEmpty(ctx) + if userID == "" { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode) + } + + // 构建模板实体 + template := &entity.EvaluatorTemplate{ + SpaceID: req.SpaceID, + Name: req.Name, + Description: req.Description, + EvaluatorType: req.EvaluatorType, + Benchmark: req.Benchmark, + Vendor: req.Vendor, + InputSchemas: req.InputSchemas, + OutputSchemas: req.OutputSchemas, + ReceiveChatHistory: req.ReceiveChatHistory, + Tags: req.Tags, + PromptEvaluatorContent: req.PromptEvaluatorContent, + CodeEvaluatorContent: req.CodeEvaluatorContent, + } + + // 设置基础信息 + baseInfo := &entity.BaseInfo{ + CreatedBy: &entity.UserInfo{ + UserID: &userID, + }, + UpdatedBy: &entity.UserInfo{ + UserID: &userID, + }, + } + template.SetBaseInfo(baseInfo) + + // 调用repo层创建 + createdTemplate, err := s.templateRepo.CreateEvaluatorTemplate(ctx, template) + if err != nil { + return nil, errorx.NewByCode(errno.CommonInternalErrorCode) + } + + return &entity.CreateEvaluatorTemplateResponse{ + Template: createdTemplate, + }, nil +} + +// UpdateEvaluatorTemplate 更新评估器模板 +func (s *EvaluatorTemplateServiceImpl) UpdateEvaluatorTemplate(ctx context.Context, req *entity.UpdateEvaluatorTemplateRequest) (*entity.UpdateEvaluatorTemplateResponse, error) { + // 参数验证 + if err := s.validateUpdateRequest(req); err != nil { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode) + } + + // 从context获取用户ID + userID := session.UserIDInCtxOrEmpty(ctx) + if userID == "" { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode) + } + + // 先获取现有模板 + existingTemplate, err := s.templateRepo.GetEvaluatorTemplate(ctx, req.ID, false) + if err != nil { + return nil, errorx.NewByCode(errno.CommonInternalErrorCode) + } + if existingTemplate == nil { + return nil, errorx.NewByCode(errno.ResourceNotFoundCode) + } + + // 更新字段 + if req.Name != nil { + existingTemplate.Name = *req.Name + } + if req.Description != nil { + existingTemplate.Description = *req.Description + } + if req.Benchmark != nil { + existingTemplate.Benchmark = *req.Benchmark + } + if req.Vendor != nil { + existingTemplate.Vendor = *req.Vendor + } + if req.InputSchemas != nil { + existingTemplate.InputSchemas = req.InputSchemas + } + if req.OutputSchemas != nil { + existingTemplate.OutputSchemas = req.OutputSchemas + } + if req.ReceiveChatHistory != nil { + existingTemplate.ReceiveChatHistory = req.ReceiveChatHistory + } + if req.Tags != nil { + existingTemplate.Tags = req.Tags + } + if req.PromptEvaluatorContent != nil { + existingTemplate.PromptEvaluatorContent = req.PromptEvaluatorContent + } + if req.CodeEvaluatorContent != nil { + existingTemplate.CodeEvaluatorContent = req.CodeEvaluatorContent + } + + // 更新基础信息 + if existingTemplate.BaseInfo != nil { + existingTemplate.BaseInfo.UpdatedBy = &entity.UserInfo{ + UserID: &userID, + } + } + + // 调用repo层更新 + updatedTemplate, err := s.templateRepo.UpdateEvaluatorTemplate(ctx, existingTemplate) + if err != nil { + return nil, errorx.NewByCode(errno.CommonInternalErrorCode) + } + + return &entity.UpdateEvaluatorTemplateResponse{ + Template: updatedTemplate, + }, nil +} + +// DeleteEvaluatorTemplate 删除评估器模板 +func (s *EvaluatorTemplateServiceImpl) DeleteEvaluatorTemplate(ctx context.Context, req *entity.DeleteEvaluatorTemplateRequest) (*entity.DeleteEvaluatorTemplateResponse, error) { + // 参数验证 + if err := s.validateDeleteRequest(req); err != nil { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode) + } + + // 从context获取用户ID + userID := session.UserIDInCtxOrEmpty(ctx) + if userID == "" { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode) + } + + // 检查模板是否存在 + existingTemplate, err := s.templateRepo.GetEvaluatorTemplate(ctx, req.ID, false) + if err != nil { + return nil, errorx.NewByCode(errno.CommonInternalErrorCode) + } + if existingTemplate == nil { + return nil, errorx.NewByCode(errno.ResourceNotFoundCode) + } + + // 调用repo层删除 + err = s.templateRepo.DeleteEvaluatorTemplate(ctx, req.ID, userID) + if err != nil { + return nil, errorx.NewByCode(errno.CommonInternalErrorCode) + } + + return &entity.DeleteEvaluatorTemplateResponse{ + Success: true, + }, nil +} + +// GetEvaluatorTemplate 获取评估器模板详情 +func (s *EvaluatorTemplateServiceImpl) GetEvaluatorTemplate(ctx context.Context, req *entity.GetEvaluatorTemplateRequest) (*entity.GetEvaluatorTemplateResponse, error) { + // 参数验证 + if err := s.validateGetRequest(req); err != nil { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode) + } + + // 调用repo层获取 + template, err := s.templateRepo.GetEvaluatorTemplate(ctx, req.ID, req.IncludeDeleted) + if err != nil { + return nil, errorx.NewByCode(errno.CommonInternalErrorCode) + } + if template == nil { + return nil, errorx.NewByCode(errno.ResourceNotFoundCode) + } + + return &entity.GetEvaluatorTemplateResponse{ + Template: template, + }, nil +} + +// ListEvaluatorTemplate 查询评估器模板列表 +func (s *EvaluatorTemplateServiceImpl) ListEvaluatorTemplate(ctx context.Context, req *entity.ListEvaluatorTemplateRequest) (*entity.ListEvaluatorTemplateResponse, error) { + // 参数验证 + if err := s.validateListRequest(req); err != nil { + return nil, errorx.NewByCode(errno.CommonInvalidParamCode) + } + + // 构建repo层请求 + repoReq := &repo.ListEvaluatorTemplateRequest{ + SpaceID: req.SpaceID, + FilterOption: req.FilterOption, + PageSize: req.PageSize, + PageNum: req.PageNum, + IncludeDeleted: req.IncludeDeleted, + } + + // 调用repo层查询 + repoResp, err := s.templateRepo.ListEvaluatorTemplate(ctx, repoReq) + if err != nil { + return nil, errorx.NewByCode(errno.CommonInternalErrorCode) + } + + // 计算总页数 + totalPages := int32((repoResp.TotalCount + int64(req.PageSize) - 1) / int64(req.PageSize)) + + return &entity.ListEvaluatorTemplateResponse{ + TotalCount: repoResp.TotalCount, + Templates: repoResp.Templates, + PageSize: req.PageSize, + PageNum: req.PageNum, + TotalPages: totalPages, + }, nil +} + +// validateCreateRequest 验证创建请求 +func (s *EvaluatorTemplateServiceImpl) validateCreateRequest(req *entity.CreateEvaluatorTemplateRequest) error { + if req.SpaceID <= 0 { + return errors.New("空间ID必须大于0") + } + if req.Name == "" { + return errors.New("模板名称不能为空") + } + if len(req.Name) > 100 { + return errors.New("模板名称长度不能超过100个字符") + } + if len(req.Description) > 500 { + return errors.New("模板描述长度不能超过500个字符") + } + if req.Benchmark != "" && len(req.Benchmark) > 100 { + return errors.New("基准长度不能超过100个字符") + } + if req.Vendor != "" && len(req.Vendor) > 100 { + return errors.New("供应商长度不能超过100个字符") + } + + // 验证评估器类型和内容匹配 + if req.EvaluatorType == entity.EvaluatorTypePrompt && req.PromptEvaluatorContent == nil { + return errors.New("Prompt类型评估器必须提供PromptEvaluatorContent") + } + if req.EvaluatorType == entity.EvaluatorTypeCode && req.CodeEvaluatorContent == nil { + return errors.New("Code类型评估器必须提供CodeEvaluatorContent") + } + + return nil +} + +// validateUpdateRequest 验证更新请求 +func (s *EvaluatorTemplateServiceImpl) validateUpdateRequest(req *entity.UpdateEvaluatorTemplateRequest) error { + if req.ID <= 0 { + return errors.New("模板ID必须大于0") + } + if req.Name != nil && *req.Name == "" { + return errors.New("模板名称不能为空") + } + if req.Name != nil && len(*req.Name) > 100 { + return errors.New("模板名称长度不能超过100个字符") + } + if req.Description != nil && len(*req.Description) > 500 { + return errors.New("模板描述长度不能超过500个字符") + } + if req.Benchmark != nil && len(*req.Benchmark) > 100 { + return errors.New("基准长度不能超过100个字符") + } + if req.Vendor != nil && len(*req.Vendor) > 100 { + return errors.New("供应商长度不能超过100个字符") + } + + return nil +} + +// validateDeleteRequest 验证删除请求 +func (s *EvaluatorTemplateServiceImpl) validateDeleteRequest(req *entity.DeleteEvaluatorTemplateRequest) error { + if req.ID <= 0 { + return errors.New("模板ID必须大于0") + } + return nil +} + +// validateGetRequest 验证获取请求 +func (s *EvaluatorTemplateServiceImpl) validateGetRequest(req *entity.GetEvaluatorTemplateRequest) error { + if req.ID <= 0 { + return errors.New("模板ID必须大于0") + } + return nil +} + +// validateListRequest 验证列表请求 +func (s *EvaluatorTemplateServiceImpl) validateListRequest(req *entity.ListEvaluatorTemplateRequest) error { + if req.SpaceID <= 0 { + return errors.New("空间ID必须大于0") + } + if req.PageSize <= 0 || req.PageSize > 100 { + return errors.New("分页大小必须在1-100之间") + } + if req.PageNum <= 0 { + return errors.New("页码必须大于0") + } + return nil +} diff --git a/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go new file mode 100644 index 000000000..42040cf21 --- /dev/null +++ b/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go @@ -0,0 +1,501 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package service + +import ( + "context" + "testing" + + "github.com/bytedance/gg/gptr" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + + "github.com/coze-dev/coze-loop/backend/infra/middleware/session" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" +) + +// MockEvaluatorTemplateRepo 模拟模板仓库 +type MockEvaluatorTemplateRepo struct { + mock.Mock +} + +func (m *MockEvaluatorTemplateRepo) CreateEvaluatorTemplate(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { + args := m.Called(ctx, template) + return args.Get(0).(*entity.EvaluatorTemplate), args.Error(1) +} + +func (m *MockEvaluatorTemplateRepo) UpdateEvaluatorTemplate(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { + args := m.Called(ctx, template) + return args.Get(0).(*entity.EvaluatorTemplate), args.Error(1) +} + +func (m *MockEvaluatorTemplateRepo) DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string) error { + args := m.Called(ctx, id, userID) + return args.Error(0) +} + +func (m *MockEvaluatorTemplateRepo) GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool) (*entity.EvaluatorTemplate, error) { + args := m.Called(ctx, id, includeDeleted) + if args.Get(0) == nil { + return nil, args.Error(1) + } + return args.Get(0).(*entity.EvaluatorTemplate), args.Error(1) +} + +func (m *MockEvaluatorTemplateRepo) ListEvaluatorTemplate(ctx context.Context, req *repo.ListEvaluatorTemplateRequest) (*repo.ListEvaluatorTemplateResponse, error) { + args := m.Called(ctx, req) + return args.Get(0).(*repo.ListEvaluatorTemplateResponse), args.Error(1) +} + +// TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate 测试创建评估器模板 +func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + req *entity.CreateEvaluatorTemplateRequest + mockTemplate *entity.EvaluatorTemplate + mockError error + expectedError bool + description string + }{ + { + name: "successful creation", + req: &entity.CreateEvaluatorTemplateRequest{ + SpaceID: 100, + Name: "Test Template", + Description: "Test Description", + EvaluatorType: entity.EvaluatorTypePrompt, + PromptEvaluatorContent: &entity.PromptEvaluatorContent{ + MessageList: []*entity.Message{ + { + Content: &entity.Content{ + Text: gptr.Of("Test prompt"), + }, + }, + }, + }, + }, + mockTemplate: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Test Template", + Description: "Test Description", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + expectedError: false, + description: "成功创建评估器模板", + }, + { + name: "invalid space ID", + req: &entity.CreateEvaluatorTemplateRequest{ + SpaceID: 0, + Name: "Test Template", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + expectedError: true, + description: "无效的空间ID应该返回错误", + }, + { + name: "empty name", + req: &entity.CreateEvaluatorTemplateRequest{ + SpaceID: 100, + Name: "", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + expectedError: true, + description: "空的模板名称应该返回错误", + }, + { + name: "missing prompt content for prompt type", + req: &entity.CreateEvaluatorTemplateRequest{ + SpaceID: 100, + Name: "Test Template", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + expectedError: true, + description: "Prompt类型评估器缺少PromptEvaluatorContent应该返回错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + mockRepo := &MockEvaluatorTemplateRepo{} + service := NewEvaluatorTemplateService(mockRepo) + + // 设置context with userID + ctx := context.Background() + if !tt.expectedError { + user := &session.User{ID: "user123"} + ctx = session.WithCtxUser(ctx, user) + mockRepo.On("CreateEvaluatorTemplate", mock.Anything, mock.Anything).Return(tt.mockTemplate, tt.mockError) + } else { + // 对于参数验证失败的情况，不设置userID + if tt.name != "invalid space ID" && tt.name != "empty name" && tt.name != "missing prompt content for prompt type" { + user := &session.User{ID: "user123"} + ctx = session.WithCtxUser(ctx, user) + } + } + + result, err := service.CreateEvaluatorTemplate(ctx, tt.req) + + if tt.expectedError { + assert.Error(t, err) + assert.Nil(t, result) + } else { + assert.NoError(t, err) + assert.NotNil(t, result) + assert.Equal(t, tt.mockTemplate.ID, result.Template.ID) + assert.Equal(t, tt.mockTemplate.Name, result.Template.Name) + } + + if !tt.expectedError { + mockRepo.AssertExpectations(t) + } + }) + } +} + +// TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate 测试更新评估器模板 +func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + req *entity.UpdateEvaluatorTemplateRequest + existingTemplate *entity.EvaluatorTemplate + mockTemplate *entity.EvaluatorTemplate + mockError error + expectedError bool + description string + }{ + { + name: "successful update", + req: &entity.UpdateEvaluatorTemplateRequest{ + ID: 1, + Name: gptr.Of("Updated Template"), + }, + existingTemplate: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Original Template", + }, + mockTemplate: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Updated Template", + }, + expectedError: false, + description: "成功更新评估器模板", + }, + { + name: "template not found", + req: &entity.UpdateEvaluatorTemplateRequest{ + ID: 1, + Name: gptr.Of("Updated Template"), + }, + existingTemplate: nil, + expectedError: true, + description: "模板不存在应该返回错误", + }, + { + name: "invalid ID", + req: &entity.UpdateEvaluatorTemplateRequest{ + ID: 0, + }, + expectedError: true, + description: "无效的模板ID应该返回错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + mockRepo := &MockEvaluatorTemplateRepo{} + service := NewEvaluatorTemplateService(mockRepo) + + // 设置context with userID + ctx := context.Background() + if tt.req.ID > 0 { + ctx = session.WithCtxUser(ctx, &session.User{ID: "user123"}) + } + + // 只为会调用repo层的情况设置mock期望 + if tt.req.ID > 0 { + if tt.existingTemplate != nil { + mockRepo.On("GetEvaluatorTemplate", mock.Anything, tt.req.ID, false).Return(tt.existingTemplate, nil) + if !tt.expectedError { + mockRepo.On("UpdateEvaluatorTemplate", mock.Anything, mock.Anything).Return(tt.mockTemplate, tt.mockError) + } + } else if tt.expectedError { + mockRepo.On("GetEvaluatorTemplate", mock.Anything, tt.req.ID, false).Return(nil, nil) + } + } + + result, err := service.UpdateEvaluatorTemplate(ctx, tt.req) + + if tt.expectedError { + assert.Error(t, err) + assert.Nil(t, result) + } else { + assert.NoError(t, err) + assert.NotNil(t, result) + assert.Equal(t, tt.mockTemplate.ID, result.Template.ID) + assert.Equal(t, tt.mockTemplate.Name, result.Template.Name) + } + + if tt.req.ID > 0 { + mockRepo.AssertExpectations(t) + } + }) + } +} + +// TestEvaluatorTemplateServiceImpl_DeleteEvaluatorTemplate 测试删除评估器模板 +func TestEvaluatorTemplateServiceImpl_DeleteEvaluatorTemplate(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + req *entity.DeleteEvaluatorTemplateRequest + existingTemplate *entity.EvaluatorTemplate + mockError error + expectedError bool + description string + }{ + { + name: "successful deletion", + req: &entity.DeleteEvaluatorTemplateRequest{ + ID: 1, + }, + existingTemplate: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + }, + expectedError: false, + description: "成功删除评估器模板", + }, + { + name: "template not found", + req: &entity.DeleteEvaluatorTemplateRequest{ + ID: 1, + }, + existingTemplate: nil, + expectedError: true, + description: "模板不存在应该返回错误", + }, + { + name: "invalid ID", + req: &entity.DeleteEvaluatorTemplateRequest{ + ID: 0, + }, + expectedError: true, + description: "无效的模板ID应该返回错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + mockRepo := &MockEvaluatorTemplateRepo{} + service := NewEvaluatorTemplateService(mockRepo) + + // 设置context with userID + ctx := context.Background() + if tt.req.ID > 0 { + ctx = session.WithCtxUser(ctx, &session.User{ID: "user123"}) + } + + // 只为会调用repo层的情况设置mock期望 + if tt.req.ID > 0 { + if tt.existingTemplate != nil { + mockRepo.On("GetEvaluatorTemplate", mock.Anything, tt.req.ID, false).Return(tt.existingTemplate, nil) + if !tt.expectedError { + mockRepo.On("DeleteEvaluatorTemplate", mock.Anything, tt.req.ID, "user123").Return(tt.mockError) + } + } else if tt.expectedError { + mockRepo.On("GetEvaluatorTemplate", mock.Anything, tt.req.ID, false).Return(nil, nil) + } + } + + result, err := service.DeleteEvaluatorTemplate(ctx, tt.req) + + if tt.expectedError { + assert.Error(t, err) + assert.Nil(t, result) + } else { + assert.NoError(t, err) + assert.NotNil(t, result) + assert.True(t, result.Success) + } + + if tt.req.ID > 0 { + mockRepo.AssertExpectations(t) + } + }) + } +} + +// TestEvaluatorTemplateServiceImpl_GetEvaluatorTemplate 测试获取评估器模板 +func TestEvaluatorTemplateServiceImpl_GetEvaluatorTemplate(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + req *entity.GetEvaluatorTemplateRequest + mockTemplate *entity.EvaluatorTemplate + mockError error + expectedError bool + description string + }{ + { + name: "successful get", + req: &entity.GetEvaluatorTemplateRequest{ + ID: 1, + }, + mockTemplate: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Test Template", + }, + expectedError: false, + description: "成功获取评估器模板", + }, + { + name: "template not found", + req: &entity.GetEvaluatorTemplateRequest{ + ID: 1, + }, + mockTemplate: nil, + expectedError: true, + description: "模板不存在应该返回错误", + }, + { + name: "invalid ID", + req: &entity.GetEvaluatorTemplateRequest{ + ID: 0, + }, + expectedError: true, + description: "无效的模板ID应该返回错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + mockRepo := &MockEvaluatorTemplateRepo{} + service := NewEvaluatorTemplateService(mockRepo) + + // 只为会调用repo层的情况设置mock期望 + if tt.req.ID > 0 { + mockRepo.On("GetEvaluatorTemplate", mock.Anything, tt.req.ID, tt.req.IncludeDeleted).Return(tt.mockTemplate, tt.mockError) + } + + result, err := service.GetEvaluatorTemplate(context.Background(), tt.req) + + if tt.expectedError { + assert.Error(t, err) + assert.Nil(t, result) + } else { + assert.NoError(t, err) + assert.NotNil(t, result) + assert.Equal(t, tt.mockTemplate.ID, result.Template.ID) + assert.Equal(t, tt.mockTemplate.Name, result.Template.Name) + } + + if tt.req.ID > 0 { + mockRepo.AssertExpectations(t) + } + }) + } +} + +// TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate 测试查询评估器模板列表 +func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + req *entity.ListEvaluatorTemplateRequest + mockResponse *repo.ListEvaluatorTemplateResponse + mockError error + expectedError bool + description string + }{ + { + name: "successful list", + req: &entity.ListEvaluatorTemplateRequest{ + SpaceID: 100, + PageSize: 10, + PageNum: 1, + }, + mockResponse: &repo.ListEvaluatorTemplateResponse{ + TotalCount: 2, + Templates: []*entity.EvaluatorTemplate{ + {ID: 1, Name: "Template 1"}, + {ID: 2, Name: "Template 2"}, + }, + }, + expectedError: false, + description: "成功查询评估器模板列表", + }, + { + name: "invalid space ID", + req: &entity.ListEvaluatorTemplateRequest{ + SpaceID: 0, + PageSize: 10, + PageNum: 1, + }, + expectedError: true, + description: "无效的空间ID应该返回错误", + }, + { + name: "invalid page size", + req: &entity.ListEvaluatorTemplateRequest{ + SpaceID: 100, + PageSize: 0, + PageNum: 1, + }, + expectedError: true, + description: "无效的分页大小应该返回错误", + }, + { + name: "invalid page num", + req: &entity.ListEvaluatorTemplateRequest{ + SpaceID: 100, + PageSize: 10, + PageNum: 0, + }, + expectedError: true, + description: "无效的页码应该返回错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + mockRepo := &MockEvaluatorTemplateRepo{} + service := NewEvaluatorTemplateService(mockRepo) + + if !tt.expectedError { + mockRepo.On("ListEvaluatorTemplate", mock.Anything, mock.Anything).Return(tt.mockResponse, tt.mockError) + } + + result, err := service.ListEvaluatorTemplate(context.Background(), tt.req) + + if tt.expectedError { + assert.Error(t, err) + assert.Nil(t, result) + } else { + assert.NoError(t, err) + assert.NotNil(t, result) + assert.Equal(t, tt.mockResponse.TotalCount, result.TotalCount) + assert.Equal(t, len(tt.mockResponse.Templates), len(result.Templates)) + assert.Equal(t, tt.req.PageSize, result.PageSize) + assert.Equal(t, tt.req.PageNum, result.PageNum) + } + + if !tt.expectedError { + mockRepo.AssertExpectations(t) + } + }) + } +} diff --git a/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go b/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go index 7d6486d49..8bde8e4ea 100644 --- a/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go +++ b/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go @@ -146,18 +146,34 @@ func (mr *MockEvaluatorServiceMockRecorder) GetEvaluator(ctx, spaceID, evaluator } // GetEvaluatorVersion mocks base method. -func (m *MockEvaluatorService) GetEvaluatorVersion(ctx context.Context, evaluatorVersionID int64, includeDeleted bool) (*entity.Evaluator, error) { +func (m *MockEvaluatorService) GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, builtin bool) (*entity.Evaluator, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetEvaluatorVersion", ctx, evaluatorVersionID, includeDeleted) + ret := m.ctrl.Call(m, "GetEvaluatorVersion", ctx, spaceID, evaluatorVersionID, includeDeleted, builtin) ret0, _ := ret[0].(*entity.Evaluator) ret1, _ := ret[1].(error) return ret0, ret1 } // GetEvaluatorVersion indicates an expected call of GetEvaluatorVersion. -func (mr *MockEvaluatorServiceMockRecorder) GetEvaluatorVersion(ctx, evaluatorVersionID, includeDeleted any) *gomock.Call { +func (mr *MockEvaluatorServiceMockRecorder) GetEvaluatorVersion(ctx, spaceID, evaluatorVersionID, includeDeleted, builtin any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorVersion", reflect.TypeOf((*MockEvaluatorService)(nil).GetEvaluatorVersion), ctx, evaluatorVersionID, includeDeleted) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorVersion", reflect.TypeOf((*MockEvaluatorService)(nil).GetEvaluatorVersion), ctx, spaceID, evaluatorVersionID, includeDeleted, builtin) +} + +// ListBuiltinEvaluator mocks base method. +func (m *MockEvaluatorService) ListBuiltinEvaluator(ctx context.Context, request *entity.ListBuiltinEvaluatorRequest) ([]*entity.Evaluator, int64, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "ListBuiltinEvaluator", ctx, request) + ret0, _ := ret[0].([]*entity.Evaluator) + ret1, _ := ret[1].(int64) + ret2, _ := ret[2].(error) + return ret0, ret1, ret2 +} + +// ListBuiltinEvaluator indicates an expected call of ListBuiltinEvaluator. +func (mr *MockEvaluatorServiceMockRecorder) ListBuiltinEvaluator(ctx, request any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBuiltinEvaluator", reflect.TypeOf((*MockEvaluatorService)(nil).ListBuiltinEvaluator), ctx, request) } // ListEvaluator mocks base method. @@ -243,6 +259,19 @@ func (m *MockEvaluatorService) UpdateEvaluatorMeta(ctx context.Context, id, spac ret0, _ := ret[0].(error) return ret0 } +// UpdateBuiltinEvaluatorMeta mocks base method. +func (m *MockEvaluatorService) UpdateBuiltinEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, benchmark, vendor, userID string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "UpdateBuiltinEvaluatorMeta", ctx, id, spaceID, name, description, benchmark, vendor, userID) + ret0, _ := ret[0].(error) + return ret0 +} + +// UpdateBuiltinEvaluatorMeta indicates an expected call of UpdateBuiltinEvaluatorMeta. +func (mr *MockEvaluatorServiceMockRecorder) UpdateBuiltinEvaluatorMeta(ctx, id, spaceID, name, description, benchmark, vendor, userID any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateBuiltinEvaluatorMeta", reflect.TypeOf((*MockEvaluatorService)(nil).UpdateBuiltinEvaluatorMeta), ctx, id, spaceID, name, description, benchmark, vendor, userID) +} // UpdateEvaluatorMeta indicates an expected call of UpdateEvaluatorMeta. func (mr *MockEvaluatorServiceMockRecorder) UpdateEvaluatorMeta(ctx, id, spaceID, name, description, userID any) *gomock.Call { diff --git a/backend/modules/evaluation/domain/service/mocks/evaluator_template_service_mock.go b/backend/modules/evaluation/domain/service/mocks/evaluator_template_service_mock.go new file mode 100644 index 000000000..5f0ac3a90 --- /dev/null +++ b/backend/modules/evaluation/domain/service/mocks/evaluator_template_service_mock.go @@ -0,0 +1,117 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/service (interfaces: EvaluatorTemplateService) +// +// Generated by this command: +// +// mockgen -destination mocks/evaluator_template_service_mock.go -package=mocks . EvaluatorTemplateService +// + +// Package mocks is a generated GoMock package. +package mocks + +import ( + context "context" + reflect "reflect" + + entity "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + gomock "go.uber.org/mock/gomock" +) + +// MockEvaluatorTemplateService is a mock of EvaluatorTemplateService interface. +type MockEvaluatorTemplateService struct { + ctrl *gomock.Controller + recorder *MockEvaluatorTemplateServiceMockRecorder + isgomock struct{} +} + +// MockEvaluatorTemplateServiceMockRecorder is the mock recorder for MockEvaluatorTemplateService. +type MockEvaluatorTemplateServiceMockRecorder struct { + mock *MockEvaluatorTemplateService +} + +// NewMockEvaluatorTemplateService creates a new mock instance. +func NewMockEvaluatorTemplateService(ctrl *gomock.Controller) *MockEvaluatorTemplateService { + mock := &MockEvaluatorTemplateService{ctrl: ctrl} + mock.recorder = &MockEvaluatorTemplateServiceMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockEvaluatorTemplateService) EXPECT() *MockEvaluatorTemplateServiceMockRecorder { + return m.recorder +} + +// CreateEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateService) CreateEvaluatorTemplate(ctx context.Context, req *entity.CreateEvaluatorTemplateRequest) (*entity.CreateEvaluatorTemplateResponse, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateEvaluatorTemplate", ctx, req) + ret0, _ := ret[0].(*entity.CreateEvaluatorTemplateResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateEvaluatorTemplate indicates an expected call of CreateEvaluatorTemplate. +func (mr *MockEvaluatorTemplateServiceMockRecorder) CreateEvaluatorTemplate(ctx, req any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateService)(nil).CreateEvaluatorTemplate), ctx, req) +} + +// DeleteEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateService) DeleteEvaluatorTemplate(ctx context.Context, req *entity.DeleteEvaluatorTemplateRequest) (*entity.DeleteEvaluatorTemplateResponse, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DeleteEvaluatorTemplate", ctx, req) + ret0, _ := ret[0].(*entity.DeleteEvaluatorTemplateResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// DeleteEvaluatorTemplate indicates an expected call of DeleteEvaluatorTemplate. +func (mr *MockEvaluatorTemplateServiceMockRecorder) DeleteEvaluatorTemplate(ctx, req any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateService)(nil).DeleteEvaluatorTemplate), ctx, req) +} + +// GetEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateService) GetEvaluatorTemplate(ctx context.Context, req *entity.GetEvaluatorTemplateRequest) (*entity.GetEvaluatorTemplateResponse, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetEvaluatorTemplate", ctx, req) + ret0, _ := ret[0].(*entity.GetEvaluatorTemplateResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetEvaluatorTemplate indicates an expected call of GetEvaluatorTemplate. +func (mr *MockEvaluatorTemplateServiceMockRecorder) GetEvaluatorTemplate(ctx, req any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateService)(nil).GetEvaluatorTemplate), ctx, req) +} + +// ListEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateService) ListEvaluatorTemplate(ctx context.Context, req *entity.ListEvaluatorTemplateRequest) (*entity.ListEvaluatorTemplateResponse, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "ListEvaluatorTemplate", ctx, req) + ret0, _ := ret[0].(*entity.ListEvaluatorTemplateResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// ListEvaluatorTemplate indicates an expected call of ListEvaluatorTemplate. +func (mr *MockEvaluatorTemplateServiceMockRecorder) ListEvaluatorTemplate(ctx, req any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateService)(nil).ListEvaluatorTemplate), ctx, req) +} + +// UpdateEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateService) UpdateEvaluatorTemplate(ctx context.Context, req *entity.UpdateEvaluatorTemplateRequest) (*entity.UpdateEvaluatorTemplateResponse, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "UpdateEvaluatorTemplate", ctx, req) + ret0, _ := ret[0].(*entity.UpdateEvaluatorTemplateResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// UpdateEvaluatorTemplate indicates an expected call of UpdateEvaluatorTemplate. +func (mr *MockEvaluatorTemplateServiceMockRecorder) UpdateEvaluatorTemplate(ctx, req any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateService)(nil).UpdateEvaluatorTemplate), ctx, req) +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index c39076531..8c7be236d 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -6,6 +6,7 @@ package evaluator import ( "context" + "fmt" "strconv" "github.com/bytedance/gg/gptr" @@ -14,6 +15,7 @@ import ( "github.com/coze-dev/coze-loop/backend/infra/db" "github.com/coze-dev/coze-loop/backend/infra/idgen" + "github.com/coze-dev/coze-loop/backend/infra/middleware/session" "github.com/coze-dev/coze-loop/backend/infra/platestwrite" "github.com/coze-dev/coze-loop/backend/modules/evaluation/consts" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" @@ -28,14 +30,16 @@ type EvaluatorRepoImpl struct { idgen idgen.IIDGenerator evaluatorDao mysql.EvaluatorDAO evaluatorVersionDao mysql.EvaluatorVersionDAO + tagDAO mysql.EvaluatorTagDAO dbProvider db.Provider lwt platestwrite.ILatestWriteTracker } -func NewEvaluatorRepo(idgen idgen.IIDGenerator, provider db.Provider, evaluatorDao mysql.EvaluatorDAO, evaluatorVersionDao mysql.EvaluatorVersionDAO, lwt platestwrite.ILatestWriteTracker) repo.IEvaluatorRepo { +func NewEvaluatorRepo(idgen idgen.IIDGenerator, provider db.Provider, evaluatorDao mysql.EvaluatorDAO, evaluatorVersionDao mysql.EvaluatorVersionDAO, tagDAO mysql.EvaluatorTagDAO, lwt platestwrite.ILatestWriteTracker) repo.IEvaluatorRepo { singletonEvaluatorRepo := &EvaluatorRepoImpl{ evaluatorDao: evaluatorDao, evaluatorVersionDao: evaluatorVersionDao, + tagDAO: tagDAO, dbProvider: provider, idgen: idgen, lwt: lwt, @@ -55,10 +59,24 @@ func (r *EvaluatorRepoImpl) SubmitEvaluatorVersion(ctx context.Context, evaluato if err != nil { return err } - err = r.evaluatorVersionDao.CreateEvaluatorVersion(ctx, evaluatorVersionPO, opt) + err = r.evaluatorVersionDao.CreateEvaluatorVersion(ctx, evaluatorVersionPO, opt) if err != nil { return err } + // 如果是预置评估器，且携带了标签，则为本次提交的版本ID创建tags + if evaluator.Builtin && len(evaluator.Tags) > 0 { + // 获取用户ID + userID := session.UserIDInCtxOrEmpty(ctx) + // 将 map[EvaluatorTagKey][]string 转为 map[string][]string + tags := make(map[string][]string) + for tagKey, tagValues := range evaluator.Tags { + tags[string(tagKey)] = tagValues + } + // 以提交版本的 evaluator_version_id 作为 source_id + if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorVersionPO.ID, int32(entity.EvaluatorTagKeyType_Evaluator), userID, tags, opt); err != nil { + return err + } + } return nil }) if err != nil { @@ -87,6 +105,127 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorDraft(ctx context.Context, evaluator }) } +// UpdateBuiltinEvaluatorDraft 更新内置评估器草稿，包括tag的增量更新 +func (r *EvaluatorRepoImpl) UpdateBuiltinEvaluatorDraft(ctx context.Context, evaluator *entity.Evaluator) error { + po, err := convertor.ConvertEvaluatorVersionDO2PO(evaluator) + if err != nil { + return err + } + + // 获取用户ID + userID := session.UserIDInCtxOrEmpty(ctx) + + return r.dbProvider.Transaction(ctx, func(tx *gorm.DB) error { + opt := db.WithTransaction(tx) + + // 更新Evaluator最新版本 + err := r.evaluatorDao.UpdateEvaluatorDraftSubmitted(ctx, po.EvaluatorID, false, gptr.Indirect(evaluator.BaseInfo.UpdatedBy.UserID), opt) + if err != nil { + return err + } + + // 更新evaluator版本信息 + err = r.evaluatorVersionDao.UpdateEvaluatorDraft(ctx, po, opt) + if err != nil { + return err + } + + // 处理tag的增量更新 + if evaluator.Tags != nil { + // 获取草稿版本的ID作为source_id + draftVersions, err := r.evaluatorVersionDao.BatchGetEvaluatorDraftByEvaluatorID(ctx, []int64{po.EvaluatorID}, false, opt) + if err != nil { + return err + } + if len(draftVersions) == 0 { + return fmt.Errorf("draft version not found for evaluator %d", po.EvaluatorID) + } + draftVersion := draftVersions[0] + + // 获取现有的tags + existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{draftVersion.ID}, int32(entity.EvaluatorTagKeyType_Evaluator), opt) + if err != nil { + return err + } + + // 构建现有tags的map + existingTagMap := make(map[string]map[string]bool) // tagKey -> {tagValue: true} + for _, tag := range existingTags { + if existingTagMap[tag.TagKey] == nil { + existingTagMap[tag.TagKey] = make(map[string]bool) + } + existingTagMap[tag.TagKey][tag.TagValue] = true + } + + // 构建新tags的map + newTagMap := make(map[string]map[string]bool) // tagKey -> {tagValue: true} + for tagKey, tagValues := range evaluator.Tags { + tagKeyStr := string(tagKey) + if newTagMap[tagKeyStr] == nil { + newTagMap[tagKeyStr] = make(map[string]bool) + } + for _, tagValue := range tagValues { + newTagMap[tagKeyStr][tagValue] = true + } + } + + // 找出需要删除的tags（在现有tags中但不在新tags中） + tagsToDelete := make(map[string][]string) + for tagKey, existingValues := range existingTagMap { + if newValues, exists := newTagMap[tagKey]; exists { + // 该tagKey存在，检查需要删除的值 + for tagValue := range existingValues { + if !newValues[tagValue] { + tagsToDelete[tagKey] = append(tagsToDelete[tagKey], tagValue) + } + } + } else { + // 该tagKey不存在，删除所有值 + for tagValue := range existingValues { + tagsToDelete[tagKey] = append(tagsToDelete[tagKey], tagValue) + } + } + } + + // 找出需要新增的tags（在新tags中但不在现有tags中） + tagsToCreate := make(map[string][]string) + for tagKey, newValues := range newTagMap { + if existingValues, exists := existingTagMap[tagKey]; exists { + // 该tagKey存在，检查需要新增的值 + for tagValue := range newValues { + if !existingValues[tagValue] { + tagsToCreate[tagKey] = append(tagsToCreate[tagKey], tagValue) + } + } + } else { + // 该tagKey不存在，新增所有值 + for tagValue := range newValues { + tagsToCreate[tagKey] = append(tagsToCreate[tagKey], tagValue) + } + } + } + + // 删除不需要的tags + if len(tagsToDelete) > 0 { + err = r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, draftVersion.ID, int32(entity.EvaluatorTagKeyType_Evaluator), tagsToDelete, opt) + if err != nil { + return err + } + } + + // 新增需要的tags + if len(tagsToCreate) > 0 { + err = r.tagDAO.BatchCreateEvaluatorTags(ctx, draftVersion.ID, int32(entity.EvaluatorTagKeyType_Evaluator), userID, tagsToCreate, opt) + if err != nil { + return err + } + } + } + + return nil + }) +} + func (r *EvaluatorRepoImpl) BatchGetEvaluatorMetaByID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { evaluatorPOS, err := r.evaluatorDao.BatchGetEvaluatorByID(ctx, ids, includeDeleted) if err != nil { @@ -160,7 +299,7 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorDraftByEvaluatorID(ctx context.Cont for _, evaluatorVersionPO := range evaluatorVersionPOS { evaluatorID2VersionPO[evaluatorVersionPO.EvaluatorID] = evaluatorVersionPO } - evaluatorPOS, err := r.evaluatorDao.BatchGetEvaluatorByID(ctx, ids, includeDeleted, opts...) + evaluatorPOS, err := r.evaluatorDao.BatchGetEvaluatorByID(ctx, ids, includeDeleted, opts...) if err != nil { return nil, err } @@ -168,8 +307,30 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorDraftByEvaluatorID(ctx context.Cont for _, evaluatorPO := range evaluatorPOS { evaluatorMap[evaluatorPO.ID] = evaluatorPO } + // 如果是预置评估器，收集草稿版本ID用于批量查询tags（以版本ID为source_id） + builtinVersionIDs := make([]int64, 0) + for _, evaluatorPO := range evaluatorPOS { + if evaluatorPO.Builtin == 1 { + if evPO, ok := evaluatorID2VersionPO[evaluatorPO.ID]; ok && evPO != nil { + builtinVersionIDs = append(builtinVersionIDs, evPO.ID) + } + } + } + // 批量查询所有tags + var allTags []*model.EvaluatorTag + if len(builtinVersionIDs) > 0 { + allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, builtinVersionIDs, int32(entity.EvaluatorTagKeyType_Evaluator), opts...) + if err != nil { + allTags = []*model.EvaluatorTag{} + } + } + // 将tags按sourceID分组 + tagsBySourceID := make(map[int64][]*model.EvaluatorTag) + for _, tag := range allTags { + tagsBySourceID[tag.SourceID] = append(tagsBySourceID[tag.SourceID], tag) + } evaluatorDOList := make([]*entity.Evaluator, 0, len(evaluatorPOS)) - for _, evaluatorPO := range evaluatorPOS { + for _, evaluatorPO := range evaluatorPOS { evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorPO) if evaluatorVersionPO, exist := evaluatorID2VersionPO[evaluatorPO.ID]; exist { evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) @@ -177,6 +338,10 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorDraftByEvaluatorID(ctx context.Cont return nil, err } evaluatorDO.SetEvaluatorVersion(evaluatorVersionDO) + // 如果是预置评估器，回填该草稿版本的tags（以版本ID为source_id） + if evaluatorPO.Builtin == 1 { + r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.ID, tagsBySourceID) + } } evaluatorDOList = append(evaluatorDOList, evaluatorDO) } @@ -258,7 +423,10 @@ func (r *EvaluatorRepoImpl) CreateEvaluator(ctx context.Context, do *entity.Eval evaluatorVersionPO.EvaluatorID = evaluatorPO.ID - err = r.dbProvider.Transaction(ctx, func(tx *gorm.DB) error { + // 获取用户ID（用于可能的内置评估器 tag 创建） + userID := session.UserIDInCtxOrEmpty(ctx) + + err = r.dbProvider.Transaction(ctx, func(tx *gorm.DB) error { opt := db.WithTransaction(tx) err = r.evaluatorDao.CreateEvaluator(ctx, evaluatorPO, opt) @@ -271,13 +439,23 @@ func (r *EvaluatorRepoImpl) CreateEvaluator(ctx context.Context, do *entity.Eval if err != nil { return err } - evaluatorVersionPO.ID = genIDs[2] + evaluatorVersionPO.ID = genIDs[2] evaluatorVersionPO.Version = consts.EvaluatorVersionDraftKey evaluatorVersionPO.Description = gptr.Of("") err = r.evaluatorVersionDao.CreateEvaluatorVersion(ctx, evaluatorVersionPO, opt) if err != nil { return err } + // 如果是内置评估器，创建 tags（以草稿版本ID为 source_id） + if do.Builtin && len(do.Tags) > 0 { + tags := make(map[string][]string) + for tagKey, tagValues := range do.Tags { + tags[string(tagKey)] = tagValues + } + if err = r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorVersionPO.ID, int32(entity.EvaluatorTagKeyType_Evaluator), userID, tags, opt); err != nil { + return err + } + } return nil }) if err != nil { @@ -288,6 +466,8 @@ func (r *EvaluatorRepoImpl) CreateEvaluator(ctx context.Context, do *entity.Eval return evaluatorID, nil } +// CreateBuiltinEvaluator 已移除：统一在 CreateEvaluator 中处理 builtin 逻辑 + // BatchGetEvaluatorDraft 批量根据ID 获取 Evaluator func (r *EvaluatorRepoImpl) BatchGetEvaluatorDraft(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { if len(ids) == 0 { @@ -335,6 +515,23 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorMeta(ctx context.Context, id int64, n return nil } +// UpdateBuiltinEvaluatorMeta 更新内置评估器的 benchmark 和 vendor 字段 +func (r *EvaluatorRepoImpl) UpdateBuiltinEvaluatorMeta(ctx context.Context, id int64, name, description, benchmark, vendor, userID string) error { + po := &model.Evaluator{ + ID: id, + Name: gptr.Of(name), + Description: gptr.Of(description), + Benchmark: gptr.Of(benchmark), + Vendor: gptr.Of(vendor), + UpdatedBy: userID, + } + err := r.evaluatorDao.UpdateBuiltinEvaluatorMeta(ctx, po) + if err != nil { + return err + } + return nil +} + // BatchDeleteEvaluator 根据 ID 删除 Evaluator func (r *EvaluatorRepoImpl) BatchDeleteEvaluator(ctx context.Context, ids []int64, userID string) (err error) { return r.dbProvider.Transaction(ctx, func(tx *gorm.DB) error { @@ -392,3 +589,206 @@ func (r *EvaluatorRepoImpl) ListEvaluator(ctx context.Context, req *repo.ListEva } return resp, nil } + +// ListBuiltinEvaluator 根据筛选条件查询内置评估器列表，支持tag筛选和分页 +func (r *EvaluatorRepoImpl) ListBuiltinEvaluator(ctx context.Context, req *repo.ListBuiltinEvaluatorRequest) (*repo.ListBuiltinEvaluatorResponse, error) { + evaluatorIDs := []int64{} + var err error + + // 处理筛选条件 + if req.FilterOption != nil { + // 检查是否有有效的筛选条件 + hasValidFilters := false + + // 检查SearchKeyword是否有效 + if req.FilterOption.SearchKeyword != nil && *req.FilterOption.SearchKeyword != "" { + hasValidFilters = true + } + + // 检查FilterConditions是否有效 + if req.FilterOption.Filters != nil && len(req.FilterOption.Filters.FilterConditions) > 0 { + hasValidFilters = true + } + + // 如果有有效的筛选条件，进行标签查询 + if hasValidFilters { + // 使用EvaluatorTagDAO查询符合条件的evaluator IDs（不分页） + filteredIDs, _, err := r.tagDAO.GetSourceIDsByFilterConditions(ctx, int32(entity.EvaluatorTagKeyType_Evaluator), req.FilterOption, 0, 0) + if err != nil { + return nil, err + } + + if len(filteredIDs) == 0 { + return &repo.ListBuiltinEvaluatorResponse{ + TotalCount: 0, + Evaluators: []*entity.Evaluator{}, + }, nil + } + + // 使用筛选后的IDs + evaluatorIDs = filteredIDs + } + } + + // 构建DAO层查询请求 + daoReq := &mysql.ListEvaluatorRequest{ + SpaceID: req.SpaceID, + SearchName: "", // 内置评估器不需要名称搜索 + CreatorIDs: []int64{}, // 内置评估器不需要创建者过滤 + EvaluatorType: []int32{}, // 可以根据需要添加类型过滤 + IDs: evaluatorIDs, // 使用筛选后的IDs + PageSize: req.PageSize, + PageNum: req.PageNum, + OrderBy: []*mysql.OrderBy{}, // 可以根据需要添加排序 + } + + // 调用DAO层查询 + daoResp, err := r.evaluatorDao.ListEvaluator(ctx, daoReq) + if err != nil { + return nil, err + } + + // 批量查询所有evaluator的tags + var allTags []*model.EvaluatorTag + if len(daoResp.Evaluators) > 0 { + // 收集所有evaluator的ID + evaluatorIDs := make([]int64, 0, len(daoResp.Evaluators)) + for _, evaluatorPO := range daoResp.Evaluators { + evaluatorIDs = append(evaluatorIDs, evaluatorPO.ID) + } + + // 批量查询所有tags + allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, evaluatorIDs, int32(entity.EvaluatorTagKeyType_Evaluator)) + if err != nil { + // 如果批量查询tags失败，记录错误但继续处理 + // 这里可以根据业务需求决定是否返回错误 + allTags = []*model.EvaluatorTag{} + } + } + + // 将tags按sourceID分组 + tagsBySourceID := make(map[int64][]*model.EvaluatorTag) + for _, tag := range allTags { + tagsBySourceID[tag.SourceID] = append(tagsBySourceID[tag.SourceID], tag) + } + + // 转换响应格式 + evaluators := make([]*entity.Evaluator, 0, len(daoResp.Evaluators)) + for _, evaluatorPO := range daoResp.Evaluators { + evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorPO) + + // 设置tags信息（使用提取出来的公共逻辑） + r.setEvaluatorTags(evaluatorDO, evaluatorPO.ID, tagsBySourceID) + + evaluators = append(evaluators, evaluatorDO) + } + + return &repo.ListBuiltinEvaluatorResponse{ + TotalCount: daoResp.TotalCount, + Evaluators: evaluators, + }, nil +} + +// BatchGetBuiltinEvaluatorByVersionID 批量根据版本ID获取内置评估器，包含tag信息 +func (r *EvaluatorRepoImpl) BatchGetBuiltinEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { + // 先获取evaluator版本信息 + evaluatorVersionPOS, err := r.evaluatorVersionDao.BatchGetEvaluatorVersionByID(ctx, spaceID, ids, includeDeleted) + if err != nil { + return nil, err + } + + // 获取evaluator基本信息 + evaluatorPOS, err := r.evaluatorDao.BatchGetEvaluatorByID(ctx, gslice.Map(evaluatorVersionPOS, func(t *model.EvaluatorVersion) int64 { + return t.EvaluatorID + }), includeDeleted) + if err != nil { + return nil, err + } + + // 构建evaluator映射 + evaluatorMap := make(map[int64]*model.Evaluator) + for _, evaluatorPO := range evaluatorPOS { + evaluatorMap[evaluatorPO.ID] = evaluatorPO + } + + // 收集所有 evaluator_version 的ID用于查询tags（以版本ID为source_id） + versionIDs := make([]int64, 0, len(evaluatorVersionPOS)) + for _, ev := range evaluatorVersionPOS { + versionIDs = append(versionIDs, ev.ID) + } + + // 批量查询所有tags（以版本ID为source_id） + var allTags []*model.EvaluatorTag + if len(versionIDs) > 0 { + allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, versionIDs, int32(entity.EvaluatorTagKeyType_Evaluator)) + if err != nil { + // 如果批量查询tags失败，记录错误但继续处理 + allTags = []*model.EvaluatorTag{} + } + } + + // 将tags按sourceID分组 + tagsBySourceID := make(map[int64][]*model.EvaluatorTag) + for _, tag := range allTags { + tagsBySourceID[tag.SourceID] = append(tagsBySourceID[tag.SourceID], tag) + } + + // 构建结果 + evaluatorDOList := make([]*entity.Evaluator, 0, len(evaluatorVersionPOS)) + for _, evaluatorVersionPO := range evaluatorVersionPOS { + if evaluatorVersionPO.EvaluatorType == nil { + continue + } + + evaluatorPO, exists := evaluatorMap[evaluatorVersionPO.EvaluatorID] + if !exists { + continue + } + + var evaluatorDO *entity.Evaluator + switch *evaluatorVersionPO.EvaluatorType { + case int32(entity.EvaluatorTypePrompt): + evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) + if err != nil { + return nil, err + } + evaluatorDO = convertor.ConvertEvaluatorPO2DO(evaluatorPO) + evaluatorDO.PromptEvaluatorVersion = evaluatorVersionDO.PromptEvaluatorVersion + evaluatorDO.EvaluatorType = entity.EvaluatorTypePrompt + + case int32(entity.EvaluatorTypeCode): + evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) + if err != nil { + return nil, err + } + evaluatorDO = convertor.ConvertEvaluatorPO2DO(evaluatorPO) + evaluatorDO.CodeEvaluatorVersion = evaluatorVersionDO.CodeEvaluatorVersion + evaluatorDO.EvaluatorType = entity.EvaluatorTypeCode + + default: + continue + } + + // 设置tags信息（以版本ID为source_id） + r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.ID, tagsBySourceID) + + evaluatorDOList = append(evaluatorDOList, evaluatorDO) + } + + return evaluatorDOList, nil +} + +// setEvaluatorTags 设置评估器的tag信息 +func (r *EvaluatorRepoImpl) setEvaluatorTags(evaluatorDO *entity.Evaluator, evaluatorID int64, tagsBySourceID map[int64][]*model.EvaluatorTag) { + if tags, exists := tagsBySourceID[evaluatorID]; exists && len(tags) > 0 { + tagMap := make(map[entity.EvaluatorTagKey][]string) + for _, tag := range tags { + tagKey := entity.EvaluatorTagKey(tag.TagKey) + if tagMap[tagKey] == nil { + tagMap[tagKey] = make([]string, 0) + } + tagMap[tagKey] = append(tagMap[tagKey], tag.TagValue) + } + evaluatorDO.Tags = tagMap + } +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index a7577f9cd..70e8d86dc 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -736,7 +736,8 @@ func TestEvaluatorRepoImpl_ListEvaluatorVersion(t *testing.T) { mockDBProvider := dbmocks.NewMockProvider(ctrl) mockLWT := platestwritemocks.NewMockILatestWriteTracker(ctrl) - evaluatorRepo := NewEvaluatorRepo(mockIDGen, mockDBProvider, mockEvaluatorDAO, mockEvaluatorVersionDAO, mockLWT) + mockTagDAO := evaluatormocks.NewMockEvaluatorTagDAO(ctrl) + evaluatorRepo := NewEvaluatorRepo(mockIDGen, mockDBProvider, mockEvaluatorDAO, mockEvaluatorVersionDAO, mockTagDAO, mockLWT) tests := []struct { name string @@ -1511,3 +1512,464 @@ func TestEvaluatorRepoImpl_ListEvaluator(t *testing.T) { }) } } + +func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) + mockEvaluatorDAO := evaluatormocks.NewMockEvaluatorDAO(ctrl) + mockEvaluatorVersionDAO := evaluatormocks.NewMockEvaluatorVersionDAO(ctrl) + mockTagDAO := evaluatormocks.NewMockEvaluatorTagDAO(ctrl) + mockDBProvider := dbmocks.NewMockProvider(ctrl) + mockLWT := platestwritemocks.NewMockILatestWriteTracker(ctrl) + + repo := NewEvaluatorRepo(mockIDGen, mockDBProvider, mockEvaluatorDAO, mockEvaluatorVersionDAO, mockTagDAO, mockLWT) + + tests := []struct { + name string + evaluator *entity.Evaluator + mockSetup func() + expectedError error + }{ + { + name: "成功更新内置评估器草稿，包含tag更新", + evaluator: &entity.Evaluator{ + ID: 1, + EvaluatorType: entity.EvaluatorTypePrompt, + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + Tags: map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagKey_Category: {"LLM", "Code"}, + entity.EvaluatorTagKey_Objective: {"Quality"}, + }, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + Version: "1.0.0", + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + }, + }, + mockSetup: func() { + // 设置数据库事务的期望 + mockDBProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + // 设置更新评估器草稿状态的期望 + mockEvaluatorDAO.EXPECT(). + UpdateEvaluatorDraftSubmitted(gomock.Any(), int64(1), false, "test_user", gomock.Any()). + Return(nil) + + // 设置更新评估器草稿的期望 + mockEvaluatorVersionDAO.EXPECT(). + UpdateEvaluatorDraft(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + + // 设置获取草稿版本的期望 + mockEvaluatorVersionDAO.EXPECT(). + BatchGetEvaluatorDraftByEvaluatorID(gomock.Any(), []int64{1}, false, gomock.Any()). + Return([]*model.EvaluatorVersion{ + { + ID: 100, // 草稿版本ID + EvaluatorID: 1, + Version: "draft", + }, + }, nil) + + // 设置获取现有tags的期望 + mockTagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{100}, int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any()). + Return([]*model.EvaluatorTag{ + { + ID: 1, + SourceID: 100, + TagKey: "Category", + TagValue: "LLM", + }, + { + ID: 2, + SourceID: 100, + TagKey: "Objective", + TagValue: "Performance", + }, + }, nil) + + // 设置删除不需要的tags的期望 + mockTagDAO.EXPECT(). + DeleteEvaluatorTagsByConditions(gomock.Any(), int64(100), int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any(), gomock.Any()). + Return(nil) + + // 设置新增tags的期望 + mockTagDAO.EXPECT(). + BatchCreateEvaluatorTags(gomock.Any(), int64(100), int32(entity.EvaluatorTagKeyType_Evaluator), "test_user", gomock.Any(), gomock.Any()). + Return(nil) + }, + expectedError: nil, + }, + { + name: "成功更新内置评估器草稿，无tag更新", + evaluator: &entity.Evaluator{ + ID: 1, + EvaluatorType: entity.EvaluatorTypePrompt, + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + Version: "1.0.0", + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + }, + }, + mockSetup: func() { + // 设置数据库事务的期望 + mockDBProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + // 设置更新评估器草稿状态的期望 + mockEvaluatorDAO.EXPECT(). + UpdateEvaluatorDraftSubmitted(gomock.Any(), int64(1), false, "test_user", gomock.Any()). + Return(nil) + + // 设置更新评估器草稿的期望 + mockEvaluatorVersionDAO.EXPECT(). + UpdateEvaluatorDraft(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + }, + expectedError: nil, + }, + { + name: "失败 - 草稿版本不存在", + evaluator: &entity.Evaluator{ + ID: 1, + EvaluatorType: entity.EvaluatorTypePrompt, + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + Tags: map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + Version: "1.0.0", + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + }, + }, + mockSetup: func() { + // 设置数据库事务的期望 + mockDBProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + // 设置更新评估器草稿状态的期望 + mockEvaluatorDAO.EXPECT(). + UpdateEvaluatorDraftSubmitted(gomock.Any(), int64(1), false, "test_user", gomock.Any()). + Return(nil) + + // 设置更新评估器草稿的期望 + mockEvaluatorVersionDAO.EXPECT(). + UpdateEvaluatorDraft(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + + // 设置获取草稿版本的期望 - 返回空列表 + mockEvaluatorVersionDAO.EXPECT(). + BatchGetEvaluatorDraftByEvaluatorID(gomock.Any(), []int64{1}, false, gomock.Any()). + Return([]*model.EvaluatorVersion{}, nil) + }, + expectedError: assert.AnError, // 期望返回错误 + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + err := repo.UpdateBuiltinEvaluatorDraft(context.Background(), tt.evaluator) + if tt.expectedError != nil { + assert.Error(t, err) + } else { + assert.NoError(t, err) + } + }) + } +} + +func TestEvaluatorRepoImpl_BatchGetBuiltinEvaluatorByVersionID(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) + mockEvaluatorDAO := evaluatormocks.NewMockEvaluatorDAO(ctrl) + mockEvaluatorVersionDAO := evaluatormocks.NewMockEvaluatorVersionDAO(ctrl) + mockTagDAO := evaluatormocks.NewMockEvaluatorTagDAO(ctrl) + mockDBProvider := dbmocks.NewMockProvider(ctrl) + mockLWT := platestwritemocks.NewMockILatestWriteTracker(ctrl) + + tests := []struct { + name string + spaceID *int64 + ids []int64 + includeDeleted bool + mockSetup func() + expectedResult []*entity.Evaluator + expectedError error + }{ + { + name: "成功批量获取内置评估器版本，包含tag信息", + spaceID: gptr.Of(int64(1)), + ids: []int64{1, 2}, + includeDeleted: false, + mockSetup: func() { + // 设置获取评估器版本的期望 + mockEvaluatorVersionDAO.EXPECT(). + BatchGetEvaluatorVersionByID(gomock.Any(), gptr.Of(int64(1)), []int64{1, 2}, false). + Return([]*model.EvaluatorVersion{ + { + ID: 1, + EvaluatorID: 1, + EvaluatorType: gptr.Of(int32(entity.EvaluatorTypePrompt)), + Version: "1.0.0", + }, + { + ID: 2, + EvaluatorID: 2, + EvaluatorType: gptr.Of(int32(entity.EvaluatorTypeCode)), + Version: "1.0.0", + }, + }, nil) + + // 设置获取评估器基本信息的期望 + mockEvaluatorDAO.EXPECT(). + BatchGetEvaluatorByID(gomock.Any(), []int64{1, 2}, false). + Return([]*model.Evaluator{ + { + ID: 1, + Name: gptr.Of("Test Evaluator 1"), + EvaluatorType: int32(entity.EvaluatorTypePrompt), + }, + { + ID: 2, + Name: gptr.Of("Test Evaluator 2"), + EvaluatorType: int32(entity.EvaluatorTypeCode), + }, + }, nil) + + // 设置获取tag信息的期望 + mockTagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{1, 2}, int32(entity.EvaluatorTagKeyType_Evaluator)). + Return([]*model.EvaluatorTag{ + { + SourceID: 1, + TagKey: "category", + TagValue: "test", + }, + { + SourceID: 2, + TagKey: "category", + TagValue: "production", + }, + }, nil) + }, + expectedResult: []*entity.Evaluator{ + { + ID: 1, + Name: "Test Evaluator 1", + EvaluatorType: entity.EvaluatorTypePrompt, + Tags: map[entity.EvaluatorTagKey][]string{ + "category": {"test"}, + }, + }, + { + ID: 2, + Name: "Test Evaluator 2", + EvaluatorType: entity.EvaluatorTypeCode, + Tags: map[entity.EvaluatorTagKey][]string{ + "category": {"production"}, + }, + }, + }, + expectedError: nil, + }, + { + name: "获取评估器版本失败", + spaceID: gptr.Of(int64(1)), + ids: []int64{1, 2}, + includeDeleted: false, + mockSetup: func() { + mockEvaluatorVersionDAO.EXPECT(). + BatchGetEvaluatorVersionByID(gomock.Any(), gptr.Of(int64(1)), []int64{1, 2}, false). + Return(nil, assert.AnError) + }, + expectedResult: nil, + expectedError: assert.AnError, + }, + { + name: "获取tag信息失败，但继续处理", + spaceID: gptr.Of(int64(1)), + ids: []int64{1}, + includeDeleted: false, + mockSetup: func() { + mockEvaluatorVersionDAO.EXPECT(). + BatchGetEvaluatorVersionByID(gomock.Any(), gptr.Of(int64(1)), []int64{1}, false). + Return([]*model.EvaluatorVersion{ + { + ID: 1, + EvaluatorID: 1, + EvaluatorType: gptr.Of(int32(entity.EvaluatorTypePrompt)), + Version: "1.0.0", + }, + }, nil) + + mockEvaluatorDAO.EXPECT(). + BatchGetEvaluatorByID(gomock.Any(), []int64{1}, false). + Return([]*model.Evaluator{ + { + ID: 1, + Name: gptr.Of("Test Evaluator 1"), + EvaluatorType: int32(entity.EvaluatorTypePrompt), + }, + }, nil) + + // tag查询失败，但方法应该继续处理 + mockTagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{1}, int32(entity.EvaluatorTagKeyType_Evaluator)). + Return(nil, assert.AnError) + }, + expectedResult: []*entity.Evaluator{ + { + ID: 1, + Name: "Test Evaluator 1", + EvaluatorType: entity.EvaluatorTypePrompt, + Tags: nil, // 没有tag信息 + }, + }, + expectedError: nil, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + repo := &EvaluatorRepoImpl{ + evaluatorDao: mockEvaluatorDAO, + evaluatorVersionDao: mockEvaluatorVersionDAO, + tagDAO: mockTagDAO, + dbProvider: mockDBProvider, + idgen: mockIDGen, + lwt: mockLWT, + } + + result, err := repo.BatchGetBuiltinEvaluatorByVersionID(context.Background(), tt.spaceID, tt.ids, tt.includeDeleted) + if tt.expectedError != nil { + assert.Error(t, err) + assert.Equal(t, tt.expectedError, err) + } else { + assert.NoError(t, err) + assert.Equal(t, len(tt.expectedResult), len(result)) + for i, expected := range tt.expectedResult { + assert.Equal(t, expected.ID, result[i].ID) + assert.Equal(t, expected.Name, result[i].Name) + assert.Equal(t, expected.EvaluatorType, result[i].EvaluatorType) + assert.Equal(t, expected.Tags, result[i].Tags) + } + } + }) + } +} + +func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorMeta(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) + mockEvaluatorDAO := evaluatormocks.NewMockEvaluatorDAO(ctrl) + mockEvaluatorVersionDAO := evaluatormocks.NewMockEvaluatorVersionDAO(ctrl) + mockTagDAO := evaluatormocks.NewMockEvaluatorTagDAO(ctrl) + mockDBProvider := dbmocks.NewMockProvider(ctrl) + mockLWT := platestwritemocks.NewMockILatestWriteTracker(ctrl) + + tests := []struct { + name string + id int64 + benchmark string + vendor string + userID string + mockSetup func() + expectedError error + }{ + { + name: "成功更新内置评估器元数据", + id: 1, + benchmark: "test_benchmark", + vendor: "test_vendor", + userID: "test_user", + mockSetup: func() { + mockEvaluatorDAO.EXPECT(). + UpdateBuiltinEvaluatorMeta(gomock.Any(), gomock.Any()). + Return(nil) + }, + expectedError: nil, + }, + { + name: "更新内置评估器元数据失败", + id: 2, + benchmark: "test_benchmark", + vendor: "test_vendor", + userID: "test_user", + mockSetup: func() { + mockEvaluatorDAO.EXPECT(). + UpdateBuiltinEvaluatorMeta(gomock.Any(), gomock.Any()). + Return(assert.AnError) + }, + expectedError: assert.AnError, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + repo := &EvaluatorRepoImpl{ + evaluatorDao: mockEvaluatorDAO, + evaluatorVersionDao: mockEvaluatorVersionDAO, + tagDAO: mockTagDAO, + dbProvider: mockDBProvider, + idgen: mockIDGen, + lwt: mockLWT, + } + + err := repo.UpdateBuiltinEvaluatorMeta(context.Background(), tt.id, "", "", tt.benchmark, tt.vendor, tt.userID) + if tt.expectedError != nil { + assert.Error(t, err) + assert.Equal(t, tt.expectedError, err) + } else { + assert.NoError(t, err) + } + }) + } +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go new file mode 100644 index 000000000..40745d0ac --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go @@ -0,0 +1,178 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package evaluator + +import ( + "context" + "errors" + + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor" +) + +// EvaluatorTemplateRepoImpl 实现 EvaluatorTemplateRepo 接口 +type EvaluatorTemplateRepoImpl struct { + tagDAO mysql.EvaluatorTagDAO + templateDAO mysql.EvaluatorTemplateDAO +} + +// NewEvaluatorTemplateRepo 创建 EvaluatorTemplateRepoImpl 实例 +func NewEvaluatorTemplateRepo(tagDAO mysql.EvaluatorTagDAO, templateDAO mysql.EvaluatorTemplateDAO) repo.EvaluatorTemplateRepo { + return &EvaluatorTemplateRepoImpl{ + tagDAO: tagDAO, + templateDAO: templateDAO, + } +} + +// ListEvaluatorTemplate 根据筛选条件查询evaluator_template列表，支持tag筛选和分页 +func (r *EvaluatorTemplateRepoImpl) ListEvaluatorTemplate(ctx context.Context, req *repo.ListEvaluatorTemplateRequest) (*repo.ListEvaluatorTemplateResponse, error) { + templateIDs := []int64{} + var err error + + // 处理筛选条件 + if req.FilterOption != nil { + // 检查是否有有效的筛选条件 + hasValidFilters := false + + // 检查SearchKeyword是否有效 + if req.FilterOption.SearchKeyword != nil && *req.FilterOption.SearchKeyword != "" { + hasValidFilters = true + } + + // 检查FilterConditions是否有效 + if req.FilterOption.Filters != nil && len(req.FilterOption.Filters.FilterConditions) > 0 { + hasValidFilters = true + } + + // 如果有有效的筛选条件，进行标签查询 + if hasValidFilters { + // 使用EvaluatorTagDAO查询符合条件的template IDs（不分页） + filteredIDs, _, err := r.tagDAO.GetSourceIDsByFilterConditions(ctx, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), req.FilterOption, 0, 0) + if err != nil { + return nil, err + } + + if len(filteredIDs) == 0 { + return &repo.ListEvaluatorTemplateResponse{ + TotalCount: 0, + Templates: []*entity.EvaluatorTemplate{}, + }, nil + } + + // 使用筛选后的IDs + templateIDs = filteredIDs + } + } + + // 构建DAO层查询请求 + daoReq := &mysql.ListEvaluatorTemplateRequest{ + IDs: templateIDs, + PageSize: req.PageSize, + PageNum: req.PageNum, + IncludeDeleted: req.IncludeDeleted, + } + + // 调用DAO层查询 + daoResp, err := r.templateDAO.ListEvaluatorTemplate(ctx, daoReq) + if err != nil { + return nil, err + } + + // 转换响应格式 + templates := make([]*entity.EvaluatorTemplate, 0, len(daoResp.Templates)) + for _, templatePO := range daoResp.Templates { + templateDO, err := convertor.ConvertEvaluatorTemplatePO2DOWithBaseInfo(templatePO) + if err != nil { + return nil, err + } + templates = append(templates, templateDO) + } + + return &repo.ListEvaluatorTemplateResponse{ + TotalCount: daoResp.TotalCount, + Templates: templates, + }, nil +} + +// CreateEvaluatorTemplate 创建评估器模板 +func (r *EvaluatorTemplateRepoImpl) CreateEvaluatorTemplate(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { + if template == nil { + return nil, errors.New("template cannot be nil") + } + + // 转换DO到PO + templatePO, err := convertor.ConvertEvaluatorTemplateDO2PO(template) + if err != nil { + return nil, err + } + + // 调用DAO层创建 + createdPO, err := r.templateDAO.CreateEvaluatorTemplate(ctx, templatePO) + if err != nil { + return nil, err + } + + // 转换PO到DO + createdDO, err := convertor.ConvertEvaluatorTemplatePO2DOWithBaseInfo(createdPO) + if err != nil { + return nil, err + } + + return createdDO, nil +} + +// UpdateEvaluatorTemplate 更新评估器模板 +func (r *EvaluatorTemplateRepoImpl) UpdateEvaluatorTemplate(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { + if template == nil { + return nil, errors.New("template cannot be nil") + } + + // 转换DO到PO + templatePO, err := convertor.ConvertEvaluatorTemplateDO2PO(template) + if err != nil { + return nil, err + } + + // 调用DAO层更新 + updatedPO, err := r.templateDAO.UpdateEvaluatorTemplate(ctx, templatePO) + if err != nil { + return nil, err + } + + // 转换PO到DO + updatedDO, err := convertor.ConvertEvaluatorTemplatePO2DOWithBaseInfo(updatedPO) + if err != nil { + return nil, err + } + + return updatedDO, nil +} + +// DeleteEvaluatorTemplate 删除评估器模板（软删除） +func (r *EvaluatorTemplateRepoImpl) DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string) error { + return r.templateDAO.DeleteEvaluatorTemplate(ctx, id, userID) +} + +// GetEvaluatorTemplate 根据ID获取评估器模板 +func (r *EvaluatorTemplateRepoImpl) GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool) (*entity.EvaluatorTemplate, error) { + // 调用DAO层查询 + templatePO, err := r.templateDAO.GetEvaluatorTemplate(ctx, id, includeDeleted) + if err != nil { + return nil, err + } + + if templatePO == nil { + return nil, nil + } + + // 转换PO到DO + templateDO, err := convertor.ConvertEvaluatorTemplatePO2DOWithBaseInfo(templatePO) + if err != nil { + return nil, err + } + + return templateDO, nil +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go new file mode 100644 index 000000000..c90e5cdfb --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go @@ -0,0 +1,808 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package evaluator + +import ( + "context" + "errors" + "testing" + + "github.com/bytedance/gg/gptr" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + + "github.com/coze-dev/coze-loop/backend/infra/db" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" +) + +// MockEvaluatorTagDAO 模拟标签DAO +type MockEvaluatorTagDAO struct { + mock.Mock +} + +func (m *MockEvaluatorTagDAO) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, opts ...db.Option) ([]int64, int64, error) { + args := m.Called(ctx, tagType, filterOption, pageSize, pageNum, opts) + return args.Get(0).([]int64), args.Get(1).(int64), args.Error(2) +} + +func (m *MockEvaluatorTagDAO) BatchCreateEvaluatorTags(ctx context.Context, sourceID int64, tagType int32, userID string, tags map[string][]string, opts ...db.Option) error { + args := m.Called(ctx, sourceID, tagType, userID, tags, opts) + return args.Error(0) +} + +func (m *MockEvaluatorTagDAO) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, tags map[string][]string, opts ...db.Option) error { + args := m.Called(ctx, sourceID, tagType, tags, opts) + return args.Error(0) +} + +func (m *MockEvaluatorTagDAO) BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, opts ...db.Option) ([]*model.EvaluatorTag, error) { + args := m.Called(ctx, sourceIDs, tagType, opts) + return args.Get(0).([]*model.EvaluatorTag), args.Error(1) +} + +// MockEvaluatorTemplateDAO 模拟模板DAO +type MockEvaluatorTemplateDAO struct { + mock.Mock +} + +func (m *MockEvaluatorTemplateDAO) CreateEvaluatorTemplate(ctx context.Context, template *model.EvaluatorTemplate, opts ...db.Option) (*model.EvaluatorTemplate, error) { + args := m.Called(ctx, template, opts) + return args.Get(0).(*model.EvaluatorTemplate), args.Error(1) +} + +func (m *MockEvaluatorTemplateDAO) UpdateEvaluatorTemplate(ctx context.Context, template *model.EvaluatorTemplate, opts ...db.Option) (*model.EvaluatorTemplate, error) { + args := m.Called(ctx, template, opts) + return args.Get(0).(*model.EvaluatorTemplate), args.Error(1) +} + +func (m *MockEvaluatorTemplateDAO) DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string, opts ...db.Option) error { + args := m.Called(ctx, id, userID, opts) + return args.Error(0) +} + +func (m *MockEvaluatorTemplateDAO) GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool, opts ...db.Option) (*model.EvaluatorTemplate, error) { + args := m.Called(ctx, id, includeDeleted, opts) + return args.Get(0).(*model.EvaluatorTemplate), args.Error(1) +} + +func (m *MockEvaluatorTemplateDAO) ListEvaluatorTemplate(ctx context.Context, req *mysql.ListEvaluatorTemplateRequest, opts ...db.Option) (*mysql.ListEvaluatorTemplateResponse, error) { + args := m.Called(ctx, req, opts) + return args.Get(0).(*mysql.ListEvaluatorTemplateResponse), args.Error(1) +} + +func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + request *repo.ListEvaluatorTemplateRequest + mockTagIDs []int64 + mockTagError error + mockTemplates *mysql.ListEvaluatorTemplateResponse + mockTemplateError error + expectedResult *repo.ListEvaluatorTemplateResponse + expectedError bool + description string + }{ + { + name: "no filter conditions", + request: &repo.ListEvaluatorTemplateRequest{ + SpaceID: 123, + FilterOption: nil, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockTemplates: &mysql.ListEvaluatorTemplateResponse{ + TotalCount: 2, + Templates: []*model.EvaluatorTemplate{ + { + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template A"), + Description: gptr.Of("Description A"), + EvaluatorType: gptr.Of(int32(1)), + Benchmark: gptr.Of("benchmark1"), + Vendor: gptr.Of("vendor1"), + Popularity: 100, + CreatedBy: "user1", + UpdatedBy: "user1", + }, + { + ID: 2, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template B"), + Description: gptr.Of("Description B"), + EvaluatorType: gptr.Of(int32(2)), + Benchmark: gptr.Of("benchmark2"), + Vendor: gptr.Of("vendor2"), + Popularity: 200, + CreatedBy: "user2", + UpdatedBy: "user2", + }, + }, + }, + expectedResult: &repo.ListEvaluatorTemplateResponse{ + TotalCount: 2, + Templates: []*entity.EvaluatorTemplate{ + { + ID: 1, + SpaceID: 123, + Name: "Template A", + Description: "Description A", + EvaluatorType: entity.EvaluatorType(1), + Benchmark: "benchmark1", + Vendor: "vendor1", + Popularity: 100, + BaseInfo: &entity.BaseInfo{ + CreatedBy: &entity.UserInfo{ + UserID: gptr.Of("user1"), + }, + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("user1"), + }, + }, + }, + { + ID: 2, + SpaceID: 123, + Name: "Template B", + Description: "Description B", + EvaluatorType: entity.EvaluatorType(2), + Benchmark: "benchmark2", + Vendor: "vendor2", + Popularity: 200, + BaseInfo: &entity.BaseInfo{ + CreatedBy: &entity.UserInfo{ + UserID: gptr.Of("user2"), + }, + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("user2"), + }, + }, + }, + }, + }, + expectedError: false, + description: "无筛选条件时，应该直接查询所有模板", + }, + { + name: "with filter conditions", + request: &repo.ListEvaluatorTemplateRequest{ + SpaceID: 123, + FilterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "LLM", + )), + ), + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockTagIDs: []int64{1, 3}, + mockTemplates: &mysql.ListEvaluatorTemplateResponse{ + TotalCount: 1, + Templates: []*model.EvaluatorTemplate{ + { + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template A"), + Description: gptr.Of("Description A"), + EvaluatorType: gptr.Of(int32(1)), + Benchmark: gptr.Of("benchmark1"), + Vendor: gptr.Of("vendor1"), + Popularity: 100, + CreatedBy: "user1", + UpdatedBy: "user1", + }, + }, + }, + expectedResult: &repo.ListEvaluatorTemplateResponse{ + TotalCount: 1, + Templates: []*entity.EvaluatorTemplate{ + { + ID: 1, + SpaceID: 123, + Name: "Template A", + Description: "Description A", + EvaluatorType: entity.EvaluatorType(1), + Benchmark: "benchmark1", + Vendor: "vendor1", + Popularity: 100, + BaseInfo: &entity.BaseInfo{ + CreatedBy: &entity.UserInfo{ + UserID: gptr.Of("user1"), + }, + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("user1"), + }, + }, + }, + }, + }, + expectedError: false, + description: "有筛选条件时，应该先通过标签查询获取ID，再查询模板详情", + }, + { + name: "tag query error", + request: &repo.ListEvaluatorTemplateRequest{ + SpaceID: 123, + FilterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "LLM", + )), + ), + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockTagError: assert.AnError, + expectedError: true, + description: "标签查询出错时，应该返回错误", + }, + { + name: "template query error", + request: &repo.ListEvaluatorTemplateRequest{ + SpaceID: 123, + FilterOption: nil, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockTemplateError: assert.AnError, + expectedError: true, + description: "模板查询出错时，应该返回错误", + }, + { + name: "empty search keyword", + request: &repo.ListEvaluatorTemplateRequest{ + SpaceID: 123, + FilterOption: entity.NewEvaluatorFilterOption(). + WithSearchKeyword(""), + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockTemplates: &mysql.ListEvaluatorTemplateResponse{ + TotalCount: 2, + Templates: []*model.EvaluatorTemplate{ + { + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template A"), + Description: gptr.Of("Description A"), + EvaluatorType: gptr.Of(int32(1)), + Benchmark: gptr.Of("benchmark1"), + Vendor: gptr.Of("vendor1"), + Popularity: 100, + CreatedBy: "user1", + UpdatedBy: "user1", + }, + }, + }, + expectedResult: &repo.ListEvaluatorTemplateResponse{ + TotalCount: 2, + Templates: []*entity.EvaluatorTemplate{ + { + ID: 1, + SpaceID: 123, + Name: "Template A", + Description: "Description A", + EvaluatorType: entity.EvaluatorType(1), + Benchmark: "benchmark1", + Vendor: "vendor1", + Popularity: 100, + BaseInfo: &entity.BaseInfo{ + CreatedBy: &entity.UserInfo{ + UserID: gptr.Of("user1"), + }, + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("user1"), + }, + }, + }, + }, + }, + expectedError: false, + description: "空搜索关键词时，应该忽略筛选条件，查询所有模板", + }, + { + name: "filter conditions hit zero results", + request: &repo.ListEvaluatorTemplateRequest{ + SpaceID: 123, + FilterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "NonExistentCategory", + )), + ), + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockTagIDs: []int64{}, // 空结果 + expectedResult: &repo.ListEvaluatorTemplateResponse{ + TotalCount: 0, + Templates: []*entity.EvaluatorTemplate{}, + }, + expectedError: false, + description: "筛选条件命中数为0时，应该直接返回空结果", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + // 创建mock对象 + mockTagDAO := &MockEvaluatorTagDAO{} + mockTemplateDAO := &MockEvaluatorTemplateDAO{} + + // 设置mock期望 + hasValidFilters := false + if tt.request.FilterOption != nil { + // 检查SearchKeyword是否有效 + if tt.request.FilterOption.SearchKeyword != nil && *tt.request.FilterOption.SearchKeyword != "" { + hasValidFilters = true + } + // 检查FilterConditions是否有效 + if tt.request.FilterOption.Filters != nil && len(tt.request.FilterOption.Filters.FilterConditions) > 0 { + hasValidFilters = true + } + } + + if hasValidFilters { + mockTagDAO.On("GetSourceIDsByFilterConditions", mock.Anything, int32(2), tt.request.FilterOption, int32(0), int32(0), mock.Anything).Return(tt.mockTagIDs, int64(len(tt.mockTagIDs)), tt.mockTagError) + } + + // 设置templateDAO的期望 + // 只有在tag查询有错误或筛选条件命中数为0时才不设置templateDAO的期望 + if tt.mockTagError == nil && !(hasValidFilters && len(tt.mockTagIDs) == 0) { + // 如果有筛选条件，templateDAO应该被调用时传入筛选后的IDs + // 如果没有筛选条件，templateDAO应该被调用时传入空的IDs + expectedIDs := []int64{} + if hasValidFilters { + expectedIDs = tt.mockTagIDs + } + // 确保不是nil + if expectedIDs == nil { + expectedIDs = []int64{} + } + + expectedDAOReq := &mysql.ListEvaluatorTemplateRequest{ + IDs: expectedIDs, + PageSize: tt.request.PageSize, + PageNum: tt.request.PageNum, + IncludeDeleted: tt.request.IncludeDeleted, + } + mockTemplateDAO.On("ListEvaluatorTemplate", mock.Anything, expectedDAOReq, mock.Anything).Return(tt.mockTemplates, tt.mockTemplateError) + } + + // 创建repo实例 + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO) + + // 执行测试 + ctx := context.Background() + result, err := repo.ListEvaluatorTemplate(ctx, tt.request) + + // 验证结果 + if tt.expectedError { + assert.Error(t, err) + } else { + assert.NoError(t, err) + assert.Equal(t, tt.expectedResult.TotalCount, result.TotalCount) + assert.Len(t, result.Templates, len(tt.expectedResult.Templates)) + + // 验证模板内容 + for i, template := range result.Templates { + expected := tt.expectedResult.Templates[i] + assert.Equal(t, expected.ID, template.ID) + assert.Equal(t, expected.SpaceID, template.SpaceID) + assert.Equal(t, expected.Name, template.Name) + assert.Equal(t, expected.Description, template.Description) + assert.Equal(t, expected.EvaluatorType, template.EvaluatorType) + assert.Equal(t, expected.Benchmark, template.Benchmark) + assert.Equal(t, expected.Vendor, template.Vendor) + assert.Equal(t, expected.Popularity, template.Popularity) + assert.NotNil(t, template.BaseInfo) + assert.NotNil(t, template.BaseInfo.CreatedBy) + assert.NotNil(t, template.BaseInfo.UpdatedBy) + } + } + + // 验证mock调用 + mockTagDAO.AssertExpectations(t) + mockTemplateDAO.AssertExpectations(t) + }) + } +} + +func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + po *model.EvaluatorTemplate + expected *entity.EvaluatorTemplate + }{ + { + name: "nil po", + po: nil, + expected: nil, + }, + { + name: "valid po", + po: &model.EvaluatorTemplate{ + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Test Template"), + Description: gptr.Of("Test Description"), + EvaluatorType: gptr.Of(int32(1)), + Benchmark: gptr.Of("test_benchmark"), + Vendor: gptr.Of("test_vendor"), + Popularity: 100, + CreatedBy: "user1", + UpdatedBy: "user1", + }, + expected: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 123, + Name: "Test Template", + Description: "Test Description", + EvaluatorType: entity.EvaluatorType(1), + Benchmark: "test_benchmark", + Vendor: "test_vendor", + Popularity: 100, + BaseInfo: &entity.BaseInfo{ + CreatedBy: &entity.UserInfo{ + UserID: gptr.Of("user1"), + }, + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("user1"), + }, + }, + }, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + result, err := convertor.ConvertEvaluatorTemplatePO2DOWithBaseInfo(tt.po) + assert.NoError(t, err) + + if tt.expected == nil { + assert.Nil(t, result) + } else { + assert.NotNil(t, result) + assert.Equal(t, tt.expected.ID, result.ID) + assert.Equal(t, tt.expected.SpaceID, result.SpaceID) + assert.Equal(t, tt.expected.Name, result.Name) + assert.Equal(t, tt.expected.Description, result.Description) + assert.Equal(t, tt.expected.EvaluatorType, result.EvaluatorType) + assert.Equal(t, tt.expected.Benchmark, result.Benchmark) + assert.Equal(t, tt.expected.Vendor, result.Vendor) + assert.Equal(t, tt.expected.Popularity, result.Popularity) + assert.NotNil(t, result.BaseInfo) + assert.NotNil(t, result.BaseInfo.CreatedBy) + assert.NotNil(t, result.BaseInfo.UpdatedBy) + assert.Equal(t, tt.expected.BaseInfo.CreatedBy.UserID, result.BaseInfo.CreatedBy.UserID) + assert.Equal(t, tt.expected.BaseInfo.UpdatedBy.UserID, result.BaseInfo.UpdatedBy.UserID) + } + }) + } +} + +// TestEvaluatorTemplateRepoImpl_CreateEvaluatorTemplate 测试创建评估器模板 +func TestEvaluatorTemplateRepoImpl_CreateEvaluatorTemplate(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + template *entity.EvaluatorTemplate + mockTemplate *model.EvaluatorTemplate + mockError error + expectedResult *entity.EvaluatorTemplate + expectedError bool + description string + }{ + { + name: "successful creation", + template: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Test Template", + Description: "Test Description", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + mockTemplate: &model.EvaluatorTemplate{ + ID: 1, + SpaceID: gptr.Of(int64(100)), + Name: gptr.Of("Test Template"), + Description: gptr.Of("Test Description"), + EvaluatorType: gptr.Of(int32(1)), + }, + expectedResult: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Test Template", + Description: "Test Description", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + expectedError: false, + description: "成功创建评估器模板", + }, + { + name: "nil template", + template: nil, + expectedError: true, + description: "传入nil模板应该返回错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + mockTemplateDAO := &MockEvaluatorTemplateDAO{} + mockTagDAO := &MockEvaluatorTagDAO{} + + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO) + + if tt.template != nil { + mockTemplateDAO.On("CreateEvaluatorTemplate", mock.Anything, mock.Anything, mock.Anything).Return(tt.mockTemplate, tt.mockError) + } + + result, err := repo.CreateEvaluatorTemplate(context.Background(), tt.template) + + if tt.expectedError { + assert.Error(t, err) + assert.Nil(t, result) + } else { + assert.NoError(t, err) + assert.NotNil(t, result) + assert.Equal(t, tt.expectedResult.ID, result.ID) + assert.Equal(t, tt.expectedResult.SpaceID, result.SpaceID) + assert.Equal(t, tt.expectedResult.Name, result.Name) + assert.Equal(t, tt.expectedResult.Description, result.Description) + assert.Equal(t, tt.expectedResult.EvaluatorType, result.EvaluatorType) + } + + mockTemplateDAO.AssertExpectations(t) + }) + } +} + +// TestEvaluatorTemplateRepoImpl_UpdateEvaluatorTemplate 测试更新评估器模板 +func TestEvaluatorTemplateRepoImpl_UpdateEvaluatorTemplate(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + template *entity.EvaluatorTemplate + mockTemplate *model.EvaluatorTemplate + mockError error + expectedResult *entity.EvaluatorTemplate + expectedError bool + description string + }{ + { + name: "successful update", + template: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Updated Template", + Description: "Updated Description", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + mockTemplate: &model.EvaluatorTemplate{ + ID: 1, + SpaceID: gptr.Of(int64(100)), + Name: gptr.Of("Updated Template"), + Description: gptr.Of("Updated Description"), + EvaluatorType: gptr.Of(int32(1)), + }, + expectedResult: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Updated Template", + Description: "Updated Description", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + expectedError: false, + description: "成功更新评估器模板", + }, + { + name: "nil template", + template: nil, + expectedError: true, + description: "传入nil模板应该返回错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + mockTemplateDAO := &MockEvaluatorTemplateDAO{} + mockTagDAO := &MockEvaluatorTagDAO{} + + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO) + + if tt.template != nil { + mockTemplateDAO.On("UpdateEvaluatorTemplate", mock.Anything, mock.Anything, mock.Anything).Return(tt.mockTemplate, tt.mockError) + } + + result, err := repo.UpdateEvaluatorTemplate(context.Background(), tt.template) + + if tt.expectedError { + assert.Error(t, err) + assert.Nil(t, result) + } else { + assert.NoError(t, err) + assert.NotNil(t, result) + assert.Equal(t, tt.expectedResult.ID, result.ID) + assert.Equal(t, tt.expectedResult.SpaceID, result.SpaceID) + assert.Equal(t, tt.expectedResult.Name, result.Name) + assert.Equal(t, tt.expectedResult.Description, result.Description) + assert.Equal(t, tt.expectedResult.EvaluatorType, result.EvaluatorType) + } + + mockTemplateDAO.AssertExpectations(t) + }) + } +} + +// TestEvaluatorTemplateRepoImpl_DeleteEvaluatorTemplate 测试删除评估器模板 +func TestEvaluatorTemplateRepoImpl_DeleteEvaluatorTemplate(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + id int64 + userID string + mockError error + expectedError bool + description string + }{ + { + name: "successful deletion", + id: 1, + userID: "user123", + expectedError: false, + description: "成功删除评估器模板", + }, + { + name: "deletion error", + id: 1, + userID: "user123", + mockError: errors.New("database error"), + expectedError: true, + description: "删除时发生数据库错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + mockTemplateDAO := &MockEvaluatorTemplateDAO{} + mockTagDAO := &MockEvaluatorTagDAO{} + + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO) + + mockTemplateDAO.On("DeleteEvaluatorTemplate", mock.Anything, tt.id, tt.userID, mock.Anything).Return(tt.mockError) + + err := repo.DeleteEvaluatorTemplate(context.Background(), tt.id, tt.userID) + + if tt.expectedError { + assert.Error(t, err) + } else { + assert.NoError(t, err) + } + + mockTemplateDAO.AssertExpectations(t) + }) + } +} + +// TestEvaluatorTemplateRepoImpl_GetEvaluatorTemplate 测试获取评估器模板 +func TestEvaluatorTemplateRepoImpl_GetEvaluatorTemplate(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + id int64 + includeDeleted bool + mockTemplate *model.EvaluatorTemplate + mockError error + expectedResult *entity.EvaluatorTemplate + expectedError bool + description string + }{ + { + name: "successful get", + id: 1, + includeDeleted: false, + mockTemplate: &model.EvaluatorTemplate{ + ID: 1, + SpaceID: gptr.Of(int64(100)), + Name: gptr.Of("Test Template"), + Description: gptr.Of("Test Description"), + EvaluatorType: gptr.Of(int32(1)), + }, + expectedResult: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Test Template", + Description: "Test Description", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + expectedError: false, + description: "成功获取评估器模板", + }, + { + name: "template not found", + id: 1, + includeDeleted: false, + mockTemplate: nil, + expectedResult: nil, + expectedError: false, + description: "模板不存在", + }, + { + name: "database error", + id: 1, + includeDeleted: false, + mockError: errors.New("database error"), + expectedError: true, + description: "数据库查询错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + mockTemplateDAO := &MockEvaluatorTemplateDAO{} + mockTagDAO := &MockEvaluatorTagDAO{} + + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO) + + mockTemplateDAO.On("GetEvaluatorTemplate", mock.Anything, tt.id, tt.includeDeleted, mock.Anything).Return(tt.mockTemplate, tt.mockError) + + result, err := repo.GetEvaluatorTemplate(context.Background(), tt.id, tt.includeDeleted) + + if tt.expectedError { + assert.Error(t, err) + assert.Nil(t, result) + } else { + assert.NoError(t, err) + if tt.expectedResult == nil { + assert.Nil(t, result) + } else { + assert.NotNil(t, result) + assert.Equal(t, tt.expectedResult.ID, result.ID) + assert.Equal(t, tt.expectedResult.SpaceID, result.SpaceID) + assert.Equal(t, tt.expectedResult.Name, result.Name) + assert.Equal(t, tt.expectedResult.Description, result.Description) + assert.Equal(t, tt.expectedResult.EvaluatorType, result.EvaluatorType) + } + } + + mockTemplateDAO.AssertExpectations(t) + }) + } +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go b/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go new file mode 100644 index 000000000..4e8867642 --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go @@ -0,0 +1,134 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package evaluator + +import ( + "context" + "testing" + + "github.com/bytedance/gg/gptr" + "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" + + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks" +) + +func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { + tests := []struct { + name string + request *repo.ListBuiltinEvaluatorRequest + mockDaoResult *mysql.ListEvaluatorResponse + mockDaoError error + mockTagResult []*model.EvaluatorTag + mockTagError error + expectedError bool + expectedCount int64 + }{ + { + name: "successful query without filters", + request: &repo.ListBuiltinEvaluatorRequest{ + SpaceID: 123, + FilterOption: nil, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockDaoResult: &mysql.ListEvaluatorResponse{ + TotalCount: 2, + Evaluators: []*model.Evaluator{ + {ID: 1, Name: gptr.Of("test1")}, + {ID: 2, Name: gptr.Of("test2")}, + }, + }, + mockDaoError: nil, + mockTagResult: []*model.EvaluatorTag{ + {SourceID: 1, TagKey: "type", TagValue: "builtin"}, + {SourceID: 2, TagKey: "type", TagValue: "custom"}, + }, + mockTagError: nil, + expectedError: false, + expectedCount: 2, + }, + { + name: "successful query with tags", + request: &repo.ListBuiltinEvaluatorRequest{ + SpaceID: 123, + FilterOption: nil, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockDaoResult: &mysql.ListEvaluatorResponse{ + TotalCount: 1, + Evaluators: []*model.Evaluator{ + {ID: 1, Name: gptr.Of("test1")}, + }, + }, + mockDaoError: nil, + mockTagResult: []*model.EvaluatorTag{ + {SourceID: 1, TagKey: "type", TagValue: "builtin"}, + {SourceID: 1, TagKey: "category", TagValue: "performance"}, + }, + mockTagError: nil, + expectedError: false, + expectedCount: 1, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + // 创建mock controller + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + // 创建mock DAOs + mockEvaluatorDao := mocks.NewMockEvaluatorDAO(ctrl) + mockEvaluatorVersionDao := mocks.NewMockEvaluatorVersionDAO(ctrl) + mockTagDao := mocks.NewMockEvaluatorTagDAO(ctrl) + + // 设置evaluatorDao的期望 + if tt.mockDaoResult != nil { + mockEvaluatorDao.EXPECT().ListEvaluator(gomock.Any(), gomock.Any()).Return(tt.mockDaoResult, tt.mockDaoError) + } + + // 设置tagDAO的期望 - 使用批量查询 + if tt.mockDaoResult != nil && len(tt.mockDaoResult.Evaluators) > 0 { + // 收集所有evaluator的ID + evaluatorIDs := make([]int64, 0, len(tt.mockDaoResult.Evaluators)) + for _, evaluator := range tt.mockDaoResult.Evaluators { + evaluatorIDs = append(evaluatorIDs, evaluator.ID) + } + + mockTagDao.EXPECT().BatchGetTagsBySourceIDsAndType( + gomock.Any(), + evaluatorIDs, + int32(entity.EvaluatorTagKeyType_Evaluator), + ).Return(tt.mockTagResult, tt.mockTagError).AnyTimes() + } + + // 创建EvaluatorRepoImpl实例 + repo := &EvaluatorRepoImpl{ + evaluatorDao: mockEvaluatorDao, + evaluatorVersionDao: mockEvaluatorVersionDao, + tagDAO: mockTagDao, + } + + // 调用方法 + result, err := repo.ListBuiltinEvaluator(context.Background(), tt.request) + + // 验证结果 + if tt.expectedError { + assert.Error(t, err) + } else { + assert.NoError(t, err) + assert.NotNil(t, result) + assert.Equal(t, tt.expectedCount, result.TotalCount) + } + }) + } +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go index 540430ae7..220a9ba5a 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go @@ -21,7 +21,12 @@ func ConvertEvaluatorDO2PO(do *evaluatordo.Evaluator) *model.Evaluator { if do == nil { return nil } - po := &model.Evaluator{ + // builtin: do.Builtin=true -> 1, false -> 2 + builtinVal := int32(2) + if do.Builtin { + builtinVal = 1 + } + po := &model.Evaluator{ ID: do.ID, SpaceID: do.SpaceID, Name: ptr.Of(do.Name), @@ -29,6 +34,9 @@ func ConvertEvaluatorDO2PO(do *evaluatordo.Evaluator) *model.Evaluator { DraftSubmitted: ptr.Of(do.DraftSubmitted), EvaluatorType: int32(do.EvaluatorType), LatestVersion: do.LatestVersion, + Builtin: builtinVal, + Benchmark: ptr.Of(do.Benchmark), + Vendor: ptr.Of(do.Vendor), } if do.BaseInfo != nil { if do.BaseInfo.CreatedBy != nil { @@ -52,7 +60,7 @@ func ConvertEvaluatorPO2DO(po *model.Evaluator) *evaluatordo.Evaluator { if po == nil { return nil } - do := &evaluatordo.Evaluator{ + do := &evaluatordo.Evaluator{ ID: po.ID, SpaceID: po.SpaceID, Name: gptr.Indirect(po.Name), @@ -60,6 +68,9 @@ func ConvertEvaluatorPO2DO(po *model.Evaluator) *evaluatordo.Evaluator { DraftSubmitted: gptr.Indirect(po.DraftSubmitted), EvaluatorType: evaluatordo.EvaluatorType(po.EvaluatorType), LatestVersion: po.LatestVersion, + Builtin: po.Builtin == 1, + Benchmark: gptr.Indirect(po.Benchmark), + Vendor: gptr.Indirect(po.Vendor), } do.BaseInfo = &evaluatordo.BaseInfo{ CreatedBy: &evaluatordo.UserInfo{ diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_tag.go new file mode 100644 index 000000000..1e8e85e38 --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_tag.go @@ -0,0 +1 @@ +package convertor diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go new file mode 100644 index 000000000..cd8fd5230 --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go @@ -0,0 +1,178 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package convertor + +import ( + "time" + + "github.com/bytedance/gg/gptr" + "gorm.io/gorm" + + evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + "github.com/coze-dev/coze-loop/backend/pkg/json" + "github.com/coze-dev/coze-loop/backend/pkg/lang/ptr" +) + +// ConvertEvaluatorTemplateDO2PO 将 EvaluatorTemplate 的 DO 对象转换为 PO 对象 +func ConvertEvaluatorTemplateDO2PO(do *evaluatordo.EvaluatorTemplate) (*model.EvaluatorTemplate, error) { + if do == nil { + return nil, nil + } + + po := &model.EvaluatorTemplate{ + ID: do.ID, + SpaceID: ptr.Of(do.SpaceID), + Name: ptr.Of(do.Name), + Description: ptr.Of(do.Description), + EvaluatorType: ptr.Of(int32(do.EvaluatorType)), + ReceiveChatHistory: do.ReceiveChatHistory, + Popularity: do.Popularity, + Benchmark: ptr.Of(do.Benchmark), + Vendor: ptr.Of(do.Vendor), + } + + // 序列化InputSchema + if len(do.InputSchemas) > 0 { + inputSchemaByte, err := json.Marshal(do.InputSchemas) + if err != nil { + return nil, err + } + po.InputSchema = ptr.Of(inputSchemaByte) + } + + // 序列化OutputSchema + if len(do.OutputSchemas) > 0 { + outputSchemaByte, err := json.Marshal(do.OutputSchemas) + if err != nil { + return nil, err + } + po.OutputSchema = ptr.Of(outputSchemaByte) + } + + // 根据EvaluatorType序列化具体内容 + switch do.EvaluatorType { + case evaluatordo.EvaluatorTypePrompt: + if do.PromptEvaluatorContent != nil { + metainfoByte, err := json.Marshal(do.PromptEvaluatorContent) + if err != nil { + return nil, err + } + po.Metainfo = ptr.Of(metainfoByte) + } + case evaluatordo.EvaluatorTypeCode: + if do.CodeEvaluatorContent != nil { + metainfoByte, err := json.Marshal(do.CodeEvaluatorContent) + if err != nil { + return nil, err + } + po.Metainfo = ptr.Of(metainfoByte) + } + } + + if do.GetBaseInfo() != nil { + if do.GetBaseInfo().CreatedBy != nil { + po.CreatedBy = gptr.Indirect(do.GetBaseInfo().CreatedBy.UserID) + } + if do.GetBaseInfo().UpdatedBy != nil { + po.UpdatedBy = gptr.Indirect(do.GetBaseInfo().UpdatedBy.UserID) + } + if do.GetBaseInfo().CreatedAt != nil { + po.CreatedAt = time.UnixMilli(gptr.Indirect(do.GetBaseInfo().CreatedAt)) + } + if do.GetBaseInfo().UpdatedAt != nil { + po.UpdatedAt = time.UnixMilli(gptr.Indirect(do.GetBaseInfo().UpdatedAt)) + } + if do.GetBaseInfo().DeletedAt != nil { + po.DeletedAt = gorm.DeletedAt{ + Time: time.UnixMilli(gptr.Indirect(do.GetBaseInfo().DeletedAt)), + Valid: true, + } + } + } + + return po, nil +} + +// ConvertEvaluatorTemplatePO2DO 将 EvaluatorTemplate 的 PO 对象转换为 DO 对象 +func ConvertEvaluatorTemplatePO2DO(po *model.EvaluatorTemplate) (*evaluatordo.EvaluatorTemplate, error) { + if po == nil { + return nil, nil + } + + do := &evaluatordo.EvaluatorTemplate{ + ID: po.ID, + SpaceID: gptr.Indirect(po.SpaceID), + Name: gptr.Indirect(po.Name), + Description: gptr.Indirect(po.Description), + EvaluatorType: evaluatordo.EvaluatorType(gptr.Indirect(po.EvaluatorType)), + ReceiveChatHistory: po.ReceiveChatHistory, + Popularity: po.Popularity, + Benchmark: gptr.Indirect(po.Benchmark), + Vendor: gptr.Indirect(po.Vendor), + Tags: make(map[evaluatordo.EvaluatorTagKey][]string), + } + + // 反序列化InputSchema + if po.InputSchema != nil { + var inputSchemas []*evaluatordo.ArgsSchema + if err := json.Unmarshal(*po.InputSchema, &inputSchemas); err == nil { + do.InputSchemas = inputSchemas + } + } + + // 反序列化OutputSchema + if po.OutputSchema != nil { + var outputSchemas []*evaluatordo.ArgsSchema + if err := json.Unmarshal(*po.OutputSchema, &outputSchemas); err == nil { + do.OutputSchemas = outputSchemas + } + } + + // 根据EvaluatorType反序列化具体内容 + if po.Metainfo != nil { + switch do.EvaluatorType { + case evaluatordo.EvaluatorTypePrompt: + do.PromptEvaluatorContent = &evaluatordo.PromptEvaluatorContent{} + if err := json.Unmarshal(*po.Metainfo, do.PromptEvaluatorContent); err != nil { + return nil, err + } + case evaluatordo.EvaluatorTypeCode: + do.CodeEvaluatorContent = &evaluatordo.CodeEvaluatorContent{} + if err := json.Unmarshal(*po.Metainfo, do.CodeEvaluatorContent); err != nil { + return nil, err + } + } + } + + return do, nil +} + +// ConvertEvaluatorTemplatePO2DOWithBaseInfo 将 EvaluatorTemplate 的 PO 对象转换为 DO 对象（包含基础信息） +func ConvertEvaluatorTemplatePO2DOWithBaseInfo(po *model.EvaluatorTemplate) (*evaluatordo.EvaluatorTemplate, error) { + do, err := ConvertEvaluatorTemplatePO2DO(po) + if err != nil { + return nil, err + } + if do == nil { + return nil, nil + } + + baseInfo := &evaluatordo.BaseInfo{ + CreatedBy: &evaluatordo.UserInfo{ + UserID: ptr.Of(po.CreatedBy), + }, + UpdatedBy: &evaluatordo.UserInfo{ + UserID: ptr.Of(po.UpdatedBy), + }, + CreatedAt: ptr.Of(po.CreatedAt.UnixMilli()), + UpdatedAt: ptr.Of(po.UpdatedAt.UnixMilli()), + } + if po.DeletedAt.Valid { + baseInfo.DeletedAt = ptr.Of(po.DeletedAt.Time.UnixMilli()) + } + do.SetBaseInfo(baseInfo) + + return do, nil +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go index fef7a67a2..b8ea6683f 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go @@ -26,6 +26,7 @@ type EvaluatorDAO interface { GetEvaluatorByID(ctx context.Context, id int64, includeDeleted bool, opts ...db.Option) (*model.Evaluator, error) BatchGetEvaluatorByID(ctx context.Context, ids []int64, includeDeleted bool, opts ...db.Option) ([]*model.Evaluator, error) UpdateEvaluatorMeta(ctx context.Context, do *model.Evaluator, opts ...db.Option) error + UpdateBuiltinEvaluatorMeta(ctx context.Context, do *model.Evaluator, opts ...db.Option) error UpdateEvaluatorDraftSubmitted(ctx context.Context, evaluatorID int64, draftSubmitted bool, userID string, opts ...db.Option) error BatchDeleteEvaluator(ctx context.Context, ids []int64, userID string, opts ...db.Option) error ListEvaluator(ctx context.Context, req *ListEvaluatorRequest, opts ...db.Option) (*ListEvaluatorResponse, error) @@ -128,6 +129,29 @@ func (dao *EvaluatorDAOImpl) UpdateEvaluatorMeta(ctx context.Context, po *model. Error } +// UpdateBuiltinEvaluatorMeta 更新内置评估器的 benchmark 和 vendor 字段 +func (dao *EvaluatorDAOImpl) UpdateBuiltinEvaluatorMeta(ctx context.Context, po *model.Evaluator, opts ...db.Option) error { + // 通过opts获取当前的db session实例 + dbsession := dao.provider.NewSession(ctx, opts...) + updateMap := make(map[string]interface{}) + // 更新 benchmark 和 vendor 字段 + updateMap["benchmark"] = po.Benchmark + updateMap["vendor"] = po.Vendor + // 允许同时更新名称与描述 + if po.Name != nil { + updateMap["name"] = po.Name + } + if po.Description != nil { + updateMap["description"] = po.Description + } + updateMap["updated_by"] = po.UpdatedBy + return dbsession.WithContext(ctx).Model(&model.Evaluator{}). + Where("id = ?", po.ID). // 添加ID筛选条件 + Where("deleted_at IS NULL"). // 添加软删除筛选条件 + Updates(updateMap). // 使用Updates代替Save，避免全字段覆盖 + Error +} + // DeleteEvaluator 根据 ID 删除 Evaluator func (dao *EvaluatorDAOImpl) DeleteEvaluator(ctx context.Context, id int64, userID string, opts ...db.Option) error { // 通过opts获取当前的db session实例 @@ -185,6 +209,7 @@ type ListEvaluatorRequest struct { SearchName string CreatorIDs []int64 EvaluatorType []int32 + IDs []int64 // 新增：支持按ID查询 PageSize int32 PageNum int32 OrderBy []*OrderBy @@ -201,6 +226,11 @@ func (dao *EvaluatorDAOImpl) ListEvaluator(ctx context.Context, req *ListEvaluat query := dbsession.WithContext(ctx).Model(&model.Evaluator{}).Where("space_id = ?", req.SpaceID) + // 添加ID过滤（支持按ID查询） + if len(req.IDs) > 0 { + query = query.Where("id IN (?)", req.IDs) + } + // 添加名称模糊搜索 if len(req.SearchName) > 0 { query = query.Where("name LIKE ?", "%"+req.SearchName+"%") diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go new file mode 100644 index 000000000..1733440ac --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -0,0 +1,290 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package mysql + +import ( + "context" + "errors" + "fmt" + "strings" + "sync" + + "gorm.io/gorm" + + "github.com/coze-dev/coze-loop/backend/infra/db" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" +) + +// EvaluatorTagDAO 定义 EvaluatorTag 的 Dao 接口 +// +//go:generate mockgen -destination mocks/evaluator_tag_mock.go -package=mocks . EvaluatorTagDAO +type EvaluatorTagDAO interface { + // BatchGetTagsBySourceIDsAndType 批量根据source_ids和tag_type筛选tag_key和tag_value + BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, opts ...db.Option) ([]*model.EvaluatorTag, error) + // GetSourceIDsByFilterConditions 根据筛选条件查询source_id列表，支持复杂的AND/OR逻辑和分页 + GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, opts ...db.Option) ([]int64, int64, error) + // BatchCreateEvaluatorTags 批量创建评估器标签 + BatchCreateEvaluatorTags(ctx context.Context, sourceID int64, tagType int32, userID string, tags map[string][]string, opts ...db.Option) error + // DeleteEvaluatorTagsByConditions 根据sourceID、tagType、tags条件删除标签 + DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, tags map[string][]string, opts ...db.Option) error +} + +var ( + evaluatorTagDaoOnce = sync.Once{} + singletonEvaluatorTagDao EvaluatorTagDAO +) + +// EvaluatorTagDAOImpl 实现 EvaluatorTagDAO 接口 +type EvaluatorTagDAOImpl struct { + provider db.Provider +} + +func NewEvaluatorTagDAO(p db.Provider) EvaluatorTagDAO { + evaluatorTagDaoOnce.Do(func() { + singletonEvaluatorTagDao = &EvaluatorTagDAOImpl{ + provider: p, + } + }) + return singletonEvaluatorTagDao +} + +// BatchGetTagsBySourceIDsAndType 批量根据source_ids和tag_type筛选tag_key和tag_value +func (dao *EvaluatorTagDAOImpl) BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, opts ...db.Option) ([]*model.EvaluatorTag, error) { + if len(sourceIDs) == 0 { + return []*model.EvaluatorTag{}, nil + } + + dbsession := dao.provider.NewSession(ctx, opts...) + + var tags []*model.EvaluatorTag + err := dbsession.WithContext(ctx). + Where("source_id IN (?) AND tag_type = ?", sourceIDs, tagType). + Find(&tags).Error + if err != nil { + return nil, err + } + + return tags, nil +} + +// BatchCreateEvaluatorTags 批量创建评估器标签 +func (dao *EvaluatorTagDAOImpl) BatchCreateEvaluatorTags(ctx context.Context, sourceID int64, tagType int32, userID string, tags map[string][]string, opts ...db.Option) error { + if len(tags) == 0 { + return nil + } + + // 构建model.EvaluatorTag列表 + var evaluatorTags []*model.EvaluatorTag + for tagKey, tagValues := range tags { + for _, tagValue := range tagValues { + tag := &model.EvaluatorTag{ + SourceID: sourceID, + TagType: tagType, + TagKey: tagKey, + TagValue: tagValue, + CreatedBy: userID, + UpdatedBy: userID, + } + evaluatorTags = append(evaluatorTags, tag) + } + } + + if len(evaluatorTags) == 0 { + return nil + } + + dbsession := dao.provider.NewSession(ctx, opts...) + return dbsession.WithContext(ctx).CreateInBatches(evaluatorTags, 100).Error +} + +// DeleteEvaluatorTagsByConditions 根据sourceID、tagType、tags条件删除标签 +func (dao *EvaluatorTagDAOImpl) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, tags map[string][]string, opts ...db.Option) error { + dbsession := dao.provider.NewSession(ctx, opts...) + + // 基础查询条件 + query := dbsession.WithContext(ctx). + Where("source_id = ? AND tag_type = ?", sourceID, tagType) + + // 如果有指定tags条件，则添加额外的删除条件 + if len(tags) > 0 { + // 构建OR条件组，每个tag_key对应一个条件组 + var conditions []string + var args []interface{} + + for tagKey, tagValues := range tags { + if len(tagValues) == 0 { + continue + } + // 对于每个tag_key，tag_value可以是多个值中的任意一个 + conditions = append(conditions, "(tag_key = ? AND tag_value IN (?))") + args = append(args, tagKey, tagValues) + } + + // 如果有标签条件，使用OR条件组合 + if len(conditions) > 0 { + orCondition := "(" + strings.Join(conditions, " OR ") + ")" + query = query.Where(orCondition, args...) + } + } + + return query.Delete(&model.EvaluatorTag{}).Error +} + +// GetSourceIDsByFilterConditions 根据筛选条件查询source_id列表，支持复杂的AND/OR逻辑和分页 +func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, opts ...db.Option) ([]int64, int64, error) { + if filterOption == nil { + return []int64{}, 0, nil + } + + dbsession := dao.provider.NewSession(ctx, opts...) + + // 基础查询条件 + query := dbsession.WithContext(ctx).Table("evaluator_tag"). + Select("source_id"). + Where("tag_type = ?", tagType) + + // 处理搜索关键词 + if filterOption.SearchKeyword != nil && *filterOption.SearchKeyword != "" { + keyword := "%" + *filterOption.SearchKeyword + "%" + query = query.Where("tag_value LIKE ?", keyword) + } + + // 处理筛选条件 + if filterOption.Filters != nil && len(filterOption.Filters.FilterConditions) > 0 { + conditions, args, err := dao.buildFilterConditions(filterOption.Filters) + if err != nil { + return nil, 0, err + } + + if len(conditions) > 0 { + query = query.Where(conditions, args...) + } + } + + // 先查询总数 + var total int64 + countQuery := query.Session(&gorm.Session{}) + if err := countQuery.Distinct("source_id").Count(&total).Error; err != nil { + return nil, 0, err + } + + // 分页处理 + if pageSize > 0 && pageNum > 0 { + offset := (pageNum - 1) * pageSize + query = query.Limit(int(pageSize)).Offset(int(offset)) + } + + // 执行查询 + var sourceIDs []int64 + err := query.Distinct("source_id").Pluck("source_id", &sourceIDs).Error + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return []int64{}, total, nil + } + return nil, 0, err + } + + return sourceIDs, total, nil +} + +// buildFilterConditions 构建筛选条件的SQL和参数 +func (dao *EvaluatorTagDAOImpl) buildFilterConditions(filters *entity.EvaluatorFilters) (string, []interface{}, error) { + if filters == nil || len(filters.FilterConditions) == 0 { + return "", nil, nil + } + + var conditions []string + var args []interface{} + + for _, condition := range filters.FilterConditions { + conditionSQL, conditionArgs, err := dao.buildSingleCondition(condition) + if err != nil { + return "", nil, err + } + + if conditionSQL != "" { + conditions = append(conditions, conditionSQL) + args = append(args, conditionArgs...) + } + } + + if len(conditions) == 0 { + return "", nil, nil + } + + // 根据逻辑操作符组合条件 + var finalCondition string + if filters.LogicOp != nil && *filters.LogicOp == entity.FilterLogicOp_Or { + finalCondition = "(" + strings.Join(conditions, " OR ") + ")" + } else { + // 默认为AND操作 + finalCondition = "(" + strings.Join(conditions, " AND ") + ")" + } + + return finalCondition, args, nil +} + +// buildSingleCondition 构建单个筛选条件的SQL和参数 +func (dao *EvaluatorTagDAOImpl) buildSingleCondition(condition *entity.EvaluatorFilterCondition) (string, []interface{}, error) { + if condition == nil { + return "", nil, nil + } + + tagKey := string(condition.TagKey) + operator := condition.Operator + value := condition.Value + + switch operator { + case entity.EvaluatorFilterOperatorType_Equal: + return "tag_key = ? AND tag_value = ?", []interface{}{tagKey, value}, nil + + case entity.EvaluatorFilterOperatorType_NotEqual: + return "tag_key = ? AND tag_value != ?", []interface{}{tagKey, value}, nil + + case entity.EvaluatorFilterOperatorType_In: + // 将value按逗号分割 + values := strings.Split(value, ",") + if len(values) == 0 { + return "", nil, fmt.Errorf("IN operator requires non-empty values") + } + placeholders := strings.Repeat("?,", len(values)) + placeholders = placeholders[:len(placeholders)-1] // 移除最后的逗号 + return fmt.Sprintf("tag_key = ? AND tag_value IN (%s)", placeholders), + append([]interface{}{tagKey}, convertToInterfaceSlice(values)...), nil + + case entity.EvaluatorFilterOperatorType_NotIn: + // 将value按逗号分割 + values := strings.Split(value, ",") + if len(values) == 0 { + return "", nil, fmt.Errorf("NOT_IN operator requires non-empty values") + } + placeholders := strings.Repeat("?,", len(values)) + placeholders = placeholders[:len(placeholders)-1] // 移除最后的逗号 + return fmt.Sprintf("tag_key = ? AND tag_value NOT IN (%s)", placeholders), + append([]interface{}{tagKey}, convertToInterfaceSlice(values)...), nil + + case entity.EvaluatorFilterOperatorType_Like: + likeValue := "%" + value + "%" + return "tag_key = ? AND tag_value LIKE ?", []interface{}{tagKey, likeValue}, nil + + case entity.EvaluatorFilterOperatorType_IsNull: + return "tag_key = ? AND tag_value IS NULL", []interface{}{tagKey}, nil + + case entity.EvaluatorFilterOperatorType_IsNotNull: + return "tag_key = ? AND tag_value IS NOT NULL", []interface{}{tagKey}, nil + + default: + return "", nil, fmt.Errorf("unsupported operator type: %v", operator) + } +} + +// convertToInterfaceSlice 将字符串切片转换为interface{}切片 +func convertToInterfaceSlice(strs []string) []interface{} { + result := make([]interface{}, len(strs)) + for i, s := range strs { + result[i] = s + } + return result +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go new file mode 100644 index 000000000..82e52ce8b --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go @@ -0,0 +1,411 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package mysql + +import ( + "context" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "gorm.io/gorm" + + "github.com/coze-dev/coze-loop/backend/infra/db" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" +) + +// MockProvider 模拟数据库提供者 +type MockProvider struct { + mock.Mock +} + +func (m *MockProvider) NewSession(ctx context.Context, opts ...db.Option) *gorm.DB { + args := m.Called(ctx, opts) + return args.Get(0).(*gorm.DB) +} + +func (m *MockProvider) Transaction(ctx context.Context, fc func(tx *gorm.DB) error, opts ...db.Option) error { + args := m.Called(ctx, fc, opts) + return args.Error(0) +} + +func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + tagType int32 + filterOption *entity.EvaluatorFilterOption + expectedErr bool + description string + }{ + { + name: "nil filter option", + tagType: 1, + filterOption: nil, + expectedErr: false, + description: "当筛选选项为nil时，应该返回空列表", + }, + { + name: "empty filter option", + tagType: 1, + filterOption: &entity.EvaluatorFilterOption{}, + expectedErr: false, + description: "当筛选选项为空时，应该返回空列表", + }, + { + name: "search keyword only", + tagType: 1, + filterOption: entity.NewEvaluatorFilterOption(). + WithSearchKeyword("AI"), + expectedErr: false, + description: "只有搜索关键词时，应该正确构建查询", + }, + { + name: "single equal condition", + tagType: 1, + filterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "LLM", + )), + ), + expectedErr: false, + description: "单个等于条件，应该正确构建查询", + }, + { + name: "multiple AND conditions", + tagType: 1, + filterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "LLM", + )). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_TargetType, + entity.EvaluatorFilterOperatorType_In, + "Text,Image", + )), + ), + expectedErr: false, + description: "多个AND条件，应该正确构建查询", + }, + { + name: "multiple OR conditions", + tagType: 1, + filterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_Or). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "LLM", + )). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "Code", + )), + ), + expectedErr: false, + description: "多个OR条件，应该正确构建查询", + }, + { + name: "like condition", + tagType: 1, + filterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Name, + entity.EvaluatorFilterOperatorType_Like, + "Quality", + )), + ), + expectedErr: false, + description: "LIKE条件，应该正确构建查询", + }, + { + name: "in condition", + tagType: 1, + filterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_TargetType, + entity.EvaluatorFilterOperatorType_In, + "Text,Image,Video", + )), + ), + expectedErr: false, + description: "IN条件，应该正确构建查询", + }, + { + name: "not in condition", + tagType: 1, + filterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_TargetType, + entity.EvaluatorFilterOperatorType_NotIn, + "Audio,Video", + )), + ), + expectedErr: false, + description: "NOT_IN条件，应该正确构建查询", + }, + { + name: "is null condition", + tagType: 1, + filterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Objective, + entity.EvaluatorFilterOperatorType_IsNull, + "", + )), + ), + expectedErr: false, + description: "IS_NULL条件，应该正确构建查询", + }, + { + name: "is not null condition", + tagType: 1, + filterOption: entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Objective, + entity.EvaluatorFilterOperatorType_IsNotNull, + "", + )), + ), + expectedErr: false, + description: "IS_NOT_NULL条件，应该正确构建查询", + }, + { + name: "complex combination", + tagType: 1, + filterOption: entity.NewEvaluatorFilterOption(). + WithSearchKeyword("AI"). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "LLM", + )). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_TargetType, + entity.EvaluatorFilterOperatorType_In, + "Text,Image", + )). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Objective, + entity.EvaluatorFilterOperatorType_Like, + "Quality", + )), + ), + expectedErr: false, + description: "复杂组合条件（搜索关键词+多个AND条件），应该正确构建查询", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + // 创建mock provider + mockProvider := &MockProvider{} + + // 创建DAO实例 + dao := &EvaluatorTagDAOImpl{ + provider: mockProvider, + } + + // 模拟数据库会话 + mockSession := &gorm.DB{} + mockProvider.On("NewSession", mock.Anything, mock.Anything).Return(mockSession) + + // 执行测试 + ctx := context.Background() + result, err := dao.GetSourceIDsByFilterConditions(ctx, tt.tagType, tt.filterOption) + + // 验证结果 + if tt.expectedErr { + assert.Error(t, err) + } else { + assert.NoError(t, err) + assert.NotNil(t, result) + // 对于nil或空的filterOption，应该返回空列表 + if tt.filterOption == nil || (tt.filterOption.SearchKeyword == nil && (tt.filterOption.Filters == nil || len(tt.filterOption.Filters.FilterConditions) == 0)) { + assert.Empty(t, result) + } + } + + // 验证mock调用 + mockProvider.AssertExpectations(t) + }) + } +} + +func TestBuildSingleCondition(t *testing.T) { + t.Parallel() + + dao := &EvaluatorTagDAOImpl{} + + tests := []struct { + name string + condition *entity.EvaluatorFilterCondition + expectedSQL string + expectedArgs []interface{} + expectedErr bool + }{ + { + name: "equal condition", + condition: entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "LLM", + ), + expectedSQL: "tag_key = ? AND tag_value = ?", + expectedArgs: []interface{}{"Category", "LLM"}, + expectedErr: false, + }, + { + name: "not equal condition", + condition: entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_NotEqual, + "Code", + ), + expectedSQL: "tag_key = ? AND tag_value != ?", + expectedArgs: []interface{}{"Category", "Code"}, + expectedErr: false, + }, + { + name: "in condition", + condition: entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_TargetType, + entity.EvaluatorFilterOperatorType_In, + "Text,Image,Video", + ), + expectedSQL: "tag_key = ? AND tag_value IN (?,?,?)", + expectedArgs: []interface{}{"TargetType", "Text", "Image", "Video"}, + expectedErr: false, + }, + { + name: "like condition", + condition: entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Name, + entity.EvaluatorFilterOperatorType_Like, + "Quality", + ), + expectedSQL: "tag_key = ? AND tag_value LIKE ?", + expectedArgs: []interface{}{"Name", "%Quality%"}, + expectedErr: false, + }, + { + name: "is null condition", + condition: entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Objective, + entity.EvaluatorFilterOperatorType_IsNull, + "", + ), + expectedSQL: "tag_key = ? AND tag_value IS NULL", + expectedArgs: []interface{}{"Objective"}, + expectedErr: false, + }, + { + name: "is not null condition", + condition: entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Objective, + entity.EvaluatorFilterOperatorType_IsNotNull, + "", + ), + expectedSQL: "tag_key = ? AND tag_value IS NOT NULL", + expectedArgs: []interface{}{"Objective"}, + expectedErr: false, + }, + { + name: "empty in condition", + condition: entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_TargetType, + entity.EvaluatorFilterOperatorType_In, + "", + ), + expectedSQL: "tag_key = ? AND tag_value IN (?)", + expectedArgs: []interface{}{"TargetType", ""}, + expectedErr: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + sql, args, err := dao.buildSingleCondition(tt.condition) + + if tt.expectedErr { + assert.Error(t, err) + } else { + assert.NoError(t, err) + assert.Equal(t, tt.expectedSQL, sql) + assert.Equal(t, tt.expectedArgs, args) + } + }) + } +} + +func TestConvertToInterfaceSlice(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + input []string + expected []interface{} + }{ + { + name: "empty slice", + input: []string{}, + expected: []interface{}{}, + }, + { + name: "single element", + input: []string{"test"}, + expected: []interface{}{"test"}, + }, + { + name: "multiple elements", + input: []string{"a", "b", "c"}, + expected: []interface{}{"a", "b", "c"}, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + result := convertToInterfaceSlice(tt.input) + assert.Equal(t, tt.expected, result) + }) + } +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_template.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_template.go new file mode 100644 index 000000000..1292ffc54 --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_template.go @@ -0,0 +1,211 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package mysql + +import ( + "context" + "errors" + "sync" + "time" + + "gorm.io/gorm" + + "github.com/coze-dev/coze-loop/backend/infra/db" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/contexts" +) + +// EvaluatorTemplateDAO 定义 EvaluatorTemplate 的 Dao 接口 +// +//go:generate mockgen -destination mocks/evaluator_template_mock.go -package=mocks . EvaluatorTemplateDAO +type EvaluatorTemplateDAO interface { + // CreateEvaluatorTemplate 创建评估器模板 + CreateEvaluatorTemplate(ctx context.Context, template *model.EvaluatorTemplate, opts ...db.Option) (*model.EvaluatorTemplate, error) + + // UpdateEvaluatorTemplate 更新评估器模板 + UpdateEvaluatorTemplate(ctx context.Context, template *model.EvaluatorTemplate, opts ...db.Option) (*model.EvaluatorTemplate, error) + + // DeleteEvaluatorTemplate 删除评估器模板（软删除） + DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string, opts ...db.Option) error + + // GetEvaluatorTemplate 根据ID获取评估器模板 + GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool, opts ...db.Option) (*model.EvaluatorTemplate, error) + + // ListEvaluatorTemplate 根据筛选条件查询evaluator_template列表，支持tag筛选和分页 + ListEvaluatorTemplate(ctx context.Context, req *ListEvaluatorTemplateRequest, opts ...db.Option) (*ListEvaluatorTemplateResponse, error) +} + +var ( + evaluatorTemplateDaoOnce = sync.Once{} + singletonEvaluatorTemplateDao EvaluatorTemplateDAO +) + +// EvaluatorTemplateDAOImpl 实现 EvaluatorTemplateDAO 接口 +type EvaluatorTemplateDAOImpl struct { + provider db.Provider +} + +func NewEvaluatorTemplateDAO(p db.Provider) EvaluatorTemplateDAO { + evaluatorTemplateDaoOnce.Do(func() { + singletonEvaluatorTemplateDao = &EvaluatorTemplateDAOImpl{ + provider: p, + } + }) + return singletonEvaluatorTemplateDao +} + +type ListEvaluatorTemplateRequest struct { + IDs []int64 + PageSize int32 + PageNum int32 + IncludeDeleted bool +} + +type ListEvaluatorTemplateResponse struct { + TotalCount int64 + Templates []*model.EvaluatorTemplate +} + + +func (dao *EvaluatorTemplateDAOImpl) ListEvaluatorTemplate(ctx context.Context, req *ListEvaluatorTemplateRequest, opts ...db.Option) (*ListEvaluatorTemplateResponse, error) { + // 通过opts获取当前的db session实例 + if contexts.CtxWriteDB(ctx) { + opts = append(opts, db.WithMaster()) + } + dbsession := dao.provider.NewSession(ctx, opts...) + + query := dbsession.WithContext(ctx).Model(&model.EvaluatorTemplate{}) + + // 添加ID过滤（支持按ID查询） + if len(req.IDs) > 0 { + query = query.Where("id IN (?)", req.IDs) + } + + // 软删除过滤 + if !req.IncludeDeleted { + query = query.Where("deleted_at IS NULL") + } else { + query = query.Unscoped() // 解除软删除过滤 + } + + // 先查询总数 + var total int64 + countQuery := query.Session(&gorm.Session{}) + if err := countQuery.Count(&total).Error; err != nil { + return nil, err + } + + // 分页处理 + if req.PageSize != 0 && req.PageNum != 0 { + offset := (req.PageNum - 1) * req.PageSize + query = query.Limit(int(req.PageSize)).Offset(int(offset)) + } + + // 执行查询 + poList := make([]*model.EvaluatorTemplate, 0) + if err := query.Find(&poList).Error; err != nil { + return nil, err + } + + return &ListEvaluatorTemplateResponse{ + Templates: poList, + TotalCount: total, + }, nil +} + +// CreateEvaluatorTemplate 创建评估器模板 +func (dao *EvaluatorTemplateDAOImpl) CreateEvaluatorTemplate(ctx context.Context, template *model.EvaluatorTemplate, opts ...db.Option) (*model.EvaluatorTemplate, error) { + if template == nil { + return nil, errors.New("template cannot be nil") + } + + // 通过opts获取当前的db session实例 + if contexts.CtxWriteDB(ctx) { + opts = append(opts, db.WithMaster()) + } + dbsession := dao.provider.NewSession(ctx, opts...) + + // 设置创建时间 + now := time.Now() + template.CreatedAt = now + template.UpdatedAt = now + + // 执行创建 + if err := dbsession.WithContext(ctx).Create(template).Error; err != nil { + return nil, err + } + + return template, nil +} + +// UpdateEvaluatorTemplate 更新评估器模板 +func (dao *EvaluatorTemplateDAOImpl) UpdateEvaluatorTemplate(ctx context.Context, template *model.EvaluatorTemplate, opts ...db.Option) (*model.EvaluatorTemplate, error) { + if template == nil { + return nil, errors.New("template cannot be nil") + } + + // 通过opts获取当前的db session实例 + if contexts.CtxWriteDB(ctx) { + opts = append(opts, db.WithMaster()) + } + dbsession := dao.provider.NewSession(ctx, opts...) + + // 设置更新时间 + template.UpdatedAt = time.Now() + + // 执行更新 + if err := dbsession.WithContext(ctx).Save(template).Error; err != nil { + return nil, err + } + + return template, nil +} + +// DeleteEvaluatorTemplate 删除评估器模板（软删除） +func (dao *EvaluatorTemplateDAOImpl) DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string, opts ...db.Option) error { + // 通过opts获取当前的db session实例 + if contexts.CtxWriteDB(ctx) { + opts = append(opts, db.WithMaster()) + } + dbsession := dao.provider.NewSession(ctx, opts...) + + // 执行软删除 + if err := dbsession.WithContext(ctx).Model(&model.EvaluatorTemplate{}). + Where("id = ?", id). + Update("deleted_at", time.Now()). + Update("updated_by", userID). + Update("updated_at", time.Now()).Error; err != nil { + return err + } + + return nil +} + +// GetEvaluatorTemplate 根据ID获取评估器模板 +func (dao *EvaluatorTemplateDAOImpl) GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool, opts ...db.Option) (*model.EvaluatorTemplate, error) { + // 通过opts获取当前的db session实例 + if contexts.CtxWriteDB(ctx) { + opts = append(opts, db.WithMaster()) + } + dbsession := dao.provider.NewSession(ctx, opts...) + + query := dbsession.WithContext(ctx).Model(&model.EvaluatorTemplate{}).Where("id = ?", id) + + // 软删除过滤 + if !includeDeleted { + query = query.Where("deleted_at IS NULL") + } else { + query = query.Unscoped() // 解除软删除过滤 + } + + var template model.EvaluatorTemplate + if err := query.First(&template).Error; err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil, nil + } + return nil, err + } + + return &template, nil +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_version.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_version.go index 96a72aa5f..84a9016c3 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_version.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_version.go @@ -77,6 +77,7 @@ func NewEvaluatorVersionDAO(p db.Provider) EvaluatorVersionDAO { var SupportedOrderBys = map[string]string{ "updated_at": "updated_at", "created_at": "created_at", + "heat": "heat", } var ( diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go index 13856f5fe..6ef559bd1 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go @@ -26,6 +26,9 @@ type Evaluator struct { UpdatedAt time.Time `gorm:"column:updated_at;type:timestamp;not null;index:idx_space_id_updated_at,priority:2;default:CURRENT_TIMESTAMP;comment:更新时间" json:"updated_at"` // 更新时间 DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"` // 删除时间 LatestVersion string `gorm:"column:latest_version;type:varchar(128);not null;comment:最新版本号" json:"latest_version"` // 最新版本号 + Benchmark *string `gorm:"column:benchmark;type:varchar(255);comment:benchmark" json:"benchmark"` // benchmark + Vendor *string `gorm:"column:vendor;type:varchar(255);comment:vendor" json:"vendor"` // vendor + Builtin int32 `gorm:"column:builtin;type:int(11) unsigned;not null;default:2;comment:是否预置，1:是；2:否" json:"builtin"` // 是否预置，1:是；2:否 } // TableName Evaluator's table name diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_tag.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_tag.gen.go new file mode 100644 index 000000000..cf6462c7d --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_tag.gen.go @@ -0,0 +1,32 @@ +// Code generated by gorm.io/gen. DO NOT EDIT. +// Code generated by gorm.io/gen. DO NOT EDIT. +// Code generated by gorm.io/gen. DO NOT EDIT. + +package model + +import ( + "time" + + "gorm.io/gorm" +) + +const TableNameEvaluatorTag = "evaluator_tag" + +// EvaluatorTag NDB_SHARE_TABLE;评估器tag +type EvaluatorTag struct { + ID int64 `gorm:"column:id;type:bigint(20) unsigned;primaryKey;comment:idgen id" json:"id"` // idgen id + SourceID int64 `gorm:"column:source_id;type:bigint(20) unsigned;not null;index:idx_source_id,priority:1;comment:资源id" json:"source_id"` // 资源id + TagType int32 `gorm:"column:tag_type;type:int(11) unsigned;not null;index:idx_tag_type_tag_key_tag_value,priority:1;comment:tag类型，1:评估器；2:模板" json:"tag_type"` // tag类型，1:评估器；2:模板 + TagKey string `gorm:"column:tag_key;type:varchar(128) character set utf8mb4;not null;index:idx_tag_type_tag_key_tag_value,priority:2;default:0;comment:tag键" json:"tag_key"` // tag键 + TagValue string `gorm:"column:tag_value;type:varchar(128) character set utf8mb4;not null;index:idx_tag_type_tag_key_tag_value,priority:3;default:0;comment:tag值" json:"tag_value"` // tag值 + CreatedBy string `gorm:"column:created_by;type:varchar(128) character set utf8mb4;not null;default:0;comment:创建人" json:"created_by"` // 创建人 + UpdatedBy string `gorm:"column:updated_by;type:varchar(128) character set utf8mb4;not null;default:0;comment:更新人" json:"updated_by"` // 更新人 + CreatedAt time.Time `gorm:"column:created_at;type:timestamp;not null;default:CURRENT_TIMESTAMP;comment:创建时间" json:"created_at"` // 创建时间 + UpdatedAt time.Time `gorm:"column:updated_at;type:timestamp;not null;default:CURRENT_TIMESTAMP;comment:更新时间" json:"updated_at"` // 更新时间 + DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"` // 删除时间 +} + +// TableName EvaluatorTag's table name +func (*EvaluatorTag) TableName() string { + return TableNameEvaluatorTag +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_template.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_template.gen.go new file mode 100644 index 000000000..ca4730dd2 --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_template.gen.go @@ -0,0 +1,39 @@ +// Code generated by gorm.io/gen. DO NOT EDIT. +// Code generated by gorm.io/gen. DO NOT EDIT. +// Code generated by gorm.io/gen. DO NOT EDIT. + +package model + +import ( + "time" + + "gorm.io/gorm" +) + +const TableNameEvaluatorTemplate = "evaluator_template" + +// EvaluatorTemplate NDB_SHARE_TABLE;评估器模板 +type EvaluatorTemplate struct { + ID int64 `gorm:"column:id;type:bigint(20) unsigned;primaryKey;comment:idgen id" json:"id"` // idgen id + SpaceID *int64 `gorm:"column:space_id;type:bigint(20) unsigned;comment:空间id" json:"space_id"` // 空间id + EvaluatorType *int32 `gorm:"column:evaluator_type;type:int(11) unsigned;comment:评估器类型" json:"evaluator_type"` // 评估器类型 + Name *string `gorm:"column:name;type:varchar(255) character set utf8mb4;comment:名称" json:"name"` // 名称 + Description *string `gorm:"column:description;type:varchar(500) character set utf8mb4;comment:版本描述" json:"description"` // 版本描述 + Metainfo *[]byte `gorm:"column:metainfo;type:blob binary;comment:具体内容, 每种静态规则类型对应一个解析方式, json" json:"metainfo"` // 具体内容, 每种静态规则类型对应一个解析方式, json + ReceiveChatHistory *bool `gorm:"column:receive_chat_history;type:tinyint(1);comment:是否需求传递上下文" json:"receive_chat_history"` // 是否需求传递上下文 + InputSchema *[]byte `gorm:"column:input_schema;type:blob binary;comment:评估器结构信息, json" json:"input_schema"` // 评估器结构信息, json + OutputSchema *[]byte `gorm:"column:output_schema;type:blob binary;comment:评估器结构信息, json" json:"output_schema"` // 评估器结构信息, json + CreatedBy string `gorm:"column:created_by;type:varchar(128) character set utf8mb4;not null;default:0;comment:创建人" json:"created_by"` // 创建人 + UpdatedBy string `gorm:"column:updated_by;type:varchar(128) character set utf8mb4;not null;default:0;comment:更新人" json:"updated_by"` // 更新人 + CreatedAt time.Time `gorm:"column:created_at;type:timestamp;not null;default:CURRENT_TIMESTAMP;comment:创建时间" json:"created_at"` // 创建时间 + UpdatedAt time.Time `gorm:"column:updated_at;type:timestamp;not null;default:CURRENT_TIMESTAMP;comment:更新时间" json:"updated_at"` // 更新时间 + DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"` // 删除时间 + Popularity int64 `gorm:"column:popularity;type:bigint(20) unsigned;not null;comment:热度" json:"popularity"` // 热度 + Benchmark *string `gorm:"column:benchmark;type:varchar(255) character set utf8mb4;comment:benchmark" json:"benchmark"` // benchmark + Vendor *string `gorm:"column:vendor;type:varchar(255) character set utf8mb4;comment:vendor" json:"vendor"` // vendor +} + +// TableName EvaluatorTemplate's table name +func (*EvaluatorTemplate) TableName() string { + return TableNameEvaluatorTemplate +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_version.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_version.gen.go index ace62415c..264828a1c 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_version.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_version.gen.go @@ -28,6 +28,7 @@ type EvaluatorVersion struct { CreatedAt time.Time `gorm:"column:created_at;type:timestamp;not null;default:CURRENT_TIMESTAMP;comment:创建时间" json:"created_at"` // 创建时间 UpdatedAt time.Time `gorm:"column:updated_at;type:timestamp;not null;default:CURRENT_TIMESTAMP;comment:更新时间" json:"updated_at"` // 更新时间 DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"` // 删除时间 + OutputSchema *[]byte `gorm:"column:output_schema;type:blob binary;comment:评估器输出schema, json" json:"output_schema"` // 评估器输出schema, json } // TableName EvaluatorVersion's table name diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go index 82cb88125..1dc3dbb2e 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go @@ -39,6 +39,9 @@ func newEvaluator(db *gorm.DB, opts ...gen.DOOption) evaluator { _evaluator.UpdatedAt = field.NewTime(tableName, "updated_at") _evaluator.DeletedAt = field.NewField(tableName, "deleted_at") _evaluator.LatestVersion = field.NewString(tableName, "latest_version") + _evaluator.Benchmark = field.NewString(tableName, "benchmark") + _evaluator.Vendor = field.NewString(tableName, "vendor") + _evaluator.Builtin = field.NewInt32(tableName, "builtin") _evaluator.fillFieldMap() @@ -62,6 +65,9 @@ type evaluator struct { UpdatedAt field.Time // 更新时间 DeletedAt field.Field // 删除时间 LatestVersion field.String // 最新版本号 + Benchmark field.String // benchmark + Vendor field.String // vendor + Builtin field.Int32 // 是否预置，1:是；2:否 fieldMap map[string]field.Expr } @@ -90,6 +96,9 @@ func (e *evaluator) updateTableName(table string) *evaluator { e.UpdatedAt = field.NewTime(table, "updated_at") e.DeletedAt = field.NewField(table, "deleted_at") e.LatestVersion = field.NewString(table, "latest_version") + e.Benchmark = field.NewString(table, "benchmark") + e.Vendor = field.NewString(table, "vendor") + e.Builtin = field.NewInt32(table, "builtin") e.fillFieldMap() @@ -116,7 +125,7 @@ func (e *evaluator) GetFieldByName(fieldName string) (field.OrderExpr, bool) { } func (e *evaluator) fillFieldMap() { - e.fieldMap = make(map[string]field.Expr, 12) + e.fieldMap = make(map[string]field.Expr, 15) e.fieldMap["id"] = e.ID e.fieldMap["space_id"] = e.SpaceID e.fieldMap["evaluator_type"] = e.EvaluatorType @@ -129,6 +138,9 @@ func (e *evaluator) fillFieldMap() { e.fieldMap["updated_at"] = e.UpdatedAt e.fieldMap["deleted_at"] = e.DeletedAt e.fieldMap["latest_version"] = e.LatestVersion + e.fieldMap["benchmark"] = e.Benchmark + e.fieldMap["vendor"] = e.Vendor + e.fieldMap["builtin"] = e.Builtin } func (e evaluator) clone(db *gorm.DB) evaluator { diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_tag.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_tag.gen.go new file mode 100644 index 000000000..9045f3b7b --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_tag.gen.go @@ -0,0 +1,368 @@ +// Code generated by gorm.io/gen. DO NOT EDIT. +// Code generated by gorm.io/gen. DO NOT EDIT. +// Code generated by gorm.io/gen. DO NOT EDIT. + +package query + +import ( + "context" + + "gorm.io/gorm" + "gorm.io/gorm/clause" + "gorm.io/gorm/schema" + + "gorm.io/gen" + "gorm.io/gen/field" + + "gorm.io/plugin/dbresolver" + + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" +) + +func newEvaluatorTag(db *gorm.DB, opts ...gen.DOOption) evaluatorTag { + _evaluatorTag := evaluatorTag{} + + _evaluatorTag.evaluatorTagDo.UseDB(db, opts...) + _evaluatorTag.evaluatorTagDo.UseModel(&model.EvaluatorTag{}) + + tableName := _evaluatorTag.evaluatorTagDo.TableName() + _evaluatorTag.ALL = field.NewAsterisk(tableName) + _evaluatorTag.ID = field.NewInt64(tableName, "id") + _evaluatorTag.SourceID = field.NewInt64(tableName, "source_id") + _evaluatorTag.TagType = field.NewInt32(tableName, "tag_type") + _evaluatorTag.TagKey = field.NewString(tableName, "tag_key") + _evaluatorTag.TagValue = field.NewString(tableName, "tag_value") + _evaluatorTag.CreatedBy = field.NewString(tableName, "created_by") + _evaluatorTag.UpdatedBy = field.NewString(tableName, "updated_by") + _evaluatorTag.CreatedAt = field.NewTime(tableName, "created_at") + _evaluatorTag.UpdatedAt = field.NewTime(tableName, "updated_at") + _evaluatorTag.DeletedAt = field.NewField(tableName, "deleted_at") + + _evaluatorTag.fillFieldMap() + + return _evaluatorTag +} + +// evaluatorTag NDB_SHARE_TABLE;评估器tag +type evaluatorTag struct { + evaluatorTagDo evaluatorTagDo + + ALL field.Asterisk + ID field.Int64 // idgen id + SourceID field.Int64 // 资源id + TagType field.Int32 // tag类型，1:评估器；2:模板 + TagKey field.String // tag键 + TagValue field.String // tag值 + CreatedBy field.String // 创建人 + UpdatedBy field.String // 更新人 + CreatedAt field.Time // 创建时间 + UpdatedAt field.Time // 更新时间 + DeletedAt field.Field // 删除时间 + + fieldMap map[string]field.Expr +} + +func (e evaluatorTag) Table(newTableName string) *evaluatorTag { + e.evaluatorTagDo.UseTable(newTableName) + return e.updateTableName(newTableName) +} + +func (e evaluatorTag) As(alias string) *evaluatorTag { + e.evaluatorTagDo.DO = *(e.evaluatorTagDo.As(alias).(*gen.DO)) + return e.updateTableName(alias) +} + +func (e *evaluatorTag) updateTableName(table string) *evaluatorTag { + e.ALL = field.NewAsterisk(table) + e.ID = field.NewInt64(table, "id") + e.SourceID = field.NewInt64(table, "source_id") + e.TagType = field.NewInt32(table, "tag_type") + e.TagKey = field.NewString(table, "tag_key") + e.TagValue = field.NewString(table, "tag_value") + e.CreatedBy = field.NewString(table, "created_by") + e.UpdatedBy = field.NewString(table, "updated_by") + e.CreatedAt = field.NewTime(table, "created_at") + e.UpdatedAt = field.NewTime(table, "updated_at") + e.DeletedAt = field.NewField(table, "deleted_at") + + e.fillFieldMap() + + return e +} + +func (e *evaluatorTag) WithContext(ctx context.Context) *evaluatorTagDo { + return e.evaluatorTagDo.WithContext(ctx) +} + +func (e evaluatorTag) TableName() string { return e.evaluatorTagDo.TableName() } + +func (e evaluatorTag) Alias() string { return e.evaluatorTagDo.Alias() } + +func (e evaluatorTag) Columns(cols ...field.Expr) gen.Columns { + return e.evaluatorTagDo.Columns(cols...) +} + +func (e *evaluatorTag) GetFieldByName(fieldName string) (field.OrderExpr, bool) { + _f, ok := e.fieldMap[fieldName] + if !ok || _f == nil { + return nil, false + } + _oe, ok := _f.(field.OrderExpr) + return _oe, ok +} + +func (e *evaluatorTag) fillFieldMap() { + e.fieldMap = make(map[string]field.Expr, 10) + e.fieldMap["id"] = e.ID + e.fieldMap["source_id"] = e.SourceID + e.fieldMap["tag_type"] = e.TagType + e.fieldMap["tag_key"] = e.TagKey + e.fieldMap["tag_value"] = e.TagValue + e.fieldMap["created_by"] = e.CreatedBy + e.fieldMap["updated_by"] = e.UpdatedBy + e.fieldMap["created_at"] = e.CreatedAt + e.fieldMap["updated_at"] = e.UpdatedAt + e.fieldMap["deleted_at"] = e.DeletedAt +} + +func (e evaluatorTag) clone(db *gorm.DB) evaluatorTag { + e.evaluatorTagDo.ReplaceConnPool(db.Statement.ConnPool) + return e +} + +func (e evaluatorTag) replaceDB(db *gorm.DB) evaluatorTag { + e.evaluatorTagDo.ReplaceDB(db) + return e +} + +type evaluatorTagDo struct{ gen.DO } + +func (e evaluatorTagDo) Debug() *evaluatorTagDo { + return e.withDO(e.DO.Debug()) +} + +func (e evaluatorTagDo) WithContext(ctx context.Context) *evaluatorTagDo { + return e.withDO(e.DO.WithContext(ctx)) +} + +func (e evaluatorTagDo) ReadDB() *evaluatorTagDo { + return e.Clauses(dbresolver.Read) +} + +func (e evaluatorTagDo) WriteDB() *evaluatorTagDo { + return e.Clauses(dbresolver.Write) +} + +func (e evaluatorTagDo) Session(config *gorm.Session) *evaluatorTagDo { + return e.withDO(e.DO.Session(config)) +} + +func (e evaluatorTagDo) Clauses(conds ...clause.Expression) *evaluatorTagDo { + return e.withDO(e.DO.Clauses(conds...)) +} + +func (e evaluatorTagDo) Returning(value interface{}, columns ...string) *evaluatorTagDo { + return e.withDO(e.DO.Returning(value, columns...)) +} + +func (e evaluatorTagDo) Not(conds ...gen.Condition) *evaluatorTagDo { + return e.withDO(e.DO.Not(conds...)) +} + +func (e evaluatorTagDo) Or(conds ...gen.Condition) *evaluatorTagDo { + return e.withDO(e.DO.Or(conds...)) +} + +func (e evaluatorTagDo) Select(conds ...field.Expr) *evaluatorTagDo { + return e.withDO(e.DO.Select(conds...)) +} + +func (e evaluatorTagDo) Where(conds ...gen.Condition) *evaluatorTagDo { + return e.withDO(e.DO.Where(conds...)) +} + +func (e evaluatorTagDo) Order(conds ...field.Expr) *evaluatorTagDo { + return e.withDO(e.DO.Order(conds...)) +} + +func (e evaluatorTagDo) Distinct(cols ...field.Expr) *evaluatorTagDo { + return e.withDO(e.DO.Distinct(cols...)) +} + +func (e evaluatorTagDo) Omit(cols ...field.Expr) *evaluatorTagDo { + return e.withDO(e.DO.Omit(cols...)) +} + +func (e evaluatorTagDo) Join(table schema.Tabler, on ...field.Expr) *evaluatorTagDo { + return e.withDO(e.DO.Join(table, on...)) +} + +func (e evaluatorTagDo) LeftJoin(table schema.Tabler, on ...field.Expr) *evaluatorTagDo { + return e.withDO(e.DO.LeftJoin(table, on...)) +} + +func (e evaluatorTagDo) RightJoin(table schema.Tabler, on ...field.Expr) *evaluatorTagDo { + return e.withDO(e.DO.RightJoin(table, on...)) +} + +func (e evaluatorTagDo) Group(cols ...field.Expr) *evaluatorTagDo { + return e.withDO(e.DO.Group(cols...)) +} + +func (e evaluatorTagDo) Having(conds ...gen.Condition) *evaluatorTagDo { + return e.withDO(e.DO.Having(conds...)) +} + +func (e evaluatorTagDo) Limit(limit int) *evaluatorTagDo { + return e.withDO(e.DO.Limit(limit)) +} + +func (e evaluatorTagDo) Offset(offset int) *evaluatorTagDo { + return e.withDO(e.DO.Offset(offset)) +} + +func (e evaluatorTagDo) Scopes(funcs ...func(gen.Dao) gen.Dao) *evaluatorTagDo { + return e.withDO(e.DO.Scopes(funcs...)) +} + +func (e evaluatorTagDo) Unscoped() *evaluatorTagDo { + return e.withDO(e.DO.Unscoped()) +} + +func (e evaluatorTagDo) Create(values ...*model.EvaluatorTag) error { + if len(values) == 0 { + return nil + } + return e.DO.Create(values) +} + +func (e evaluatorTagDo) CreateInBatches(values []*model.EvaluatorTag, batchSize int) error { + return e.DO.CreateInBatches(values, batchSize) +} + +// Save : !!! underlying implementation is different with GORM +// The method is equivalent to executing the statement: db.Clauses(clause.OnConflict{UpdateAll: true}).Create(values) +func (e evaluatorTagDo) Save(values ...*model.EvaluatorTag) error { + if len(values) == 0 { + return nil + } + return e.DO.Save(values) +} + +func (e evaluatorTagDo) First() (*model.EvaluatorTag, error) { + if result, err := e.DO.First(); err != nil { + return nil, err + } else { + return result.(*model.EvaluatorTag), nil + } +} + +func (e evaluatorTagDo) Take() (*model.EvaluatorTag, error) { + if result, err := e.DO.Take(); err != nil { + return nil, err + } else { + return result.(*model.EvaluatorTag), nil + } +} + +func (e evaluatorTagDo) Last() (*model.EvaluatorTag, error) { + if result, err := e.DO.Last(); err != nil { + return nil, err + } else { + return result.(*model.EvaluatorTag), nil + } +} + +func (e evaluatorTagDo) Find() ([]*model.EvaluatorTag, error) { + result, err := e.DO.Find() + return result.([]*model.EvaluatorTag), err +} + +func (e evaluatorTagDo) FindInBatch(batchSize int, fc func(tx gen.Dao, batch int) error) (results []*model.EvaluatorTag, err error) { + buf := make([]*model.EvaluatorTag, 0, batchSize) + err = e.DO.FindInBatches(&buf, batchSize, func(tx gen.Dao, batch int) error { + defer func() { results = append(results, buf...) }() + return fc(tx, batch) + }) + return results, err +} + +func (e evaluatorTagDo) FindInBatches(result *[]*model.EvaluatorTag, batchSize int, fc func(tx gen.Dao, batch int) error) error { + return e.DO.FindInBatches(result, batchSize, fc) +} + +func (e evaluatorTagDo) Attrs(attrs ...field.AssignExpr) *evaluatorTagDo { + return e.withDO(e.DO.Attrs(attrs...)) +} + +func (e evaluatorTagDo) Assign(attrs ...field.AssignExpr) *evaluatorTagDo { + return e.withDO(e.DO.Assign(attrs...)) +} + +func (e evaluatorTagDo) Joins(fields ...field.RelationField) *evaluatorTagDo { + for _, _f := range fields { + e = *e.withDO(e.DO.Joins(_f)) + } + return &e +} + +func (e evaluatorTagDo) Preload(fields ...field.RelationField) *evaluatorTagDo { + for _, _f := range fields { + e = *e.withDO(e.DO.Preload(_f)) + } + return &e +} + +func (e evaluatorTagDo) FirstOrInit() (*model.EvaluatorTag, error) { + if result, err := e.DO.FirstOrInit(); err != nil { + return nil, err + } else { + return result.(*model.EvaluatorTag), nil + } +} + +func (e evaluatorTagDo) FirstOrCreate() (*model.EvaluatorTag, error) { + if result, err := e.DO.FirstOrCreate(); err != nil { + return nil, err + } else { + return result.(*model.EvaluatorTag), nil + } +} + +func (e evaluatorTagDo) FindByPage(offset int, limit int) (result []*model.EvaluatorTag, count int64, err error) { + result, err = e.Offset(offset).Limit(limit).Find() + if err != nil { + return + } + + if size := len(result); 0 < limit && 0 < size && size < limit { + count = int64(size + offset) + return + } + + count, err = e.Offset(-1).Limit(-1).Count() + return +} + +func (e evaluatorTagDo) ScanByPage(result interface{}, offset int, limit int) (count int64, err error) { + count, err = e.Count() + if err != nil { + return + } + + err = e.Offset(offset).Limit(limit).Scan(result) + return +} + +func (e evaluatorTagDo) Scan(result interface{}) (err error) { + return e.DO.Scan(result) +} + +func (e evaluatorTagDo) Delete(models ...*model.EvaluatorTag) (result gen.ResultInfo, err error) { + return e.DO.Delete(models) +} + +func (e *evaluatorTagDo) withDO(do gen.Dao) *evaluatorTagDo { + e.DO = *do.(*gen.DO) + return e +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_template.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_template.gen.go new file mode 100644 index 000000000..e4239519c --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_template.gen.go @@ -0,0 +1,396 @@ +// Code generated by gorm.io/gen. DO NOT EDIT. +// Code generated by gorm.io/gen. DO NOT EDIT. +// Code generated by gorm.io/gen. DO NOT EDIT. + +package query + +import ( + "context" + + "gorm.io/gorm" + "gorm.io/gorm/clause" + "gorm.io/gorm/schema" + + "gorm.io/gen" + "gorm.io/gen/field" + + "gorm.io/plugin/dbresolver" + + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" +) + +func newEvaluatorTemplate(db *gorm.DB, opts ...gen.DOOption) evaluatorTemplate { + _evaluatorTemplate := evaluatorTemplate{} + + _evaluatorTemplate.evaluatorTemplateDo.UseDB(db, opts...) + _evaluatorTemplate.evaluatorTemplateDo.UseModel(&model.EvaluatorTemplate{}) + + tableName := _evaluatorTemplate.evaluatorTemplateDo.TableName() + _evaluatorTemplate.ALL = field.NewAsterisk(tableName) + _evaluatorTemplate.ID = field.NewInt64(tableName, "id") + _evaluatorTemplate.SpaceID = field.NewInt64(tableName, "space_id") + _evaluatorTemplate.EvaluatorType = field.NewInt32(tableName, "evaluator_type") + _evaluatorTemplate.Name = field.NewString(tableName, "name") + _evaluatorTemplate.Description = field.NewString(tableName, "description") + _evaluatorTemplate.Metainfo = field.NewBytes(tableName, "metainfo") + _evaluatorTemplate.ReceiveChatHistory = field.NewBool(tableName, "receive_chat_history") + _evaluatorTemplate.InputSchema = field.NewBytes(tableName, "input_schema") + _evaluatorTemplate.OutputSchema = field.NewBytes(tableName, "output_schema") + _evaluatorTemplate.CreatedBy = field.NewString(tableName, "created_by") + _evaluatorTemplate.UpdatedBy = field.NewString(tableName, "updated_by") + _evaluatorTemplate.CreatedAt = field.NewTime(tableName, "created_at") + _evaluatorTemplate.UpdatedAt = field.NewTime(tableName, "updated_at") + _evaluatorTemplate.DeletedAt = field.NewField(tableName, "deleted_at") + _evaluatorTemplate.Popularity = field.NewInt64(tableName, "popularity") + _evaluatorTemplate.Benchmark = field.NewString(tableName, "benchmark") + _evaluatorTemplate.Vendor = field.NewString(tableName, "vendor") + + _evaluatorTemplate.fillFieldMap() + + return _evaluatorTemplate +} + +// evaluatorTemplate NDB_SHARE_TABLE;评估器模板 +type evaluatorTemplate struct { + evaluatorTemplateDo evaluatorTemplateDo + + ALL field.Asterisk + ID field.Int64 // idgen id + SpaceID field.Int64 // 空间id + EvaluatorType field.Int32 // 评估器类型 + Name field.String // 名称 + Description field.String // 版本描述 + Metainfo field.Bytes // 具体内容, 每种静态规则类型对应一个解析方式, json + ReceiveChatHistory field.Bool // 是否需求传递上下文 + InputSchema field.Bytes // 评估器结构信息, json + OutputSchema field.Bytes // 评估器结构信息, json + CreatedBy field.String // 创建人 + UpdatedBy field.String // 更新人 + CreatedAt field.Time // 创建时间 + UpdatedAt field.Time // 更新时间 + DeletedAt field.Field // 删除时间 + Popularity field.Int64 // 热度 + Benchmark field.String // benchmark + Vendor field.String // vendor + + fieldMap map[string]field.Expr +} + +func (e evaluatorTemplate) Table(newTableName string) *evaluatorTemplate { + e.evaluatorTemplateDo.UseTable(newTableName) + return e.updateTableName(newTableName) +} + +func (e evaluatorTemplate) As(alias string) *evaluatorTemplate { + e.evaluatorTemplateDo.DO = *(e.evaluatorTemplateDo.As(alias).(*gen.DO)) + return e.updateTableName(alias) +} + +func (e *evaluatorTemplate) updateTableName(table string) *evaluatorTemplate { + e.ALL = field.NewAsterisk(table) + e.ID = field.NewInt64(table, "id") + e.SpaceID = field.NewInt64(table, "space_id") + e.EvaluatorType = field.NewInt32(table, "evaluator_type") + e.Name = field.NewString(table, "name") + e.Description = field.NewString(table, "description") + e.Metainfo = field.NewBytes(table, "metainfo") + e.ReceiveChatHistory = field.NewBool(table, "receive_chat_history") + e.InputSchema = field.NewBytes(table, "input_schema") + e.OutputSchema = field.NewBytes(table, "output_schema") + e.CreatedBy = field.NewString(table, "created_by") + e.UpdatedBy = field.NewString(table, "updated_by") + e.CreatedAt = field.NewTime(table, "created_at") + e.UpdatedAt = field.NewTime(table, "updated_at") + e.DeletedAt = field.NewField(table, "deleted_at") + e.Popularity = field.NewInt64(table, "popularity") + e.Benchmark = field.NewString(table, "benchmark") + e.Vendor = field.NewString(table, "vendor") + + e.fillFieldMap() + + return e +} + +func (e *evaluatorTemplate) WithContext(ctx context.Context) *evaluatorTemplateDo { + return e.evaluatorTemplateDo.WithContext(ctx) +} + +func (e evaluatorTemplate) TableName() string { return e.evaluatorTemplateDo.TableName() } + +func (e evaluatorTemplate) Alias() string { return e.evaluatorTemplateDo.Alias() } + +func (e evaluatorTemplate) Columns(cols ...field.Expr) gen.Columns { + return e.evaluatorTemplateDo.Columns(cols...) +} + +func (e *evaluatorTemplate) GetFieldByName(fieldName string) (field.OrderExpr, bool) { + _f, ok := e.fieldMap[fieldName] + if !ok || _f == nil { + return nil, false + } + _oe, ok := _f.(field.OrderExpr) + return _oe, ok +} + +func (e *evaluatorTemplate) fillFieldMap() { + e.fieldMap = make(map[string]field.Expr, 17) + e.fieldMap["id"] = e.ID + e.fieldMap["space_id"] = e.SpaceID + e.fieldMap["evaluator_type"] = e.EvaluatorType + e.fieldMap["name"] = e.Name + e.fieldMap["description"] = e.Description + e.fieldMap["metainfo"] = e.Metainfo + e.fieldMap["receive_chat_history"] = e.ReceiveChatHistory + e.fieldMap["input_schema"] = e.InputSchema + e.fieldMap["output_schema"] = e.OutputSchema + e.fieldMap["created_by"] = e.CreatedBy + e.fieldMap["updated_by"] = e.UpdatedBy + e.fieldMap["created_at"] = e.CreatedAt + e.fieldMap["updated_at"] = e.UpdatedAt + e.fieldMap["deleted_at"] = e.DeletedAt + e.fieldMap["popularity"] = e.Popularity + e.fieldMap["benchmark"] = e.Benchmark + e.fieldMap["vendor"] = e.Vendor +} + +func (e evaluatorTemplate) clone(db *gorm.DB) evaluatorTemplate { + e.evaluatorTemplateDo.ReplaceConnPool(db.Statement.ConnPool) + return e +} + +func (e evaluatorTemplate) replaceDB(db *gorm.DB) evaluatorTemplate { + e.evaluatorTemplateDo.ReplaceDB(db) + return e +} + +type evaluatorTemplateDo struct{ gen.DO } + +func (e evaluatorTemplateDo) Debug() *evaluatorTemplateDo { + return e.withDO(e.DO.Debug()) +} + +func (e evaluatorTemplateDo) WithContext(ctx context.Context) *evaluatorTemplateDo { + return e.withDO(e.DO.WithContext(ctx)) +} + +func (e evaluatorTemplateDo) ReadDB() *evaluatorTemplateDo { + return e.Clauses(dbresolver.Read) +} + +func (e evaluatorTemplateDo) WriteDB() *evaluatorTemplateDo { + return e.Clauses(dbresolver.Write) +} + +func (e evaluatorTemplateDo) Session(config *gorm.Session) *evaluatorTemplateDo { + return e.withDO(e.DO.Session(config)) +} + +func (e evaluatorTemplateDo) Clauses(conds ...clause.Expression) *evaluatorTemplateDo { + return e.withDO(e.DO.Clauses(conds...)) +} + +func (e evaluatorTemplateDo) Returning(value interface{}, columns ...string) *evaluatorTemplateDo { + return e.withDO(e.DO.Returning(value, columns...)) +} + +func (e evaluatorTemplateDo) Not(conds ...gen.Condition) *evaluatorTemplateDo { + return e.withDO(e.DO.Not(conds...)) +} + +func (e evaluatorTemplateDo) Or(conds ...gen.Condition) *evaluatorTemplateDo { + return e.withDO(e.DO.Or(conds...)) +} + +func (e evaluatorTemplateDo) Select(conds ...field.Expr) *evaluatorTemplateDo { + return e.withDO(e.DO.Select(conds...)) +} + +func (e evaluatorTemplateDo) Where(conds ...gen.Condition) *evaluatorTemplateDo { + return e.withDO(e.DO.Where(conds...)) +} + +func (e evaluatorTemplateDo) Order(conds ...field.Expr) *evaluatorTemplateDo { + return e.withDO(e.DO.Order(conds...)) +} + +func (e evaluatorTemplateDo) Distinct(cols ...field.Expr) *evaluatorTemplateDo { + return e.withDO(e.DO.Distinct(cols...)) +} + +func (e evaluatorTemplateDo) Omit(cols ...field.Expr) *evaluatorTemplateDo { + return e.withDO(e.DO.Omit(cols...)) +} + +func (e evaluatorTemplateDo) Join(table schema.Tabler, on ...field.Expr) *evaluatorTemplateDo { + return e.withDO(e.DO.Join(table, on...)) +} + +func (e evaluatorTemplateDo) LeftJoin(table schema.Tabler, on ...field.Expr) *evaluatorTemplateDo { + return e.withDO(e.DO.LeftJoin(table, on...)) +} + +func (e evaluatorTemplateDo) RightJoin(table schema.Tabler, on ...field.Expr) *evaluatorTemplateDo { + return e.withDO(e.DO.RightJoin(table, on...)) +} + +func (e evaluatorTemplateDo) Group(cols ...field.Expr) *evaluatorTemplateDo { + return e.withDO(e.DO.Group(cols...)) +} + +func (e evaluatorTemplateDo) Having(conds ...gen.Condition) *evaluatorTemplateDo { + return e.withDO(e.DO.Having(conds...)) +} + +func (e evaluatorTemplateDo) Limit(limit int) *evaluatorTemplateDo { + return e.withDO(e.DO.Limit(limit)) +} + +func (e evaluatorTemplateDo) Offset(offset int) *evaluatorTemplateDo { + return e.withDO(e.DO.Offset(offset)) +} + +func (e evaluatorTemplateDo) Scopes(funcs ...func(gen.Dao) gen.Dao) *evaluatorTemplateDo { + return e.withDO(e.DO.Scopes(funcs...)) +} + +func (e evaluatorTemplateDo) Unscoped() *evaluatorTemplateDo { + return e.withDO(e.DO.Unscoped()) +} + +func (e evaluatorTemplateDo) Create(values ...*model.EvaluatorTemplate) error { + if len(values) == 0 { + return nil + } + return e.DO.Create(values) +} + +func (e evaluatorTemplateDo) CreateInBatches(values []*model.EvaluatorTemplate, batchSize int) error { + return e.DO.CreateInBatches(values, batchSize) +} + +// Save : !!! underlying implementation is different with GORM +// The method is equivalent to executing the statement: db.Clauses(clause.OnConflict{UpdateAll: true}).Create(values) +func (e evaluatorTemplateDo) Save(values ...*model.EvaluatorTemplate) error { + if len(values) == 0 { + return nil + } + return e.DO.Save(values) +} + +func (e evaluatorTemplateDo) First() (*model.EvaluatorTemplate, error) { + if result, err := e.DO.First(); err != nil { + return nil, err + } else { + return result.(*model.EvaluatorTemplate), nil + } +} + +func (e evaluatorTemplateDo) Take() (*model.EvaluatorTemplate, error) { + if result, err := e.DO.Take(); err != nil { + return nil, err + } else { + return result.(*model.EvaluatorTemplate), nil + } +} + +func (e evaluatorTemplateDo) Last() (*model.EvaluatorTemplate, error) { + if result, err := e.DO.Last(); err != nil { + return nil, err + } else { + return result.(*model.EvaluatorTemplate), nil + } +} + +func (e evaluatorTemplateDo) Find() ([]*model.EvaluatorTemplate, error) { + result, err := e.DO.Find() + return result.([]*model.EvaluatorTemplate), err +} + +func (e evaluatorTemplateDo) FindInBatch(batchSize int, fc func(tx gen.Dao, batch int) error) (results []*model.EvaluatorTemplate, err error) { + buf := make([]*model.EvaluatorTemplate, 0, batchSize) + err = e.DO.FindInBatches(&buf, batchSize, func(tx gen.Dao, batch int) error { + defer func() { results = append(results, buf...) }() + return fc(tx, batch) + }) + return results, err +} + +func (e evaluatorTemplateDo) FindInBatches(result *[]*model.EvaluatorTemplate, batchSize int, fc func(tx gen.Dao, batch int) error) error { + return e.DO.FindInBatches(result, batchSize, fc) +} + +func (e evaluatorTemplateDo) Attrs(attrs ...field.AssignExpr) *evaluatorTemplateDo { + return e.withDO(e.DO.Attrs(attrs...)) +} + +func (e evaluatorTemplateDo) Assign(attrs ...field.AssignExpr) *evaluatorTemplateDo { + return e.withDO(e.DO.Assign(attrs...)) +} + +func (e evaluatorTemplateDo) Joins(fields ...field.RelationField) *evaluatorTemplateDo { + for _, _f := range fields { + e = *e.withDO(e.DO.Joins(_f)) + } + return &e +} + +func (e evaluatorTemplateDo) Preload(fields ...field.RelationField) *evaluatorTemplateDo { + for _, _f := range fields { + e = *e.withDO(e.DO.Preload(_f)) + } + return &e +} + +func (e evaluatorTemplateDo) FirstOrInit() (*model.EvaluatorTemplate, error) { + if result, err := e.DO.FirstOrInit(); err != nil { + return nil, err + } else { + return result.(*model.EvaluatorTemplate), nil + } +} + +func (e evaluatorTemplateDo) FirstOrCreate() (*model.EvaluatorTemplate, error) { + if result, err := e.DO.FirstOrCreate(); err != nil { + return nil, err + } else { + return result.(*model.EvaluatorTemplate), nil + } +} + +func (e evaluatorTemplateDo) FindByPage(offset int, limit int) (result []*model.EvaluatorTemplate, count int64, err error) { + result, err = e.Offset(offset).Limit(limit).Find() + if err != nil { + return + } + + if size := len(result); 0 < limit && 0 < size && size < limit { + count = int64(size + offset) + return + } + + count, err = e.Offset(-1).Limit(-1).Count() + return +} + +func (e evaluatorTemplateDo) ScanByPage(result interface{}, offset int, limit int) (count int64, err error) { + count, err = e.Count() + if err != nil { + return + } + + err = e.Offset(offset).Limit(limit).Scan(result) + return +} + +func (e evaluatorTemplateDo) Scan(result interface{}) (err error) { + return e.DO.Scan(result) +} + +func (e evaluatorTemplateDo) Delete(models ...*model.EvaluatorTemplate) (result gen.ResultInfo, err error) { + return e.DO.Delete(models) +} + +func (e *evaluatorTemplateDo) withDO(do gen.Dao) *evaluatorTemplateDo { + e.DO = *do.(*gen.DO) + return e +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_version.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_version.gen.go index a8a22a151..b2ca6e7f6 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_version.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_version.gen.go @@ -41,6 +41,7 @@ func newEvaluatorVersion(db *gorm.DB, opts ...gen.DOOption) evaluatorVersion { _evaluatorVersion.CreatedAt = field.NewTime(tableName, "created_at") _evaluatorVersion.UpdatedAt = field.NewTime(tableName, "updated_at") _evaluatorVersion.DeletedAt = field.NewField(tableName, "deleted_at") + _evaluatorVersion.OutputSchema = field.NewBytes(tableName, "output_schema") _evaluatorVersion.fillFieldMap() @@ -66,6 +67,7 @@ type evaluatorVersion struct { CreatedAt field.Time // 创建时间 UpdatedAt field.Time // 更新时间 DeletedAt field.Field // 删除时间 + OutputSchema field.Bytes // 评估器输出schema, json fieldMap map[string]field.Expr } @@ -96,6 +98,7 @@ func (e *evaluatorVersion) updateTableName(table string) *evaluatorVersion { e.CreatedAt = field.NewTime(table, "created_at") e.UpdatedAt = field.NewTime(table, "updated_at") e.DeletedAt = field.NewField(table, "deleted_at") + e.OutputSchema = field.NewBytes(table, "output_schema") e.fillFieldMap() @@ -124,7 +127,7 @@ func (e *evaluatorVersion) GetFieldByName(fieldName string) (field.OrderExpr, bo } func (e *evaluatorVersion) fillFieldMap() { - e.fieldMap = make(map[string]field.Expr, 14) + e.fieldMap = make(map[string]field.Expr, 15) e.fieldMap["id"] = e.ID e.fieldMap["space_id"] = e.SpaceID e.fieldMap["evaluator_type"] = e.EvaluatorType @@ -139,6 +142,7 @@ func (e *evaluatorVersion) fillFieldMap() { e.fieldMap["created_at"] = e.CreatedAt e.fieldMap["updated_at"] = e.UpdatedAt e.fieldMap["deleted_at"] = e.DeletedAt + e.fieldMap["output_schema"] = e.OutputSchema } func (e evaluatorVersion) clone(db *gorm.DB) evaluatorVersion { diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/gen.go index 861a05f45..436d76d9a 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/gen.go @@ -17,29 +17,29 @@ import ( func Use(db *gorm.DB, opts ...gen.DOOption) *Query { return &Query{ - db: db, - Evaluator: newEvaluator(db, opts...), - EvaluatorRecord: newEvaluatorRecord(db, opts...), - EvaluatorVersion: newEvaluatorVersion(db, opts...), + db: db, + Evaluator: newEvaluator(db, opts...), + EvaluatorTag: newEvaluatorTag(db, opts...), + EvaluatorTemplate: newEvaluatorTemplate(db, opts...), } } type Query struct { db *gorm.DB - Evaluator evaluator - EvaluatorRecord evaluatorRecord - EvaluatorVersion evaluatorVersion + Evaluator evaluator + EvaluatorTag evaluatorTag + EvaluatorTemplate evaluatorTemplate } func (q *Query) Available() bool { return q.db != nil } func (q *Query) clone(db *gorm.DB) *Query { return &Query{ - db: db, - Evaluator: q.Evaluator.clone(db), - EvaluatorRecord: q.EvaluatorRecord.clone(db), - EvaluatorVersion: q.EvaluatorVersion.clone(db), + db: db, + Evaluator: q.Evaluator.clone(db), + EvaluatorTag: q.EvaluatorTag.clone(db), + EvaluatorTemplate: q.EvaluatorTemplate.clone(db), } } @@ -53,24 +53,24 @@ func (q *Query) WriteDB() *Query { func (q *Query) ReplaceDB(db *gorm.DB) *Query { return &Query{ - db: db, - Evaluator: q.Evaluator.replaceDB(db), - EvaluatorRecord: q.EvaluatorRecord.replaceDB(db), - EvaluatorVersion: q.EvaluatorVersion.replaceDB(db), + db: db, + Evaluator: q.Evaluator.replaceDB(db), + EvaluatorTag: q.EvaluatorTag.replaceDB(db), + EvaluatorTemplate: q.EvaluatorTemplate.replaceDB(db), } } type queryCtx struct { - Evaluator *evaluatorDo - EvaluatorRecord *evaluatorRecordDo - EvaluatorVersion *evaluatorVersionDo + Evaluator *evaluatorDo + EvaluatorTag *evaluatorTagDo + EvaluatorTemplate *evaluatorTemplateDo } func (q *Query) WithContext(ctx context.Context) *queryCtx { return &queryCtx{ - Evaluator: q.Evaluator.WithContext(ctx), - EvaluatorRecord: q.EvaluatorRecord.WithContext(ctx), - EvaluatorVersion: q.EvaluatorVersion.WithContext(ctx), + Evaluator: q.Evaluator.WithContext(ctx), + EvaluatorTag: q.EvaluatorTag.WithContext(ctx), + EvaluatorTemplate: q.EvaluatorTemplate.WithContext(ctx), } } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go index 7214747f3..22ee483d3 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql (interfaces: EvaluatorDAO) +// +// Generated by this command: +// +// mockgen -destination mocks/evaluator_mock.go -package=mocks . EvaluatorDAO +// // Package mocks is a generated GoMock package. package mocks @@ -18,6 +23,7 @@ import ( type MockEvaluatorDAO struct { ctrl *gomock.Controller recorder *MockEvaluatorDAOMockRecorder + isgomock struct{} } // MockEvaluatorDAOMockRecorder is the mock recorder for MockEvaluatorDAO. @@ -38,10 +44,10 @@ func (m *MockEvaluatorDAO) EXPECT() *MockEvaluatorDAOMockRecorder { } // BatchDeleteEvaluator mocks base method. -func (m *MockEvaluatorDAO) BatchDeleteEvaluator(arg0 context.Context, arg1 []int64, arg2 string, arg3 ...db.Option) error { +func (m *MockEvaluatorDAO) BatchDeleteEvaluator(ctx context.Context, ids []int64, userID string, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, ids, userID} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "BatchDeleteEvaluator", varargs...) @@ -50,17 +56,17 @@ func (m *MockEvaluatorDAO) BatchDeleteEvaluator(arg0 context.Context, arg1 []int } // BatchDeleteEvaluator indicates an expected call of BatchDeleteEvaluator. -func (mr *MockEvaluatorDAOMockRecorder) BatchDeleteEvaluator(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorDAOMockRecorder) BatchDeleteEvaluator(ctx, ids, userID any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, ids, userID}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchDeleteEvaluator", reflect.TypeOf((*MockEvaluatorDAO)(nil).BatchDeleteEvaluator), varargs...) } // BatchGetEvaluatorByID mocks base method. -func (m *MockEvaluatorDAO) BatchGetEvaluatorByID(arg0 context.Context, arg1 []int64, arg2 bool, arg3 ...db.Option) ([]*model.Evaluator, error) { +func (m *MockEvaluatorDAO) BatchGetEvaluatorByID(ctx context.Context, ids []int64, includeDeleted bool, opts ...db.Option) ([]*model.Evaluator, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, ids, includeDeleted} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "BatchGetEvaluatorByID", varargs...) @@ -70,17 +76,17 @@ func (m *MockEvaluatorDAO) BatchGetEvaluatorByID(arg0 context.Context, arg1 []in } // BatchGetEvaluatorByID indicates an expected call of BatchGetEvaluatorByID. -func (mr *MockEvaluatorDAOMockRecorder) BatchGetEvaluatorByID(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorDAOMockRecorder) BatchGetEvaluatorByID(ctx, ids, includeDeleted any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, ids, includeDeleted}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorByID", reflect.TypeOf((*MockEvaluatorDAO)(nil).BatchGetEvaluatorByID), varargs...) } // CheckNameExist mocks base method. -func (m *MockEvaluatorDAO) CheckNameExist(arg0 context.Context, arg1, arg2 int64, arg3 string, arg4 ...db.Option) (bool, error) { +func (m *MockEvaluatorDAO) CheckNameExist(ctx context.Context, spaceID, evaluatorID int64, name string, opts ...db.Option) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2, arg3} - for _, a := range arg4 { + varargs := []any{ctx, spaceID, evaluatorID, name} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "CheckNameExist", varargs...) @@ -90,17 +96,17 @@ func (m *MockEvaluatorDAO) CheckNameExist(arg0 context.Context, arg1, arg2 int64 } // CheckNameExist indicates an expected call of CheckNameExist. -func (mr *MockEvaluatorDAOMockRecorder) CheckNameExist(arg0, arg1, arg2, arg3 interface{}, arg4 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorDAOMockRecorder) CheckNameExist(ctx, spaceID, evaluatorID, name any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]any{ctx, spaceID, evaluatorID, name}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckNameExist", reflect.TypeOf((*MockEvaluatorDAO)(nil).CheckNameExist), varargs...) } // CreateEvaluator mocks base method. -func (m *MockEvaluatorDAO) CreateEvaluator(arg0 context.Context, arg1 *model.Evaluator, arg2 ...db.Option) error { +func (m *MockEvaluatorDAO) CreateEvaluator(ctx context.Context, evaluator *model.Evaluator, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, evaluator} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "CreateEvaluator", varargs...) @@ -109,17 +115,17 @@ func (m *MockEvaluatorDAO) CreateEvaluator(arg0 context.Context, arg1 *model.Eva } // CreateEvaluator indicates an expected call of CreateEvaluator. -func (mr *MockEvaluatorDAOMockRecorder) CreateEvaluator(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorDAOMockRecorder) CreateEvaluator(ctx, evaluator any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{ctx, evaluator}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateEvaluator", reflect.TypeOf((*MockEvaluatorDAO)(nil).CreateEvaluator), varargs...) } // GetEvaluatorByID mocks base method. -func (m *MockEvaluatorDAO) GetEvaluatorByID(arg0 context.Context, arg1 int64, arg2 bool, arg3 ...db.Option) (*model.Evaluator, error) { +func (m *MockEvaluatorDAO) GetEvaluatorByID(ctx context.Context, id int64, includeDeleted bool, opts ...db.Option) (*model.Evaluator, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, id, includeDeleted} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "GetEvaluatorByID", varargs...) @@ -129,17 +135,17 @@ func (m *MockEvaluatorDAO) GetEvaluatorByID(arg0 context.Context, arg1 int64, ar } // GetEvaluatorByID indicates an expected call of GetEvaluatorByID. -func (mr *MockEvaluatorDAOMockRecorder) GetEvaluatorByID(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorDAOMockRecorder) GetEvaluatorByID(ctx, id, includeDeleted any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, id, includeDeleted}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorByID", reflect.TypeOf((*MockEvaluatorDAO)(nil).GetEvaluatorByID), varargs...) } // ListEvaluator mocks base method. -func (m *MockEvaluatorDAO) ListEvaluator(arg0 context.Context, arg1 *mysql.ListEvaluatorRequest, arg2 ...db.Option) (*mysql.ListEvaluatorResponse, error) { +func (m *MockEvaluatorDAO) ListEvaluator(ctx context.Context, req *mysql.ListEvaluatorRequest, opts ...db.Option) (*mysql.ListEvaluatorResponse, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, req} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "ListEvaluator", varargs...) @@ -149,17 +155,36 @@ func (m *MockEvaluatorDAO) ListEvaluator(arg0 context.Context, arg1 *mysql.ListE } // ListEvaluator indicates an expected call of ListEvaluator. -func (mr *MockEvaluatorDAOMockRecorder) ListEvaluator(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorDAOMockRecorder) ListEvaluator(ctx, req any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{ctx, req}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluator", reflect.TypeOf((*MockEvaluatorDAO)(nil).ListEvaluator), varargs...) } +// UpdateBuiltinEvaluatorMeta mocks base method. +func (m *MockEvaluatorDAO) UpdateBuiltinEvaluatorMeta(ctx context.Context, do *model.Evaluator, opts ...db.Option) error { + m.ctrl.T.Helper() + varargs := []any{ctx, do} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "UpdateBuiltinEvaluatorMeta", varargs...) + ret0, _ := ret[0].(error) + return ret0 +} + +// UpdateBuiltinEvaluatorMeta indicates an expected call of UpdateBuiltinEvaluatorMeta. +func (mr *MockEvaluatorDAOMockRecorder) UpdateBuiltinEvaluatorMeta(ctx, do any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, do}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateBuiltinEvaluatorMeta", reflect.TypeOf((*MockEvaluatorDAO)(nil).UpdateBuiltinEvaluatorMeta), varargs...) +} + // UpdateEvaluatorDraftSubmitted mocks base method. -func (m *MockEvaluatorDAO) UpdateEvaluatorDraftSubmitted(arg0 context.Context, arg1 int64, arg2 bool, arg3 string, arg4 ...db.Option) error { +func (m *MockEvaluatorDAO) UpdateEvaluatorDraftSubmitted(ctx context.Context, evaluatorID int64, draftSubmitted bool, userID string, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2, arg3} - for _, a := range arg4 { + varargs := []any{ctx, evaluatorID, draftSubmitted, userID} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "UpdateEvaluatorDraftSubmitted", varargs...) @@ -168,17 +193,17 @@ func (m *MockEvaluatorDAO) UpdateEvaluatorDraftSubmitted(arg0 context.Context, a } // UpdateEvaluatorDraftSubmitted indicates an expected call of UpdateEvaluatorDraftSubmitted. -func (mr *MockEvaluatorDAOMockRecorder) UpdateEvaluatorDraftSubmitted(arg0, arg1, arg2, arg3 interface{}, arg4 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorDAOMockRecorder) UpdateEvaluatorDraftSubmitted(ctx, evaluatorID, draftSubmitted, userID any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]any{ctx, evaluatorID, draftSubmitted, userID}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorDraftSubmitted", reflect.TypeOf((*MockEvaluatorDAO)(nil).UpdateEvaluatorDraftSubmitted), varargs...) } // UpdateEvaluatorLatestVersion mocks base method. -func (m *MockEvaluatorDAO) UpdateEvaluatorLatestVersion(arg0 context.Context, arg1 int64, arg2, arg3 string, arg4 ...db.Option) error { +func (m *MockEvaluatorDAO) UpdateEvaluatorLatestVersion(ctx context.Context, evaluatorID int64, version, userID string, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2, arg3} - for _, a := range arg4 { + varargs := []any{ctx, evaluatorID, version, userID} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "UpdateEvaluatorLatestVersion", varargs...) @@ -187,17 +212,17 @@ func (m *MockEvaluatorDAO) UpdateEvaluatorLatestVersion(arg0 context.Context, ar } // UpdateEvaluatorLatestVersion indicates an expected call of UpdateEvaluatorLatestVersion. -func (mr *MockEvaluatorDAOMockRecorder) UpdateEvaluatorLatestVersion(arg0, arg1, arg2, arg3 interface{}, arg4 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorDAOMockRecorder) UpdateEvaluatorLatestVersion(ctx, evaluatorID, version, userID any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]any{ctx, evaluatorID, version, userID}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorLatestVersion", reflect.TypeOf((*MockEvaluatorDAO)(nil).UpdateEvaluatorLatestVersion), varargs...) } // UpdateEvaluatorMeta mocks base method. -func (m *MockEvaluatorDAO) UpdateEvaluatorMeta(arg0 context.Context, arg1 *model.Evaluator, arg2 ...db.Option) error { +func (m *MockEvaluatorDAO) UpdateEvaluatorMeta(ctx context.Context, do *model.Evaluator, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, do} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "UpdateEvaluatorMeta", varargs...) @@ -206,8 +231,8 @@ func (m *MockEvaluatorDAO) UpdateEvaluatorMeta(arg0 context.Context, arg1 *model } // UpdateEvaluatorMeta indicates an expected call of UpdateEvaluatorMeta. -func (mr *MockEvaluatorDAOMockRecorder) UpdateEvaluatorMeta(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorDAOMockRecorder) UpdateEvaluatorMeta(ctx, do any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{ctx, do}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorMeta", reflect.TypeOf((*MockEvaluatorDAO)(nil).UpdateEvaluatorMeta), varargs...) } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_record_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_record_mock.go index bc48d275e..90fda9a1b 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_record_mock.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_record_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql (interfaces: EvaluatorRecordDAO) +// +// Generated by this command: +// +// mockgen -destination mocks/evaluator_record_mock.go -package=mocks . EvaluatorRecordDAO +// // Package mocks is a generated GoMock package. package mocks @@ -17,6 +22,7 @@ import ( type MockEvaluatorRecordDAO struct { ctrl *gomock.Controller recorder *MockEvaluatorRecordDAOMockRecorder + isgomock struct{} } // MockEvaluatorRecordDAOMockRecorder is the mock recorder for MockEvaluatorRecordDAO. @@ -37,10 +43,10 @@ func (m *MockEvaluatorRecordDAO) EXPECT() *MockEvaluatorRecordDAOMockRecorder { } // BatchGetEvaluatorRecord mocks base method. -func (m *MockEvaluatorRecordDAO) BatchGetEvaluatorRecord(arg0 context.Context, arg1 []int64, arg2 bool, arg3 ...db.Option) ([]*model.EvaluatorRecord, error) { +func (m *MockEvaluatorRecordDAO) BatchGetEvaluatorRecord(ctx context.Context, evaluatorRecordIDs []int64, includeDeleted bool, opts ...db.Option) ([]*model.EvaluatorRecord, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, evaluatorRecordIDs, includeDeleted} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "BatchGetEvaluatorRecord", varargs...) @@ -50,17 +56,17 @@ func (m *MockEvaluatorRecordDAO) BatchGetEvaluatorRecord(arg0 context.Context, a } // BatchGetEvaluatorRecord indicates an expected call of BatchGetEvaluatorRecord. -func (mr *MockEvaluatorRecordDAOMockRecorder) BatchGetEvaluatorRecord(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorRecordDAOMockRecorder) BatchGetEvaluatorRecord(ctx, evaluatorRecordIDs, includeDeleted any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, evaluatorRecordIDs, includeDeleted}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorRecord", reflect.TypeOf((*MockEvaluatorRecordDAO)(nil).BatchGetEvaluatorRecord), varargs...) } // CreateEvaluatorRecord mocks base method. -func (m *MockEvaluatorRecordDAO) CreateEvaluatorRecord(arg0 context.Context, arg1 *model.EvaluatorRecord, arg2 ...db.Option) error { +func (m *MockEvaluatorRecordDAO) CreateEvaluatorRecord(ctx context.Context, evaluatorRecord *model.EvaluatorRecord, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, evaluatorRecord} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "CreateEvaluatorRecord", varargs...) @@ -69,17 +75,17 @@ func (m *MockEvaluatorRecordDAO) CreateEvaluatorRecord(arg0 context.Context, arg } // CreateEvaluatorRecord indicates an expected call of CreateEvaluatorRecord. -func (mr *MockEvaluatorRecordDAOMockRecorder) CreateEvaluatorRecord(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorRecordDAOMockRecorder) CreateEvaluatorRecord(ctx, evaluatorRecord any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{ctx, evaluatorRecord}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateEvaluatorRecord", reflect.TypeOf((*MockEvaluatorRecordDAO)(nil).CreateEvaluatorRecord), varargs...) } // GetEvaluatorRecord mocks base method. -func (m *MockEvaluatorRecordDAO) GetEvaluatorRecord(arg0 context.Context, arg1 int64, arg2 bool, arg3 ...db.Option) (*model.EvaluatorRecord, error) { +func (m *MockEvaluatorRecordDAO) GetEvaluatorRecord(ctx context.Context, evaluatorRecordID int64, includeDeleted bool, opts ...db.Option) (*model.EvaluatorRecord, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, evaluatorRecordID, includeDeleted} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "GetEvaluatorRecord", varargs...) @@ -89,17 +95,17 @@ func (m *MockEvaluatorRecordDAO) GetEvaluatorRecord(arg0 context.Context, arg1 i } // GetEvaluatorRecord indicates an expected call of GetEvaluatorRecord. -func (mr *MockEvaluatorRecordDAOMockRecorder) GetEvaluatorRecord(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorRecordDAOMockRecorder) GetEvaluatorRecord(ctx, evaluatorRecordID, includeDeleted any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, evaluatorRecordID, includeDeleted}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorRecord", reflect.TypeOf((*MockEvaluatorRecordDAO)(nil).GetEvaluatorRecord), varargs...) } // UpdateEvaluatorRecord mocks base method. -func (m *MockEvaluatorRecordDAO) UpdateEvaluatorRecord(arg0 context.Context, arg1 *model.EvaluatorRecord, arg2 ...db.Option) error { +func (m *MockEvaluatorRecordDAO) UpdateEvaluatorRecord(ctx context.Context, evaluatorRecord *model.EvaluatorRecord, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, evaluatorRecord} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "UpdateEvaluatorRecord", varargs...) @@ -108,8 +114,8 @@ func (m *MockEvaluatorRecordDAO) UpdateEvaluatorRecord(arg0 context.Context, arg } // UpdateEvaluatorRecord indicates an expected call of UpdateEvaluatorRecord. -func (mr *MockEvaluatorRecordDAOMockRecorder) UpdateEvaluatorRecord(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorRecordDAOMockRecorder) UpdateEvaluatorRecord(ctx, evaluatorRecord any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{ctx, evaluatorRecord}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorRecord", reflect.TypeOf((*MockEvaluatorRecordDAO)(nil).UpdateEvaluatorRecord), varargs...) } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go new file mode 100644 index 000000000..1b45a9c6f --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go @@ -0,0 +1,123 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql (interfaces: EvaluatorTagDAO) +// +// Generated by this command: +// +// mockgen -destination mocks/evaluator_tag_mock.go -package=mocks . EvaluatorTagDAO +// + +// Package mocks is a generated GoMock package. +package mocks + +import ( + context "context" + reflect "reflect" + + db "github.com/coze-dev/coze-loop/backend/infra/db" + entity "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + model "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + gomock "go.uber.org/mock/gomock" +) + +// MockEvaluatorTagDAO is a mock of EvaluatorTagDAO interface. +type MockEvaluatorTagDAO struct { + ctrl *gomock.Controller + recorder *MockEvaluatorTagDAOMockRecorder + isgomock struct{} +} + +// MockEvaluatorTagDAOMockRecorder is the mock recorder for MockEvaluatorTagDAO. +type MockEvaluatorTagDAOMockRecorder struct { + mock *MockEvaluatorTagDAO +} + +// NewMockEvaluatorTagDAO creates a new mock instance. +func NewMockEvaluatorTagDAO(ctrl *gomock.Controller) *MockEvaluatorTagDAO { + mock := &MockEvaluatorTagDAO{ctrl: ctrl} + mock.recorder = &MockEvaluatorTagDAOMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockEvaluatorTagDAO) EXPECT() *MockEvaluatorTagDAOMockRecorder { + return m.recorder +} + +// BatchCreateEvaluatorTags mocks base method. +func (m *MockEvaluatorTagDAO) BatchCreateEvaluatorTags(ctx context.Context, sourceID int64, tagType int32, userID string, tags map[string][]string, opts ...db.Option) error { + m.ctrl.T.Helper() + varargs := []any{ctx, sourceID, tagType, userID, tags} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "BatchCreateEvaluatorTags", varargs...) + ret0, _ := ret[0].(error) + return ret0 +} + +// BatchCreateEvaluatorTags indicates an expected call of BatchCreateEvaluatorTags. +func (mr *MockEvaluatorTagDAOMockRecorder) BatchCreateEvaluatorTags(ctx, sourceID, tagType, userID, tags any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, sourceID, tagType, userID, tags}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchCreateEvaluatorTags", reflect.TypeOf((*MockEvaluatorTagDAO)(nil).BatchCreateEvaluatorTags), varargs...) +} + +// BatchGetTagsBySourceIDsAndType mocks base method. +func (m *MockEvaluatorTagDAO) BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, opts ...db.Option) ([]*model.EvaluatorTag, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, sourceIDs, tagType} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "BatchGetTagsBySourceIDsAndType", varargs...) + ret0, _ := ret[0].([]*model.EvaluatorTag) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// BatchGetTagsBySourceIDsAndType indicates an expected call of BatchGetTagsBySourceIDsAndType. +func (mr *MockEvaluatorTagDAOMockRecorder) BatchGetTagsBySourceIDsAndType(ctx, sourceIDs, tagType any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, sourceIDs, tagType}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetTagsBySourceIDsAndType", reflect.TypeOf((*MockEvaluatorTagDAO)(nil).BatchGetTagsBySourceIDsAndType), varargs...) +} + +// DeleteEvaluatorTagsByConditions mocks base method. +func (m *MockEvaluatorTagDAO) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, tags map[string][]string, opts ...db.Option) error { + m.ctrl.T.Helper() + varargs := []any{ctx, sourceID, tagType, tags} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "DeleteEvaluatorTagsByConditions", varargs...) + ret0, _ := ret[0].(error) + return ret0 +} + +// DeleteEvaluatorTagsByConditions indicates an expected call of DeleteEvaluatorTagsByConditions. +func (mr *MockEvaluatorTagDAOMockRecorder) DeleteEvaluatorTagsByConditions(ctx, sourceID, tagType, tags any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, sourceID, tagType, tags}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteEvaluatorTagsByConditions", reflect.TypeOf((*MockEvaluatorTagDAO)(nil).DeleteEvaluatorTagsByConditions), varargs...) +} + +// GetSourceIDsByFilterConditions mocks base method. +func (m *MockEvaluatorTagDAO) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, opts ...db.Option) ([]int64, int64, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, tagType, filterOption, pageSize, pageNum} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "GetSourceIDsByFilterConditions", varargs...) + ret0, _ := ret[0].([]int64) + ret1, _ := ret[1].(int64) + ret2, _ := ret[2].(error) + return ret0, ret1, ret2 +} + +// GetSourceIDsByFilterConditions indicates an expected call of GetSourceIDsByFilterConditions. +func (mr *MockEvaluatorTagDAOMockRecorder) GetSourceIDsByFilterConditions(ctx, tagType, filterOption, pageSize, pageNum any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, tagType, filterOption, pageSize, pageNum}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSourceIDsByFilterConditions", reflect.TypeOf((*MockEvaluatorTagDAO)(nil).GetSourceIDsByFilterConditions), varargs...) +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_template_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_template_mock.go new file mode 100644 index 000000000..fa32a2506 --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_template_mock.go @@ -0,0 +1,143 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql (interfaces: EvaluatorTemplateDAO) +// +// Generated by this command: +// +// mockgen -destination mocks/evaluator_template_mock.go -package=mocks . EvaluatorTemplateDAO +// + +// Package mocks is a generated GoMock package. +package mocks + +import ( + context "context" + reflect "reflect" + + db "github.com/coze-dev/coze-loop/backend/infra/db" + mysql "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql" + model "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + gomock "go.uber.org/mock/gomock" +) + +// MockEvaluatorTemplateDAO is a mock of EvaluatorTemplateDAO interface. +type MockEvaluatorTemplateDAO struct { + ctrl *gomock.Controller + recorder *MockEvaluatorTemplateDAOMockRecorder + isgomock struct{} +} + +// MockEvaluatorTemplateDAOMockRecorder is the mock recorder for MockEvaluatorTemplateDAO. +type MockEvaluatorTemplateDAOMockRecorder struct { + mock *MockEvaluatorTemplateDAO +} + +// NewMockEvaluatorTemplateDAO creates a new mock instance. +func NewMockEvaluatorTemplateDAO(ctrl *gomock.Controller) *MockEvaluatorTemplateDAO { + mock := &MockEvaluatorTemplateDAO{ctrl: ctrl} + mock.recorder = &MockEvaluatorTemplateDAOMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockEvaluatorTemplateDAO) EXPECT() *MockEvaluatorTemplateDAOMockRecorder { + return m.recorder +} + +// CreateEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateDAO) CreateEvaluatorTemplate(ctx context.Context, template *model.EvaluatorTemplate, opts ...db.Option) (*model.EvaluatorTemplate, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, template} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "CreateEvaluatorTemplate", varargs...) + ret0, _ := ret[0].(*model.EvaluatorTemplate) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// CreateEvaluatorTemplate indicates an expected call of CreateEvaluatorTemplate. +func (mr *MockEvaluatorTemplateDAOMockRecorder) CreateEvaluatorTemplate(ctx, template any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, template}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateDAO)(nil).CreateEvaluatorTemplate), varargs...) +} + +// DeleteEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateDAO) DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string, opts ...db.Option) error { + m.ctrl.T.Helper() + varargs := []any{ctx, id, userID} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "DeleteEvaluatorTemplate", varargs...) + ret0, _ := ret[0].(error) + return ret0 +} + +// DeleteEvaluatorTemplate indicates an expected call of DeleteEvaluatorTemplate. +func (mr *MockEvaluatorTemplateDAOMockRecorder) DeleteEvaluatorTemplate(ctx, id, userID any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, id, userID}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateDAO)(nil).DeleteEvaluatorTemplate), varargs...) +} + +// GetEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateDAO) GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool, opts ...db.Option) (*model.EvaluatorTemplate, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, id, includeDeleted} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "GetEvaluatorTemplate", varargs...) + ret0, _ := ret[0].(*model.EvaluatorTemplate) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetEvaluatorTemplate indicates an expected call of GetEvaluatorTemplate. +func (mr *MockEvaluatorTemplateDAOMockRecorder) GetEvaluatorTemplate(ctx, id, includeDeleted any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, id, includeDeleted}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateDAO)(nil).GetEvaluatorTemplate), varargs...) +} + +// ListEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateDAO) ListEvaluatorTemplate(ctx context.Context, req *mysql.ListEvaluatorTemplateRequest, opts ...db.Option) (*mysql.ListEvaluatorTemplateResponse, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, req} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "ListEvaluatorTemplate", varargs...) + ret0, _ := ret[0].(*mysql.ListEvaluatorTemplateResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// ListEvaluatorTemplate indicates an expected call of ListEvaluatorTemplate. +func (mr *MockEvaluatorTemplateDAOMockRecorder) ListEvaluatorTemplate(ctx, req any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, req}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateDAO)(nil).ListEvaluatorTemplate), varargs...) +} + +// UpdateEvaluatorTemplate mocks base method. +func (m *MockEvaluatorTemplateDAO) UpdateEvaluatorTemplate(ctx context.Context, template *model.EvaluatorTemplate, opts ...db.Option) (*model.EvaluatorTemplate, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, template} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "UpdateEvaluatorTemplate", varargs...) + ret0, _ := ret[0].(*model.EvaluatorTemplate) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// UpdateEvaluatorTemplate indicates an expected call of UpdateEvaluatorTemplate. +func (mr *MockEvaluatorTemplateDAOMockRecorder) UpdateEvaluatorTemplate(ctx, template any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, template}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateDAO)(nil).UpdateEvaluatorTemplate), varargs...) +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_version_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_version_mock.go index 2922b3b2f..a0d7965eb 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_version_mock.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_version_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql (interfaces: EvaluatorVersionDAO) +// +// Generated by this command: +// +// mockgen -destination mocks/evaluator_version_mock.go -package=mocks . EvaluatorVersionDAO +// // Package mocks is a generated GoMock package. package mocks @@ -18,6 +23,7 @@ import ( type MockEvaluatorVersionDAO struct { ctrl *gomock.Controller recorder *MockEvaluatorVersionDAOMockRecorder + isgomock struct{} } // MockEvaluatorVersionDAOMockRecorder is the mock recorder for MockEvaluatorVersionDAO. @@ -38,10 +44,10 @@ func (m *MockEvaluatorVersionDAO) EXPECT() *MockEvaluatorVersionDAOMockRecorder } // BatchDeleteEvaluatorVersionByEvaluatorIDs mocks base method. -func (m *MockEvaluatorVersionDAO) BatchDeleteEvaluatorVersionByEvaluatorIDs(arg0 context.Context, arg1 []int64, arg2 string, arg3 ...db.Option) error { +func (m *MockEvaluatorVersionDAO) BatchDeleteEvaluatorVersionByEvaluatorIDs(ctx context.Context, evaluatorIDs []int64, userID string, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, evaluatorIDs, userID} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "BatchDeleteEvaluatorVersionByEvaluatorIDs", varargs...) @@ -50,17 +56,17 @@ func (m *MockEvaluatorVersionDAO) BatchDeleteEvaluatorVersionByEvaluatorIDs(arg0 } // BatchDeleteEvaluatorVersionByEvaluatorIDs indicates an expected call of BatchDeleteEvaluatorVersionByEvaluatorIDs. -func (mr *MockEvaluatorVersionDAOMockRecorder) BatchDeleteEvaluatorVersionByEvaluatorIDs(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorVersionDAOMockRecorder) BatchDeleteEvaluatorVersionByEvaluatorIDs(ctx, evaluatorIDs, userID any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, evaluatorIDs, userID}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchDeleteEvaluatorVersionByEvaluatorIDs", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).BatchDeleteEvaluatorVersionByEvaluatorIDs), varargs...) } // BatchGetEvaluatorDraftByEvaluatorID mocks base method. -func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorDraftByEvaluatorID(arg0 context.Context, arg1 []int64, arg2 bool, arg3 ...db.Option) ([]*model.EvaluatorVersion, error) { +func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorDraftByEvaluatorID(ctx context.Context, evaluatorIDs []int64, includeDeleted bool, opts ...db.Option) ([]*model.EvaluatorVersion, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, evaluatorIDs, includeDeleted} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "BatchGetEvaluatorDraftByEvaluatorID", varargs...) @@ -70,17 +76,17 @@ func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorDraftByEvaluatorID(arg0 conte } // BatchGetEvaluatorDraftByEvaluatorID indicates an expected call of BatchGetEvaluatorDraftByEvaluatorID. -func (mr *MockEvaluatorVersionDAOMockRecorder) BatchGetEvaluatorDraftByEvaluatorID(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorVersionDAOMockRecorder) BatchGetEvaluatorDraftByEvaluatorID(ctx, evaluatorIDs, includeDeleted any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, evaluatorIDs, includeDeleted}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorDraftByEvaluatorID", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).BatchGetEvaluatorDraftByEvaluatorID), varargs...) } // BatchGetEvaluatorVersionByID mocks base method. -func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorVersionByID(arg0 context.Context, arg1 *int64, arg2 []int64, arg3 bool, arg4 ...db.Option) ([]*model.EvaluatorVersion, error) { +func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorVersionByID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool, opts ...db.Option) ([]*model.EvaluatorVersion, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2, arg3} - for _, a := range arg4 { + varargs := []any{ctx, spaceID, ids, includeDeleted} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "BatchGetEvaluatorVersionByID", varargs...) @@ -90,17 +96,17 @@ func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorVersionByID(arg0 context.Cont } // BatchGetEvaluatorVersionByID indicates an expected call of BatchGetEvaluatorVersionByID. -func (mr *MockEvaluatorVersionDAOMockRecorder) BatchGetEvaluatorVersionByID(arg0, arg1, arg2, arg3 interface{}, arg4 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorVersionDAOMockRecorder) BatchGetEvaluatorVersionByID(ctx, spaceID, ids, includeDeleted any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]any{ctx, spaceID, ids, includeDeleted}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorVersionByID", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).BatchGetEvaluatorVersionByID), varargs...) } // BatchGetEvaluatorVersionsByEvaluatorIDs mocks base method. -func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorVersionsByEvaluatorIDs(arg0 context.Context, arg1 []int64, arg2 bool, arg3 ...db.Option) ([]*model.EvaluatorVersion, error) { +func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorVersionsByEvaluatorIDs(ctx context.Context, evaluatorIDs []int64, includeDeleted bool, opts ...db.Option) ([]*model.EvaluatorVersion, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, evaluatorIDs, includeDeleted} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "BatchGetEvaluatorVersionsByEvaluatorIDs", varargs...) @@ -110,17 +116,17 @@ func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorVersionsByEvaluatorIDs(arg0 c } // BatchGetEvaluatorVersionsByEvaluatorIDs indicates an expected call of BatchGetEvaluatorVersionsByEvaluatorIDs. -func (mr *MockEvaluatorVersionDAOMockRecorder) BatchGetEvaluatorVersionsByEvaluatorIDs(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorVersionDAOMockRecorder) BatchGetEvaluatorVersionsByEvaluatorIDs(ctx, evaluatorIDs, includeDeleted any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, evaluatorIDs, includeDeleted}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorVersionsByEvaluatorIDs", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).BatchGetEvaluatorVersionsByEvaluatorIDs), varargs...) } // CheckVersionExist mocks base method. -func (m *MockEvaluatorVersionDAO) CheckVersionExist(arg0 context.Context, arg1 int64, arg2 string, arg3 ...db.Option) (bool, error) { +func (m *MockEvaluatorVersionDAO) CheckVersionExist(ctx context.Context, evaluatorID int64, version string, opts ...db.Option) (bool, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, evaluatorID, version} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "CheckVersionExist", varargs...) @@ -130,17 +136,17 @@ func (m *MockEvaluatorVersionDAO) CheckVersionExist(arg0 context.Context, arg1 i } // CheckVersionExist indicates an expected call of CheckVersionExist. -func (mr *MockEvaluatorVersionDAOMockRecorder) CheckVersionExist(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorVersionDAOMockRecorder) CheckVersionExist(ctx, evaluatorID, version any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, evaluatorID, version}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckVersionExist", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).CheckVersionExist), varargs...) } // CreateEvaluatorVersion mocks base method. -func (m *MockEvaluatorVersionDAO) CreateEvaluatorVersion(arg0 context.Context, arg1 *model.EvaluatorVersion, arg2 ...db.Option) error { +func (m *MockEvaluatorVersionDAO) CreateEvaluatorVersion(ctx context.Context, version *model.EvaluatorVersion, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, version} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "CreateEvaluatorVersion", varargs...) @@ -149,17 +155,17 @@ func (m *MockEvaluatorVersionDAO) CreateEvaluatorVersion(arg0 context.Context, a } // CreateEvaluatorVersion indicates an expected call of CreateEvaluatorVersion. -func (mr *MockEvaluatorVersionDAOMockRecorder) CreateEvaluatorVersion(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorVersionDAOMockRecorder) CreateEvaluatorVersion(ctx, version any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{ctx, version}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateEvaluatorVersion", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).CreateEvaluatorVersion), varargs...) } // DeleteEvaluatorVersion mocks base method. -func (m *MockEvaluatorVersionDAO) DeleteEvaluatorVersion(arg0 context.Context, arg1 int64, arg2 string, arg3 ...db.Option) error { +func (m *MockEvaluatorVersionDAO) DeleteEvaluatorVersion(ctx context.Context, id int64, userID string, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, id, userID} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "DeleteEvaluatorVersion", varargs...) @@ -168,17 +174,17 @@ func (m *MockEvaluatorVersionDAO) DeleteEvaluatorVersion(arg0 context.Context, a } // DeleteEvaluatorVersion indicates an expected call of DeleteEvaluatorVersion. -func (mr *MockEvaluatorVersionDAOMockRecorder) DeleteEvaluatorVersion(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorVersionDAOMockRecorder) DeleteEvaluatorVersion(ctx, id, userID any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, id, userID}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteEvaluatorVersion", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).DeleteEvaluatorVersion), varargs...) } // ListEvaluatorVersion mocks base method. -func (m *MockEvaluatorVersionDAO) ListEvaluatorVersion(arg0 context.Context, arg1 *mysql.ListEvaluatorVersionRequest, arg2 ...db.Option) (*mysql.ListEvaluatorVersionResponse, error) { +func (m *MockEvaluatorVersionDAO) ListEvaluatorVersion(ctx context.Context, req *mysql.ListEvaluatorVersionRequest, opts ...db.Option) (*mysql.ListEvaluatorVersionResponse, error) { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, req} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "ListEvaluatorVersion", varargs...) @@ -188,17 +194,17 @@ func (m *MockEvaluatorVersionDAO) ListEvaluatorVersion(arg0 context.Context, arg } // ListEvaluatorVersion indicates an expected call of ListEvaluatorVersion. -func (mr *MockEvaluatorVersionDAOMockRecorder) ListEvaluatorVersion(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorVersionDAOMockRecorder) ListEvaluatorVersion(ctx, req any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{ctx, req}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluatorVersion", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).ListEvaluatorVersion), varargs...) } // UpdateEvaluatorDraft mocks base method. -func (m *MockEvaluatorVersionDAO) UpdateEvaluatorDraft(arg0 context.Context, arg1 *model.EvaluatorVersion, arg2 ...db.Option) error { +func (m *MockEvaluatorVersionDAO) UpdateEvaluatorDraft(ctx context.Context, version *model.EvaluatorVersion, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []interface{}{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, version} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "UpdateEvaluatorDraft", varargs...) @@ -207,8 +213,8 @@ func (m *MockEvaluatorVersionDAO) UpdateEvaluatorDraft(arg0 context.Context, arg } // UpdateEvaluatorDraft indicates an expected call of UpdateEvaluatorDraft. -func (mr *MockEvaluatorVersionDAOMockRecorder) UpdateEvaluatorDraft(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { +func (mr *MockEvaluatorVersionDAOMockRecorder) UpdateEvaluatorDraft(ctx, version any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]interface{}{arg0, arg1}, arg2...) + varargs := append([]any{ctx, version}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorDraft", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).UpdateEvaluatorDraft), varargs...) } diff --git a/backend/modules/evaluation/pkg/conf/evaluator.go b/backend/modules/evaluation/pkg/conf/evaluator.go index 5c0669fe6..270905a8f 100755 --- a/backend/modules/evaluation/pkg/conf/evaluator.go +++ b/backend/modules/evaluation/pkg/conf/evaluator.go @@ -28,6 +28,12 @@ type IConfiger interface { GetCodeEvaluatorTemplateConf(ctx context.Context) (etf map[string]map[string]*evaluatordto.EvaluatorContent) // 新增方法：专门为Custom类型模板提供配置 GetCustomCodeEvaluatorTemplateConf(ctx context.Context) (etf map[string]map[string]*evaluatordto.EvaluatorContent) + // 新增方法：获取评估器模板管理空间配置 + GetEvaluatorTemplateSpaceConf(ctx context.Context) (spaceIDs []string) + // 新增方法：获取评估器模板管理空间配置 + GetBuiltinEvaluatorSpaceConf(ctx context.Context) (spaceIDs []string) + // 新增方法：获取评估器Tag配置 + GetEvaluatorTagConf(ctx context.Context) (etf map[evaluatordto.EvaluatorTagKey][]string) } func NewEvaluatorConfiger(configFactory conf.IConfigLoaderFactory) IConfiger { @@ -201,6 +207,58 @@ func DefaultCustomCodeEvaluatorTemplateConf() map[string]map[string]*evaluatordt return map[string]map[string]*evaluatordto.EvaluatorContent{} } +func (c *evaluatorConfiger) GetEvaluatorTemplateSpaceConf(ctx context.Context) (spaceIDs []string) { + const key = "evaluator_management_space_config" + + // 定义配置结构体 + type EvaluatorManagementSpaceConf struct { + EvaluatorTemplateSpace []string `json:"evaluator_template_space"` + } + + var config EvaluatorManagementSpaceConf + if c.loader.UnmarshalKey(ctx, key, &config, conf.WithTagName("json")) == nil && len(config.EvaluatorTemplateSpace) > 0 { + return config.EvaluatorTemplateSpace + } + return DefaultEvaluatorTemplateSpaceConf() +} + +func DefaultEvaluatorTemplateSpaceConf() []string { + return make([]string, 0) +} + +func (c *evaluatorConfiger) GetBuiltinEvaluatorSpaceConf(ctx context.Context) (spaceIDs []string) { + const key = "evaluator_management_space_config" + + // 定义配置结构体 + type EvaluatorManagementSpaceConf struct { + BuiltinEvaluatorSpace []string `json:"builtin_evaluator_space"` + } + + var config EvaluatorManagementSpaceConf + if c.loader.UnmarshalKey(ctx, key, &config, conf.WithTagName("json")) == nil && len(config.BuiltinEvaluatorSpace) > 0 { + return config.BuiltinEvaluatorSpace + } + return DefaultBuiltinEvaluatorSpaceConf() +} + +func DefaultBuiltinEvaluatorSpaceConf() []string { + return make([]string, 0) +} + type evaluatorConfiger struct { loader conf.IConfigLoader } + +func (c *evaluatorConfiger) GetEvaluatorTagConf(ctx context.Context) (etf map[evaluatordto.EvaluatorTagKey][]string) { + const key = "evaluator_tag_config" + etf = make(map[evaluatordto.EvaluatorTagKey][]string) + typ := make(map[evaluatordto.EvaluatorTagKey][]string) + if c.loader.UnmarshalKey(ctx, key, &typ, conf.WithTagName("json")) == nil && len(typ) > 0 { + return typ + } + return DefaultEvaluatorTagConf() +} + +func DefaultEvaluatorTagConf() map[evaluatordto.EvaluatorTagKey][]string { + return make(map[evaluatordto.EvaluatorTagKey][]string) +} diff --git a/backend/modules/evaluation/pkg/conf/evaluator_template_space_test.go b/backend/modules/evaluation/pkg/conf/evaluator_template_space_test.go new file mode 100644 index 000000000..3826f2df1 --- /dev/null +++ b/backend/modules/evaluation/pkg/conf/evaluator_template_space_test.go @@ -0,0 +1,70 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package conf + +import ( + "context" + "testing" + + "github.com/stretchr/testify/assert" + "go.uber.org/mock/gomock" + + "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/conf/mocks" +) + +func TestGetEvaluatorTemplateSpaceConf(t *testing.T) { + tests := []struct { + name string + configData map[string]interface{} + expectedResult []string + }{ + { + name: "valid config with space IDs", + configData: map[string]interface{}{ + "evaluator_template_space": map[string]interface{}{ + "evaluator_template_space": []string{"7565071389755228204", "1234567890123456789"}, + }, + }, + expectedResult: []string{"7565071389755228204", "1234567890123456789"}, + }, + { + name: "empty config", + configData: map[string]interface{}{ + "evaluator_template_space": map[string]interface{}{ + "evaluator_template_space": []string{}, + }, + }, + expectedResult: []string{}, + }, + { + name: "missing config", + configData: map[string]interface{}{}, + expectedResult: []string{}, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + // 创建mock configer + ctrl := gomock.NewController(t) + defer ctrl.Finish() + mockConfiger := mocks.NewMockIConfiger(ctrl) + + // 设置mock期望 + mockConfiger.EXPECT().GetEvaluatorTemplateSpaceConf(gomock.Any()).Return(tt.expectedResult) + + // 调用方法 + result := mockConfiger.GetEvaluatorTemplateSpaceConf(context.Background()) + + // 验证结果 + assert.Equal(t, tt.expectedResult, result) + }) + } +} + +func TestDefaultEvaluatorTemplateSpaceConf(t *testing.T) { + result := DefaultEvaluatorTemplateSpaceConf() + assert.NotNil(t, result) + assert.Equal(t, 0, len(result)) +} diff --git a/backend/modules/evaluation/pkg/conf/mocks/evaluator_configer.go b/backend/modules/evaluation/pkg/conf/mocks/evaluator_configer.go index 383826937..e13f3ea79 100644 --- a/backend/modules/evaluation/pkg/conf/mocks/evaluator_configer.go +++ b/backend/modules/evaluation/pkg/conf/mocks/evaluator_configer.go @@ -112,6 +112,20 @@ func (mr *MockIConfigerMockRecorder) GetEvaluatorTemplateConf(ctx any) *gomock.C return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorTemplateConf", reflect.TypeOf((*MockIConfiger)(nil).GetEvaluatorTemplateConf), ctx) } +// GetEvaluatorTemplateSpaceConf mocks base method. +func (m *MockIConfiger) GetEvaluatorTemplateSpaceConf(ctx context.Context) []string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetEvaluatorTemplateSpaceConf", ctx) + ret0, _ := ret[0].([]string) + return ret0 +} + +// GetEvaluatorTemplateSpaceConf indicates an expected call of GetEvaluatorTemplateSpaceConf. +func (mr *MockIConfigerMockRecorder) GetEvaluatorTemplateSpaceConf(ctx any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorTemplateSpaceConf", reflect.TypeOf((*MockIConfiger)(nil).GetEvaluatorTemplateSpaceConf), ctx) +} + // GetEvaluatorToolConf mocks base method. func (m *MockIConfiger) GetEvaluatorToolConf(ctx context.Context) map[string]*evaluator.Tool { m.ctrl.T.Helper() diff --git a/backend/script/gorm_gen/generate.go b/backend/script/gorm_gen/generate.go index 4f2738273..e570ec9ad 100644 --- a/backend/script/gorm_gen/generate.go +++ b/backend/script/gorm_gen/generate.go @@ -14,13 +14,13 @@ import ( func main() { db := initDB() - generateForPrompt(db) - generateForData(db) - generateForEvaluationTarget(db) + //generateForPrompt(db) + //generateForData(db) + //generateForEvaluationTarget(db) generateForEvaluationEvaluator(db) - generateForEvaluationExpt(db) - generateForObservability(db) - generateForFoundation(db) + //generateForEvaluationExpt(db) + //generateForObservability(db) + //generateForFoundation(db) } func initDB() *gorm.DB { @@ -236,10 +236,10 @@ func generateForEvaluationEvaluator(db *gorm.DB) { g.UseDB(db) evaluatorModel := g.GenerateModelAs("evaluator", "Evaluator") - evaluatorVersionModel := g.GenerateModelAs("evaluator_version", "EvaluatorVersion") - evaluatorRecordModel := g.GenerateModelAs("evaluator_record", "EvaluatorRecord") + evaluatorTagModel := g.GenerateModelAs("evaluator_tag", "EvaluatorTag") + evaluatorRecordModel := g.GenerateModelAs("evaluator_template", "EvaluatorTemplate") - g.ApplyBasic(evaluatorModel, evaluatorVersionModel, evaluatorRecordModel) + g.ApplyBasic(evaluatorModel, evaluatorTagModel, evaluatorRecordModel) g.Execute() } diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift index e788933ab..6a3deb230 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift @@ -11,6 +11,9 @@ struct ListEvaluatorsRequest { 4: optional list evaluator_type (api.body='evaluator_type') 5: optional bool with_version (api.body='with_version') + 11: optional bool builtin (api.body='builtin') // 是否查询预置评估器 + 12: optional evaluator.EvaluatorFilterOption filter_option (api.body='filter_option', go.tag='json:"filter_option"') // 筛选器选项 + 101: optional i32 page_size (api.body='page_size', vt.gt='0') 102: optional i32 page_number (api.body='page_number', vt.gt='0') 103: optional list order_bys (api.body='order_bys') @@ -70,6 +73,8 @@ struct UpdateEvaluatorDraftRequest { 2: required i64 workspace_id (api.body='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') // 空间 id 3: required evaluator.EvaluatorContent evaluator_content (api.body='evaluator_content', go.tag='json:"evaluator_content"') 4: required evaluator.EvaluatorType evaluator_type (api.body='evaluator_type', go.tag='json:"evaluator_type"') + 5: optional map> tags (api.body='tags', go.tag = 'json:"tags"') + 6: optional bool builtin (api.body='builtin', go.tag = 'json:"builtin"') // 是否预置评估器 255: optional base.Base Base } @@ -87,6 +92,10 @@ struct UpdateEvaluatorRequest { 4: optional string name (api.body='name', go.tag='json:"name"') // 展示用名称 5: optional string description (api.body='description', go.tag='json:"description"') // 描述 + 11: optional bool builtin (api.body='builtin', go.tag = 'json:"builtin"') // 是否预置评估器 + 12: optional string benchmark (api.body='benchmark', go.tag = 'json:"benchmark"') + 13: optional string vendor (api.body='vendor', go.tag = 'json:"vendor"') + 255: optional base.Base Base } @@ -129,6 +138,7 @@ struct GetEvaluatorVersionRequest { 1: required i64 workspace_id (api.query='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') 2: required i64 evaluator_version_id (api.path='evaluator_version_id', api.js_conv='true', go.tag='json:"evaluator_version_id"') 3: optional bool include_deleted (api.query='include_deleted') // 是否查询已删除的评估器，默认不查询 + 4: optional bool builtin (api.body='builtin', go.tag = 'json:"builtin"') // 是否预置评估器 255: optional base.Base Base } @@ -353,6 +363,113 @@ struct ValidateEvaluatorResponse { 255: base.BaseResp BaseResp } +struct ListTemplatesV2Request { + 1: optional evaluator.EvaluatorFilterOption filter_option (api.body='filter_option', go.tag='json:"filter_option"') // 筛选器选项 +} + +struct ListTemplatesV2Response { + 1: optional list evaluator_templates (api.body='evaluator_templates') + + 255: base.BaseResp BaseResp +} + +struct GetTemplateInfoV2Request { + 1: required i64 evaluator_template_id (api.body='evaluator_template_id', api.js_conv='true', go.tag='json:"evaluator_template_id"') + + 255: optional base.Base Base +} + +struct GetTemplateInfoV2Response { + 1: optional evaluator.EvaluatorTemplate evaluator_template (api.body='evaluator_template') + + 255: base.BaseResp BaseResp +} + +struct GetLatestEvaluatorVersionRequest { + 1: required i64 evaluator_id (api.path='evaluator_id', api.js_conv='true', go.tag='json:"evaluator_id"') + 2: optional i64 workspace_id (api.query='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') + 3: optional bool builtin (api.query='builtin') // 是否预置评估器 + + 255: optional base.Base Base +} + +struct GetLatestEvaluatorVersionResponse { + 1: required evaluator.EvaluatorVersion version (api.body='version') + + 255: base.BaseResp BaseResp +} + +struct DebugBuiltinEvaluatorRequest { + 1: required i64 evaluator_id (api.body='evaluator_id', api.js_conv='true', go.tag='json:"evaluator_id"') + 2: required evaluator.EvaluatorInputData input_data (api.body='input_data') + + 255: optional base.Base Base +} + +struct DebugBuiltinEvaluatorResponse { + 1: required evaluator.EvaluatorOutputData output_data (api.body='output_data') + + 255: base.BaseResp BaseResp +} + +struct PublishBuiltinEvaluatorRequest { + 1: required i64 evaluator_id (api.path='evaluator_id', api.js_conv='true', go.tag='json:"evaluator_id"') + 2: required string version (api.body='version') + 3: optional i64 workspace_id (api.body='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') + 4: optional evaluator.OperationType operation_type (api.body='operation_type', go.tag='json:"operation_type"') // 上下架操作类型 + + 255: optional base.Base Base +} + +struct PublishBuiltinEvaluatorResponse { + 1: required evaluator.EvaluatorVersion version (api.body='version') + + 255: base.BaseResp BaseResp +} + +struct CreateEvaluatorTemplateRequest { + 1: required evaluator.EvaluatorTemplate evaluator_template (api.body='evaluator_template') + 255: optional base.Base Base +} + +struct CreateEvaluatorTemplateResponse { + 1: required evaluator.EvaluatorTemplate evaluator_template (api.body='evaluator_template') + + 255: base.BaseResp BaseResp +} + +struct UpdateEvaluatorTemplateRequest { + 1: required evaluator.EvaluatorTemplate evaluator_template (api.body='evaluator_template') + 255: optional base.Base Base +} + +struct UpdateEvaluatorTemplateResponse { + 1: required evaluator.EvaluatorTemplate evaluator_template (api.body='evaluator_template') + + 255: base.BaseResp BaseResp +} + +struct DeleteEvaluatorTemplateRequest { + 1: required i64 evaluator_template_id (api.body='evaluator_template_id', api.js_conv='true', go.tag='json:"evaluator_template_id"') + 255: optional base.Base Base +} + +struct DeleteEvaluatorTemplateResponse { + 255: base.BaseResp BaseResp +} + +struct ListEvaluatorTagsRequest { + + 255: optional base.Base Base +} + +struct ListEvaluatorTagsResponse { + 1: optional map> tags (api.body='tags') // 筛选器选项 + + 255: base.BaseResp BaseResp +} + + service EvaluatorService { // 评估器 ListEvaluatorsResponse ListEvaluators(1: ListEvaluatorsRequest request) (api.post= "/api/evaluation/v1/evaluators/list") // 按查询条件查询evaluator @@ -388,4 +505,22 @@ service EvaluatorService { // 评估器验证 ValidateEvaluatorResponse ValidateEvaluator(1: ValidateEvaluatorRequest request) (api.post="/api/evaluation/v1/evaluators/validate") + // 查询评估器模板 + ListTemplatesV2Response ListTemplatesV2(1: ListTemplatesV2Request request) (api.post="/api/evaluation/v1/evaluators/list_template_v2") + + // 创建评估器模板 + CreateEvaluatorTemplateResponse CreateEvaluatorTemplate(1: CreateEvaluatorTemplateRequest request) (api.post="/api/evaluation/v1/evaluators/create_template") + // 更新评估器模板 + UpdateEvaluatorTemplateResponse UpdateEvaluatorTemplate(1: UpdateEvaluatorTemplateRequest request) (api.post="/api/evaluation/v1/evaluators/update_template") + // 删除 + DeleteEvaluatorTemplateResponse DeleteEvaluatorTemplate(1: DeleteEvaluatorTemplateRequest request) (api.post="/api/evaluation/v1/evaluators/delete_template") + + // 调试预置评估器 + DebugBuiltinEvaluatorResponse DebugBuiltinEvaluator(1: DebugBuiltinEvaluatorRequest req) (api.post="/api/evaluation/v1/evaluators/debug_builtin")// 调试预置评估器 + + // 发布预置评估器 + PublishBuiltinEvaluatorResponse PublishBuiltinEvaluator(1: PublishBuiltinEvaluatorRequest req) (api.post="/api/evaluation/v1/evaluators/publish_builtin")// 发布预置评估器 + // 查询Tag + ListEvaluatorTagsResponse ListEvaluatorTags(1: ListEvaluatorTagsRequest req) (api.post="/api/evaluation/v1/evaluators/list_tags") + } (api.js_conv="true" ) \ No newline at end of file diff --git a/idl/thrift/coze/loop/evaluation/domain/common.thrift b/idl/thrift/coze/loop/evaluation/domain/common.thrift index 65cde83ea..72ee4a53d 100644 --- a/idl/thrift/coze/loop/evaluation/domain/common.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/common.thrift @@ -60,6 +60,7 @@ struct ArgsSchema { 2: optional list support_content_types (go.tag='mapstructure:"support_content_types"'), // 序列化后的jsonSchema字符串，例如："{\"type\": \"object\", \"properties\": {\"name\": {\"type\": \"string\"}, \"age\": {\"type\": \"integer\"}, \"isStudent\": {\"type\": \"boolean\"}}, \"required\": [\"name\", \"age\", \"isStudent\"]}" 3: optional string json_schema (go.tag='mapstructure:"json_schema"'), + 4: optional Content default_value (go.tag='mapstructure:"default_value"'), } struct UserInfo { diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index 6c3c0f1e9..4baa4ff4d 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -35,48 +35,19 @@ enum EvaluatorRunStatus { // 运行状态, 异步下状态流转, 同步下只 Fail = 2 } -// 类型筛选枚举 - 针对外部用户的分类 -enum EvaluatorCategory { - LLM = 1 - Code = 2 -} - -// 黑白盒枚举 -enum EvaluatorBoxType { - BlackBox = 1 // 黑盒：不关注内部实现，只看输入输出 - WhiteBox = 2 // 白盒：可访问内部状态和实现细节 -} - -// 评估对象枚举 -enum EvaluationTargetType { - Text = 1 - Image = 2 - Video = 3 - Audio = 4 - Code = 5 - Multimodal = 6 - Agent = 7 -} - -// 评估目标枚举 -enum EvaluationObjectiveType { - TaskCompletion = 1 - ContentQuality = 2 - InteractionExperience = 3 - ToolInvocation = 4 - TrajectoryQuality = 5 - KnowledgeManagementAndMemory = 6 - FormatValidation = 7 -} - -// 业务场景枚举 -enum BusinessScenarioType { - SecurityRiskControl = 1 - AICoding = 2 - CustomerServiceAssistant = 3 - AgentGeneralEvaluation = 4 - AIGC = 5 -} +// Evaluator筛选字段 +typedef string EvaluatorTagKey(ts.enum="true") +const EvaluatorTagKey EvaluatorTagKey_Category = "Category" // 类型筛选 (LLM/Code) +const EvaluatorTagKey EvaluatorTagKey_TargetType = "TargetType" // 评估对象 (文本/图片/视频等) +const EvaluatorTagKey EvaluatorTagKey_Objective = "Objective" // 评估目标 (任务完成/内容质量等) +const EvaluatorTagKey EvaluatorTagKey_BusinessScenario = "BusinessScenario" // 业务场景 (安全风控/AI Coding等) +const EvaluatorTagKey EvaluatorTagKey_BoxType = "BoxType" // 黑白盒类型 +const EvaluatorTagKey EvaluatorTagKey_Name = "Name" // 评估器名称 + +// 上下架操作类型枚举 +typedef string OperationType(ts.enum="true") +const OperationType OperationType_Publish = "Publish" // 上架 +const OperationType OperationType_Retreat = "Retreat" // 下架 struct Tool { 1: ToolType type (go.tag ='mapstructure:"type"') @@ -93,7 +64,7 @@ struct PromptEvaluator { 1: list message_list (go.tag = 'mapstructure:\"message_list\"') 2: optional common.ModelConfig model_config (go.tag ='mapstructure:"model_config"') 3: optional PromptSourceType prompt_source_type (go.tag ='mapstructure:"prompt_source_type"') - 4: optional string prompt_template_key (go.tag ='mapstructure:"prompt_template_key"') + 4: optional string prompt_template_key (go.tag ='mapstructure:"prompt_template_key"') // 最新版本中存evaluator_template_id 5: optional string prompt_template_name (go.tag ='mapstructure:"prompt_template_name"') 6: optional list tools (go.tag ='mapstructure:"tools"') } @@ -101,7 +72,7 @@ struct PromptEvaluator { struct CodeEvaluator { 1: optional LanguageType language_type 2: optional string code_content - 3: optional string code_template_key // code类型评估器模板中code_template_key + language_type是唯一键 + 3: optional string code_template_key // code类型评估器模板中code_template_key + language_type是唯一键；最新版本中存evaluator_template_id 4: optional string code_template_name } @@ -133,17 +104,65 @@ struct Evaluator { 7: optional common.BaseInfo base_info 11: optional EvaluatorVersion current_version 12: optional string latest_version - - // Tag筛选相关字段 - 21: optional EvaluatorCategory category (go.tag = 'json:"category"') // 类型筛选 - 针对外部用户 - 22: optional list target_types (go.tag = 'json:"target_types"') // 评估对象 - 23: optional list objective_types (go.tag = 'json:"objective_types"') // 评估目标 - 24: optional list business_scenarios (go.tag = 'json:"business_scenarios"') // 业务场景 - 25: optional EvaluatorBoxType box_type (go.tag = 'json:"box_type"') // 黑白盒类型 - 26: optional string benchmark (go.tag = 'json:"benchmark"') - 27: optional string vendor (go.tag = 'json:"vendor"') + + 20: optional bool builtin (go.tag = 'json:"builtin"') + 21: optional string benchmark (go.tag = 'json:"benchmark"') + 22: optional string vendor (go.tag = 'json:"vendor"') + 23: map> tags (go.tag = 'json:"tags"') } +struct EvaluatorTemplate { + 1: optional i64 id (api.js_conv = 'true', go.tag = 'json:"id"') + 2: optional i64 workspace_id (api.js_conv = 'true', go.tag = 'json:"workspace_id"') + 3: optional EvaluatorType evaluator_type + 4: optional string name + 5: optional string description + 6: optional i64 popularity (go.tag = 'json:"popularity"') // 热度 + 7: optional string benchmark (go.tag = 'json:"benchmark"') + 8: optional string vendor (go.tag = 'json:"vendor"') + 9: map> tags (go.tag = 'json:"tags"') + + 101: optional EvaluatorContent evaluator_content + 255: optional common.BaseInfo base_info + +} + +// Evaluator筛选器选项 +struct EvaluatorFilterOption { + 1: optional string search_keyword // 模糊搜索关键词，在所有tag中搜索 + 2: optional EvaluatorFilters filters // 筛选条件 +} + +// Evaluator筛选条件 +struct EvaluatorFilters { + 1: optional list filter_conditions // 筛选条件列表 + 2: optional FilterLogicOp logic_op // 逻辑操作符 +} + +// 筛选逻辑操作符 +typedef string FilterLogicOp(ts.enum="true") +const FilterLogicOp FilterLogicOp_Unknown = "Unknown" +const FilterLogicOp FilterLogicOp_And = "And" // 与操作 +const FilterLogicOp FilterLogicOp_Or = "Or" // 或操作 + +// Evaluator筛选条件 +struct EvaluatorFilterCondition { + 1: required EvaluatorTagKey tag_key // 筛选字段 + 2: required EvaluatorFilterOperatorType operator // 操作符 + 3: required string value // 操作值 +} + +// Evaluator筛选操作符 +typedef string EvaluatorFilterOperatorType(ts.enum="true") +const EvaluatorFilterOperatorType EvaluatorFilterOperatorType_Unknown = "Unknown" +const EvaluatorFilterOperatorType EvaluatorFilterOperatorType_Equal = "Equal" // 等于 +const EvaluatorFilterOperatorType EvaluatorFilterOperatorType_NotEqual = "NotEqual" // 不等于 +const EvaluatorFilterOperatorType EvaluatorFilterOperatorType_In = "In" // 包含于 +const EvaluatorFilterOperatorType EvaluatorFilterOperatorType_NotIn = "NotIn" // 不包含于 +const EvaluatorFilterOperatorType EvaluatorFilterOperatorType_Like = "Like" // 模糊匹配 +const EvaluatorFilterOperatorType EvaluatorFilterOperatorType_IsNull = "IsNull" // 为空 +const EvaluatorFilterOperatorType EvaluatorFilterOperatorType_IsNotNull = "IsNotNull" // 非空 + struct Correction { 1: optional double score 2: optional string explain @@ -198,4 +217,4 @@ struct EvaluatorInputData { 4: optional map evaluate_target_output_fields 100: optional map ext -} \ No newline at end of file +} diff --git a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql index 2870dbb64..72ab1d81f 100644 --- a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql +++ b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql @@ -12,6 +12,9 @@ CREATE TABLE IF NOT EXISTS `evaluator` `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', `deleted_at` timestamp NULL DEFAULT NULL COMMENT '删除时间', `latest_version` varchar(128) NOT NULL DEFAULT '' COMMENT '最新版本号', + `benchmark` varchar(255) DEFAULT NULL COMMENT 'benchmark', + `vendor` varchar(255) DEFAULT NULL COMMENT 'vendor', + `builtin` int unsigned NOT NULL DEFAULT '2' COMMENT '是否预置，1:是；2:否', PRIMARY KEY (`id`), KEY `idx_space_id_evaluator_type` (`space_id`, `evaluator_type`), KEY `idx_space_id_created_by` (`space_id`, `created_by`), diff --git a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_tag.sql b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_tag.sql new file mode 100644 index 000000000..17d8db067 --- /dev/null +++ b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_tag.sql @@ -0,0 +1,15 @@ +CREATE TABLE `evaluator_tag` ( + `id` bigint unsigned NOT NULL COMMENT 'idgen id', + `source_id` bigint unsigned NOT NULL COMMENT '资源id', + `tag_type` int unsigned NOT NULL COMMENT 'tag类型，1:评估器；2:模板', + `tag_key` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT 'tag键', + `tag_value` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT 'tag值', + `created_by` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '创建人', + `updated_by` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '更新人', + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted_at` timestamp NULL DEFAULT NULL COMMENT '删除时间', + PRIMARY KEY (`id`), + KEY `idx_source_id` (`source_id`), + KEY `idx_tag_type_tag_key_tag_value` (`tag_type`,`tag_key`,`tag_value`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='NDB_SHARE_TABLE;评估器tag'; \ No newline at end of file diff --git a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_template.sql b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_template.sql new file mode 100644 index 000000000..158d90d50 --- /dev/null +++ b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_template.sql @@ -0,0 +1,20 @@ +CREATE TABLE `evaluator_template` ( + `id` bigint unsigned NOT NULL COMMENT 'idgen id', + `space_id` bigint unsigned DEFAULT NULL COMMENT '空间id', + `evaluator_type` int unsigned DEFAULT NULL COMMENT '评估器类型', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '名称', + `description` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '版本描述', + `metainfo` blob COMMENT '具体内容, 每种静态规则类型对应一个解析方式, json', + `receive_chat_history` tinyint(1) DEFAULT '0' COMMENT '是否需求传递上下文', + `input_schema` blob COMMENT '评估器结构信息, json', + `output_schema` blob COMMENT '评估器结构信息, json', + `created_by` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '创建人', + `updated_by` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '更新人', + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted_at` timestamp NULL DEFAULT NULL COMMENT '删除时间', + `popularity` bigint unsigned NOT NULL DEFAULT '0' COMMENT '热度', + `benchmark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'benchmark', + `vendor` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'vendor', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='NDB_SHARE_TABLE;评估器模板' \ No newline at end of file diff --git a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_version.sql b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_version.sql index 390a8a0fc..80c88d188 100644 --- a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_version.sql +++ b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_version.sql @@ -14,6 +14,7 @@ CREATE TABLE IF NOT EXISTS `evaluator_version` `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', `deleted_at` timestamp NULL DEFAULT NULL COMMENT '删除时间', + `output_schema` blob COMMENT '评估器输出schema, json', PRIMARY KEY (`id`), KEY `idx_evaluator_id_version` (`evaluator_id`, `version`) ) ENGINE = InnoDB From 03ca66ea1c88ef0139b41527ba1d47659c1e543d Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 28 Oct 2025 19:24:08 +0800 Subject: [PATCH 03/42] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coze/loop/apis/evaluator_service.go | 16 + .../router/coze/loop/apis/coze.loop.apis.go | 2 +- .../api/router/coze/loop/apis/middleware.go | 5 + .../coze/loop/apis/evaluatorservice/client.go | 6 +- .../apis/evaluatorservice/evaluatorservice.go | 32 +- .../evaluation/domain/evaluator/evaluator.go | 7 +- .../coze.loop.evaluation.evaluator.go | 597 +++++++----------- ...oze.loop.evaluation.evaluator_validator.go | 4 +- .../evaluator/evaluatorservice/client.go | 6 +- .../evaluatorservice/evaluatorservice.go | 32 +- .../k-coze.loop.evaluation.evaluator.go | 404 +++++------- .../evaluation/evaluatorservice/client.go | 6 +- .../evaluatorservice/evaluatorservice.go | 32 +- .../loevaluator/local_evaluatorservice.go | 18 +- .../evaluation/application/evaluator_app.go | 64 +- .../evaluation/domain/repo/evaluator.go | 9 +- .../evaluation/domain/service/evaluator.go | 14 +- .../domain/service/evaluator_impl.go | 38 +- .../infra/repo/evaluator/evaluator_impl.go | 324 ++++------ .../coze.loop.evaluation.evaluator.thrift | 12 +- .../loop/evaluation/domain/evaluator.thrift | 6 +- 21 files changed, 656 insertions(+), 978 deletions(-) diff --git a/backend/api/handler/coze/loop/apis/evaluator_service.go b/backend/api/handler/coze/loop/apis/evaluator_service.go index 4346e3d6c..607d7099f 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service.go @@ -298,3 +298,19 @@ func ListEvaluatorTags(ctx context.Context, c *app.RequestContext) { c.JSON(consts.StatusOK, resp) } + +// UpdateBuiltinEvaluatorTags . +// @router /api/evaluation/v1/evaluators/update_builtin [POST] +func UpdateBuiltinEvaluatorTags(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.UpdateBuiltinEvaluatorTagsRequest + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.UpdateBuiltinEvaluatorTagsResponse) + + c.JSON(consts.StatusOK, resp) +} diff --git a/backend/api/router/coze/loop/apis/coze.loop.apis.go b/backend/api/router/coze/loop/apis/coze.loop.apis.go index 84754c0ad..5d38f53d5 100644 --- a/backend/api/router/coze/loop/apis/coze.loop.apis.go +++ b/backend/api/router/coze/loop/apis/coze.loop.apis.go @@ -163,7 +163,7 @@ func Register(r *server.Hertz, handler *apis.APIHandler) { _evaluators.POST("/list_tags", append(_listevaluatortagsMw(handler), apis.ListEvaluatorTags)...) _evaluators.POST("/list_template", append(_listtemplatesMw(handler), apis.ListTemplates)...) _evaluators.POST("/list_template_v2", append(_listtemplatesv2Mw(handler), apis.ListTemplatesV2)...) - _evaluators.POST("/publish_builtin", append(_publishbuiltinevaluatorMw(handler), apis.PublishBuiltinEvaluator)...) + _evaluators.POST("/update_builtin_tags", append(_updatebuiltinevaluatortagsMw(handler), apis.UpdateBuiltinEvaluatorTags)...) _evaluators.POST("/update_template", append(_updateevaluatortemplateMw(handler), apis.UpdateEvaluatorTemplate)...) _evaluators.POST("/validate", append(_validateevaluatorMw(handler), apis.ValidateEvaluator)...) { diff --git a/backend/api/router/coze/loop/apis/middleware.go b/backend/api/router/coze/loop/apis/middleware.go index 4d95073ff..90fa18471 100644 --- a/backend/api/router/coze/loop/apis/middleware.go +++ b/backend/api/router/coze/loop/apis/middleware.go @@ -1468,3 +1468,8 @@ func _listevaluatortagsMw(handler *apis.APIHandler) []app.HandlerFunc { // your code... return nil } + +func _updatebuiltinevaluatortagsMw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} diff --git a/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go b/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go index 61edcc981..671f74cb9 100644 --- a/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go +++ b/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go @@ -38,7 +38,7 @@ type Client interface { UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) - PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) + UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.UpdateBuiltinEvaluatorTagsResponse, err error) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) } @@ -206,9 +206,9 @@ func (p *kEvaluatorServiceClient) DebugBuiltinEvaluator(ctx context.Context, req return p.kClient.DebugBuiltinEvaluator(ctx, req) } -func (p *kEvaluatorServiceClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { +func (p *kEvaluatorServiceClient) UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.UpdateBuiltinEvaluatorTagsResponse, err error) { ctx = client.NewCtxWithCallOptions(ctx, callOptions) - return p.kClient.PublishBuiltinEvaluator(ctx, req) + return p.kClient.UpdateBuiltinEvaluatorTags(ctx, req) } func (p *kEvaluatorServiceClient) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) { diff --git a/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go b/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go index 3df6130cb..29cf41706 100644 --- a/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go +++ b/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go @@ -203,10 +203,10 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), - "PublishBuiltinEvaluator": kitex.NewMethodInfo( - publishBuiltinEvaluatorHandler, - newEvaluatorServicePublishBuiltinEvaluatorArgs, - newEvaluatorServicePublishBuiltinEvaluatorResult, + "UpdateBuiltinEvaluatorTags": kitex.NewMethodInfo( + updateBuiltinEvaluatorTagsHandler, + newEvaluatorServiceUpdateBuiltinEvaluatorTagsArgs, + newEvaluatorServiceUpdateBuiltinEvaluatorTagsResult, false, kitex.WithStreamingMode(kitex.StreamingNone), ), @@ -763,10 +763,10 @@ func newEvaluatorServiceDebugBuiltinEvaluatorResult() interface{} { return evaluator.NewEvaluatorServiceDebugBuiltinEvaluatorResult() } -func publishBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { - realArg := arg.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs) - realResult := result.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorResult) - success, err := handler.(evaluator.EvaluatorService).PublishBuiltinEvaluator(ctx, realArg.Req) +func updateBuiltinEvaluatorTagsHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) + realResult := result.(*evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) + success, err := handler.(evaluator.EvaluatorService).UpdateBuiltinEvaluatorTags(ctx, realArg.Req) if err != nil { return err } @@ -774,12 +774,12 @@ func publishBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, ar return nil } -func newEvaluatorServicePublishBuiltinEvaluatorArgs() interface{} { - return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorArgs() +func newEvaluatorServiceUpdateBuiltinEvaluatorTagsArgs() interface{} { + return evaluator.NewEvaluatorServiceUpdateBuiltinEvaluatorTagsArgs() } -func newEvaluatorServicePublishBuiltinEvaluatorResult() interface{} { - return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorResult() +func newEvaluatorServiceUpdateBuiltinEvaluatorTagsResult() interface{} { + return evaluator.NewEvaluatorServiceUpdateBuiltinEvaluatorTagsResult() } func listEvaluatorTagsHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { @@ -1083,11 +1083,11 @@ func (p *kClient) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.Debu return _result.GetSuccess(), nil } -func (p *kClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { - var _args evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs +func (p *kClient) UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest) (r *evaluator.UpdateBuiltinEvaluatorTagsResponse, err error) { + var _args evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs _args.Req = req - var _result evaluator.EvaluatorServicePublishBuiltinEvaluatorResult - if err = p.c.Call(ctx, "PublishBuiltinEvaluator", &_args, &_result); err != nil { + var _result evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsResult + if err = p.c.Call(ctx, "UpdateBuiltinEvaluatorTags", &_args, &_result); err != nil { return } return _result.GetSuccess(), nil diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go index 01d0bff14..f9946abc5 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go @@ -28,9 +28,7 @@ const ( EvaluatorTagKeyName = "Name" - OperationTypePublish = "Publish" - - OperationTypeRetreat = "Retreat" + EvaluatorTagKeyVisible = "Visible" FilterLogicOpUnknown = "Unknown" @@ -287,9 +285,6 @@ type LanguageType = string // Evaluator筛选字段 type EvaluatorTagKey = string -// 上下架操作类型枚举 -type OperationType = string - // 筛选逻辑操作符 type FilterLogicOp = string diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go index 05b6a3194..60bf88172 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go @@ -3251,13 +3251,10 @@ type UpdateEvaluatorDraftRequest struct { // 评估器 id EvaluatorID int64 `thrift:"evaluator_id,1,required" frugal:"1,required,i64" json:"evaluator_id" path:"evaluator_id,required" ` // 空间 id - WorkspaceID int64 `thrift:"workspace_id,2,required" frugal:"2,required,i64" json:"workspace_id" form:"workspace_id,required" ` - EvaluatorContent *evaluator.EvaluatorContent `thrift:"evaluator_content,3,required" frugal:"3,required,evaluator.EvaluatorContent" json:"evaluator_content" form:"evaluator_content,required" ` - EvaluatorType evaluator.EvaluatorType `thrift:"evaluator_type,4,required" frugal:"4,required,EvaluatorType" json:"evaluator_type" form:"evaluator_type,required" ` - Tags map[evaluator.EvaluatorTagKey][]string `thrift:"tags,5,optional" frugal:"5,optional,map>" json:"tags" form:"tags" ` - // 是否预置评估器 - Builtin *bool `thrift:"builtin,6,optional" frugal:"6,optional,bool" json:"builtin" form:"builtin" ` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + WorkspaceID int64 `thrift:"workspace_id,2,required" frugal:"2,required,i64" json:"workspace_id" form:"workspace_id,required" ` + EvaluatorContent *evaluator.EvaluatorContent `thrift:"evaluator_content,3,required" frugal:"3,required,evaluator.EvaluatorContent" json:"evaluator_content" form:"evaluator_content,required" ` + EvaluatorType evaluator.EvaluatorType `thrift:"evaluator_type,4,required" frugal:"4,required,EvaluatorType" json:"evaluator_type" form:"evaluator_type,required" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewUpdateEvaluatorDraftRequest() *UpdateEvaluatorDraftRequest { @@ -3300,30 +3297,6 @@ func (p *UpdateEvaluatorDraftRequest) GetEvaluatorType() (v evaluator.EvaluatorT return } -var UpdateEvaluatorDraftRequest_Tags_DEFAULT map[evaluator.EvaluatorTagKey][]string - -func (p *UpdateEvaluatorDraftRequest) GetTags() (v map[evaluator.EvaluatorTagKey][]string) { - if p == nil { - return - } - if !p.IsSetTags() { - return UpdateEvaluatorDraftRequest_Tags_DEFAULT - } - return p.Tags -} - -var UpdateEvaluatorDraftRequest_Builtin_DEFAULT bool - -func (p *UpdateEvaluatorDraftRequest) GetBuiltin() (v bool) { - if p == nil { - return - } - if !p.IsSetBuiltin() { - return UpdateEvaluatorDraftRequest_Builtin_DEFAULT - } - return *p.Builtin -} - var UpdateEvaluatorDraftRequest_Base_DEFAULT *base.Base func (p *UpdateEvaluatorDraftRequest) GetBase() (v *base.Base) { @@ -3347,12 +3320,6 @@ func (p *UpdateEvaluatorDraftRequest) SetEvaluatorContent(val *evaluator.Evaluat func (p *UpdateEvaluatorDraftRequest) SetEvaluatorType(val evaluator.EvaluatorType) { p.EvaluatorType = val } -func (p *UpdateEvaluatorDraftRequest) SetTags(val map[evaluator.EvaluatorTagKey][]string) { - p.Tags = val -} -func (p *UpdateEvaluatorDraftRequest) SetBuiltin(val *bool) { - p.Builtin = val -} func (p *UpdateEvaluatorDraftRequest) SetBase(val *base.Base) { p.Base = val } @@ -3362,8 +3329,6 @@ var fieldIDToName_UpdateEvaluatorDraftRequest = map[int16]string{ 2: "workspace_id", 3: "evaluator_content", 4: "evaluator_type", - 5: "tags", - 6: "builtin", 255: "Base", } @@ -3371,14 +3336,6 @@ func (p *UpdateEvaluatorDraftRequest) IsSetEvaluatorContent() bool { return p.EvaluatorContent != nil } -func (p *UpdateEvaluatorDraftRequest) IsSetTags() bool { - return p.Tags != nil -} - -func (p *UpdateEvaluatorDraftRequest) IsSetBuiltin() bool { - return p.Builtin != nil -} - func (p *UpdateEvaluatorDraftRequest) IsSetBase() bool { return p.Base != nil } @@ -3441,22 +3398,6 @@ func (p *UpdateEvaluatorDraftRequest) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } - case 5: - if fieldTypeId == thrift.MAP { - if err = p.ReadField5(iprot); err != nil { - goto ReadFieldError - } - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } - case 6: - if fieldTypeId == thrift.BOOL { - if err = p.ReadField6(iprot); err != nil { - goto ReadFieldError - } - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } case 255: if fieldTypeId == thrift.STRUCT { if err = p.ReadField255(iprot); err != nil { @@ -3556,58 +3497,6 @@ func (p *UpdateEvaluatorDraftRequest) ReadField4(iprot thrift.TProtocol) error { p.EvaluatorType = _field return nil } -func (p *UpdateEvaluatorDraftRequest) ReadField5(iprot thrift.TProtocol) error { - _, _, size, err := iprot.ReadMapBegin() - if err != nil { - return err - } - _field := make(map[evaluator.EvaluatorTagKey][]string, size) - for i := 0; i < size; i++ { - var _key evaluator.EvaluatorTagKey - if v, err := iprot.ReadString(); err != nil { - return err - } else { - _key = v - } - _, size, err := iprot.ReadListBegin() - if err != nil { - return err - } - _val := make([]string, 0, size) - for i := 0; i < size; i++ { - - var _elem string - if v, err := iprot.ReadString(); err != nil { - return err - } else { - _elem = v - } - - _val = append(_val, _elem) - } - if err := iprot.ReadListEnd(); err != nil { - return err - } - - _field[_key] = _val - } - if err := iprot.ReadMapEnd(); err != nil { - return err - } - p.Tags = _field - return nil -} -func (p *UpdateEvaluatorDraftRequest) ReadField6(iprot thrift.TProtocol) error { - - var _field *bool - if v, err := iprot.ReadBool(); err != nil { - return err - } else { - _field = &v - } - p.Builtin = _field - return nil -} func (p *UpdateEvaluatorDraftRequest) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBase() if err := _field.Read(iprot); err != nil { @@ -3639,14 +3528,6 @@ func (p *UpdateEvaluatorDraftRequest) Write(oprot thrift.TProtocol) (err error) fieldId = 4 goto WriteFieldError } - if err = p.writeField5(oprot); err != nil { - fieldId = 5 - goto WriteFieldError - } - if err = p.writeField6(oprot); err != nil { - fieldId = 6 - goto WriteFieldError - } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -3733,61 +3614,6 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) } -func (p *UpdateEvaluatorDraftRequest) writeField5(oprot thrift.TProtocol) (err error) { - if p.IsSetTags() { - if err = oprot.WriteFieldBegin("tags", thrift.MAP, 5); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(p.Tags)); err != nil { - return err - } - for k, v := range p.Tags { - if err := oprot.WriteString(k); err != nil { - return err - } - if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { - return err - } - for _, v := range v { - if err := oprot.WriteString(v); err != nil { - return err - } - } - if err := oprot.WriteListEnd(); err != nil { - return err - } - } - if err := oprot.WriteMapEnd(); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 5 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 5 end error: ", p), err) -} -func (p *UpdateEvaluatorDraftRequest) writeField6(oprot thrift.TProtocol) (err error) { - if p.IsSetBuiltin() { - if err = oprot.WriteFieldBegin("builtin", thrift.BOOL, 6); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteBool(*p.Builtin); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 6 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 6 end error: ", p), err) -} func (p *UpdateEvaluatorDraftRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { @@ -3833,12 +3659,6 @@ func (p *UpdateEvaluatorDraftRequest) DeepEqual(ano *UpdateEvaluatorDraftRequest if !p.Field4DeepEqual(ano.EvaluatorType) { return false } - if !p.Field5DeepEqual(ano.Tags) { - return false - } - if !p.Field6DeepEqual(ano.Builtin) { - return false - } if !p.Field255DeepEqual(ano.Base) { return false } @@ -3873,37 +3693,6 @@ func (p *UpdateEvaluatorDraftRequest) Field4DeepEqual(src evaluator.EvaluatorTyp } return true } -func (p *UpdateEvaluatorDraftRequest) Field5DeepEqual(src map[evaluator.EvaluatorTagKey][]string) bool { - - if len(p.Tags) != len(src) { - return false - } - for k, v := range p.Tags { - _src := src[k] - if len(v) != len(_src) { - return false - } - for i, v := range v { - _src1 := _src[i] - if strings.Compare(v, _src1) != 0 { - return false - } - } - } - return true -} -func (p *UpdateEvaluatorDraftRequest) Field6DeepEqual(src *bool) bool { - - if p.Builtin == src { - return true - } else if p.Builtin == nil || src == nil { - return false - } - if *p.Builtin != *src { - return false - } - return true -} func (p *UpdateEvaluatorDraftRequest) Field255DeepEqual(src *base.Base) bool { if !p.Base.DeepEqual(src) { @@ -19866,108 +19655,108 @@ func (p *DebugBuiltinEvaluatorResponse) Field255DeepEqual(src *base.BaseResp) bo return true } -type PublishBuiltinEvaluatorRequest struct { +type UpdateBuiltinEvaluatorTagsRequest struct { EvaluatorID int64 `thrift:"evaluator_id,1,required" frugal:"1,required,i64" json:"evaluator_id" path:"evaluator_id,required" ` Version string `thrift:"version,2,required" frugal:"2,required,string" form:"version,required" json:"version,required"` WorkspaceID *int64 `thrift:"workspace_id,3,optional" frugal:"3,optional,i64" json:"workspace_id" form:"workspace_id" ` - // 上下架操作类型 - OperationType *evaluator.OperationType `thrift:"operation_type,4,optional" frugal:"4,optional,string" json:"operation_type" form:"operation_type" ` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + // 评估器标签 + Tags map[evaluator.EvaluatorTagKey][]string `thrift:"tags,4,optional" frugal:"4,optional,map>" json:"tags" form:"tags" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } -func NewPublishBuiltinEvaluatorRequest() *PublishBuiltinEvaluatorRequest { - return &PublishBuiltinEvaluatorRequest{} +func NewUpdateBuiltinEvaluatorTagsRequest() *UpdateBuiltinEvaluatorTagsRequest { + return &UpdateBuiltinEvaluatorTagsRequest{} } -func (p *PublishBuiltinEvaluatorRequest) InitDefault() { +func (p *UpdateBuiltinEvaluatorTagsRequest) InitDefault() { } -func (p *PublishBuiltinEvaluatorRequest) GetEvaluatorID() (v int64) { +func (p *UpdateBuiltinEvaluatorTagsRequest) GetEvaluatorID() (v int64) { if p != nil { return p.EvaluatorID } return } -func (p *PublishBuiltinEvaluatorRequest) GetVersion() (v string) { +func (p *UpdateBuiltinEvaluatorTagsRequest) GetVersion() (v string) { if p != nil { return p.Version } return } -var PublishBuiltinEvaluatorRequest_WorkspaceID_DEFAULT int64 +var UpdateBuiltinEvaluatorTagsRequest_WorkspaceID_DEFAULT int64 -func (p *PublishBuiltinEvaluatorRequest) GetWorkspaceID() (v int64) { +func (p *UpdateBuiltinEvaluatorTagsRequest) GetWorkspaceID() (v int64) { if p == nil { return } if !p.IsSetWorkspaceID() { - return PublishBuiltinEvaluatorRequest_WorkspaceID_DEFAULT + return UpdateBuiltinEvaluatorTagsRequest_WorkspaceID_DEFAULT } return *p.WorkspaceID } -var PublishBuiltinEvaluatorRequest_OperationType_DEFAULT evaluator.OperationType +var UpdateBuiltinEvaluatorTagsRequest_Tags_DEFAULT map[evaluator.EvaluatorTagKey][]string -func (p *PublishBuiltinEvaluatorRequest) GetOperationType() (v evaluator.OperationType) { +func (p *UpdateBuiltinEvaluatorTagsRequest) GetTags() (v map[evaluator.EvaluatorTagKey][]string) { if p == nil { return } - if !p.IsSetOperationType() { - return PublishBuiltinEvaluatorRequest_OperationType_DEFAULT + if !p.IsSetTags() { + return UpdateBuiltinEvaluatorTagsRequest_Tags_DEFAULT } - return *p.OperationType + return p.Tags } -var PublishBuiltinEvaluatorRequest_Base_DEFAULT *base.Base +var UpdateBuiltinEvaluatorTagsRequest_Base_DEFAULT *base.Base -func (p *PublishBuiltinEvaluatorRequest) GetBase() (v *base.Base) { +func (p *UpdateBuiltinEvaluatorTagsRequest) GetBase() (v *base.Base) { if p == nil { return } if !p.IsSetBase() { - return PublishBuiltinEvaluatorRequest_Base_DEFAULT + return UpdateBuiltinEvaluatorTagsRequest_Base_DEFAULT } return p.Base } -func (p *PublishBuiltinEvaluatorRequest) SetEvaluatorID(val int64) { +func (p *UpdateBuiltinEvaluatorTagsRequest) SetEvaluatorID(val int64) { p.EvaluatorID = val } -func (p *PublishBuiltinEvaluatorRequest) SetVersion(val string) { +func (p *UpdateBuiltinEvaluatorTagsRequest) SetVersion(val string) { p.Version = val } -func (p *PublishBuiltinEvaluatorRequest) SetWorkspaceID(val *int64) { +func (p *UpdateBuiltinEvaluatorTagsRequest) SetWorkspaceID(val *int64) { p.WorkspaceID = val } -func (p *PublishBuiltinEvaluatorRequest) SetOperationType(val *evaluator.OperationType) { - p.OperationType = val +func (p *UpdateBuiltinEvaluatorTagsRequest) SetTags(val map[evaluator.EvaluatorTagKey][]string) { + p.Tags = val } -func (p *PublishBuiltinEvaluatorRequest) SetBase(val *base.Base) { +func (p *UpdateBuiltinEvaluatorTagsRequest) SetBase(val *base.Base) { p.Base = val } -var fieldIDToName_PublishBuiltinEvaluatorRequest = map[int16]string{ +var fieldIDToName_UpdateBuiltinEvaluatorTagsRequest = map[int16]string{ 1: "evaluator_id", 2: "version", 3: "workspace_id", - 4: "operation_type", + 4: "tags", 255: "Base", } -func (p *PublishBuiltinEvaluatorRequest) IsSetWorkspaceID() bool { +func (p *UpdateBuiltinEvaluatorTagsRequest) IsSetWorkspaceID() bool { return p.WorkspaceID != nil } -func (p *PublishBuiltinEvaluatorRequest) IsSetOperationType() bool { - return p.OperationType != nil +func (p *UpdateBuiltinEvaluatorTagsRequest) IsSetTags() bool { + return p.Tags != nil } -func (p *PublishBuiltinEvaluatorRequest) IsSetBase() bool { +func (p *UpdateBuiltinEvaluatorTagsRequest) IsSetBase() bool { return p.Base != nil } -func (p *PublishBuiltinEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 var issetEvaluatorID bool = false @@ -20014,7 +19803,7 @@ func (p *PublishBuiltinEvaluatorRequest) Read(iprot thrift.TProtocol) (err error goto SkipFieldError } case 4: - if fieldTypeId == thrift.STRING { + if fieldTypeId == thrift.MAP { if err = p.ReadField4(iprot); err != nil { goto ReadFieldError } @@ -20057,7 +19846,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_PublishBuiltinEvaluatorRequest[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_UpdateBuiltinEvaluatorTagsRequest[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -20066,10 +19855,10 @@ ReadFieldEndError: ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) RequiredFieldNotSetError: - return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_PublishBuiltinEvaluatorRequest[fieldId])) + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_UpdateBuiltinEvaluatorTagsRequest[fieldId])) } -func (p *PublishBuiltinEvaluatorRequest) ReadField1(iprot thrift.TProtocol) error { +func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField1(iprot thrift.TProtocol) error { var _field int64 if v, err := iprot.ReadI64(); err != nil { @@ -20080,7 +19869,7 @@ func (p *PublishBuiltinEvaluatorRequest) ReadField1(iprot thrift.TProtocol) erro p.EvaluatorID = _field return nil } -func (p *PublishBuiltinEvaluatorRequest) ReadField2(iprot thrift.TProtocol) error { +func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField2(iprot thrift.TProtocol) error { var _field string if v, err := iprot.ReadString(); err != nil { @@ -20091,7 +19880,7 @@ func (p *PublishBuiltinEvaluatorRequest) ReadField2(iprot thrift.TProtocol) erro p.Version = _field return nil } -func (p *PublishBuiltinEvaluatorRequest) ReadField3(iprot thrift.TProtocol) error { +func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField3(iprot thrift.TProtocol) error { var _field *int64 if v, err := iprot.ReadI64(); err != nil { @@ -20102,18 +19891,48 @@ func (p *PublishBuiltinEvaluatorRequest) ReadField3(iprot thrift.TProtocol) erro p.WorkspaceID = _field return nil } -func (p *PublishBuiltinEvaluatorRequest) ReadField4(iprot thrift.TProtocol) error { +func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField4(iprot thrift.TProtocol) error { + _, _, size, err := iprot.ReadMapBegin() + if err != nil { + return err + } + _field := make(map[evaluator.EvaluatorTagKey][]string, size) + for i := 0; i < size; i++ { + var _key evaluator.EvaluatorTagKey + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _key = v + } + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _val := make([]string, 0, size) + for i := 0; i < size; i++ { - var _field *evaluator.OperationType - if v, err := iprot.ReadString(); err != nil { + var _elem string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _elem = v + } + + _val = append(_val, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + + _field[_key] = _val + } + if err := iprot.ReadMapEnd(); err != nil { return err - } else { - _field = &v } - p.OperationType = _field + p.Tags = _field return nil } -func (p *PublishBuiltinEvaluatorRequest) ReadField255(iprot thrift.TProtocol) error { +func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBase() if err := _field.Read(iprot); err != nil { return err @@ -20122,9 +19941,9 @@ func (p *PublishBuiltinEvaluatorRequest) ReadField255(iprot thrift.TProtocol) er return nil } -func (p *PublishBuiltinEvaluatorRequest) Write(oprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("PublishBuiltinEvaluatorRequest"); err != nil { + if err = oprot.WriteStructBegin("UpdateBuiltinEvaluatorTagsRequest"); err != nil { goto WriteStructBeginError } if p != nil { @@ -20166,7 +19985,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *PublishBuiltinEvaluatorRequest) writeField1(oprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("evaluator_id", thrift.I64, 1); err != nil { goto WriteFieldBeginError } @@ -20182,7 +20001,7 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *PublishBuiltinEvaluatorRequest) writeField2(oprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) writeField2(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("version", thrift.STRING, 2); err != nil { goto WriteFieldBeginError } @@ -20198,7 +20017,7 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) } -func (p *PublishBuiltinEvaluatorRequest) writeField3(oprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) writeField3(oprot thrift.TProtocol) (err error) { if p.IsSetWorkspaceID() { if err = oprot.WriteFieldBegin("workspace_id", thrift.I64, 3); err != nil { goto WriteFieldBeginError @@ -20216,12 +20035,31 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) } -func (p *PublishBuiltinEvaluatorRequest) writeField4(oprot thrift.TProtocol) (err error) { - if p.IsSetOperationType() { - if err = oprot.WriteFieldBegin("operation_type", thrift.STRING, 4); err != nil { +func (p *UpdateBuiltinEvaluatorTagsRequest) writeField4(oprot thrift.TProtocol) (err error) { + if p.IsSetTags() { + if err = oprot.WriteFieldBegin("tags", thrift.MAP, 4); err != nil { goto WriteFieldBeginError } - if err := oprot.WriteString(*p.OperationType); err != nil { + if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(p.Tags)); err != nil { + return err + } + for k, v := range p.Tags { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + return err + } + for _, v := range v { + if err := oprot.WriteString(v); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + } + if err := oprot.WriteMapEnd(); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -20234,7 +20072,7 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) } -func (p *PublishBuiltinEvaluatorRequest) writeField255(oprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { goto WriteFieldBeginError @@ -20253,15 +20091,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) } -func (p *PublishBuiltinEvaluatorRequest) String() string { +func (p *UpdateBuiltinEvaluatorTagsRequest) String() string { if p == nil { return "" } - return fmt.Sprintf("PublishBuiltinEvaluatorRequest(%+v)", *p) + return fmt.Sprintf("UpdateBuiltinEvaluatorTagsRequest(%+v)", *p) } -func (p *PublishBuiltinEvaluatorRequest) DeepEqual(ano *PublishBuiltinEvaluatorRequest) bool { +func (p *UpdateBuiltinEvaluatorTagsRequest) DeepEqual(ano *UpdateBuiltinEvaluatorTagsRequest) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -20276,7 +20114,7 @@ func (p *PublishBuiltinEvaluatorRequest) DeepEqual(ano *PublishBuiltinEvaluatorR if !p.Field3DeepEqual(ano.WorkspaceID) { return false } - if !p.Field4DeepEqual(ano.OperationType) { + if !p.Field4DeepEqual(ano.Tags) { return false } if !p.Field255DeepEqual(ano.Base) { @@ -20285,21 +20123,21 @@ func (p *PublishBuiltinEvaluatorRequest) DeepEqual(ano *PublishBuiltinEvaluatorR return true } -func (p *PublishBuiltinEvaluatorRequest) Field1DeepEqual(src int64) bool { +func (p *UpdateBuiltinEvaluatorTagsRequest) Field1DeepEqual(src int64) bool { if p.EvaluatorID != src { return false } return true } -func (p *PublishBuiltinEvaluatorRequest) Field2DeepEqual(src string) bool { +func (p *UpdateBuiltinEvaluatorTagsRequest) Field2DeepEqual(src string) bool { if strings.Compare(p.Version, src) != 0 { return false } return true } -func (p *PublishBuiltinEvaluatorRequest) Field3DeepEqual(src *int64) bool { +func (p *UpdateBuiltinEvaluatorTagsRequest) Field3DeepEqual(src *int64) bool { if p.WorkspaceID == src { return true @@ -20311,19 +20149,26 @@ func (p *PublishBuiltinEvaluatorRequest) Field3DeepEqual(src *int64) bool { } return true } -func (p *PublishBuiltinEvaluatorRequest) Field4DeepEqual(src *evaluator.OperationType) bool { +func (p *UpdateBuiltinEvaluatorTagsRequest) Field4DeepEqual(src map[evaluator.EvaluatorTagKey][]string) bool { - if p.OperationType == src { - return true - } else if p.OperationType == nil || src == nil { + if len(p.Tags) != len(src) { return false } - if strings.Compare(*p.OperationType, *src) != 0 { - return false + for k, v := range p.Tags { + _src := src[k] + if len(v) != len(_src) { + return false + } + for i, v := range v { + _src1 := _src[i] + if strings.Compare(v, _src1) != 0 { + return false + } + } } return true } -func (p *PublishBuiltinEvaluatorRequest) Field255DeepEqual(src *base.Base) bool { +func (p *UpdateBuiltinEvaluatorTagsRequest) Field255DeepEqual(src *base.Base) bool { if !p.Base.DeepEqual(src) { return false @@ -20331,62 +20176,62 @@ func (p *PublishBuiltinEvaluatorRequest) Field255DeepEqual(src *base.Base) bool return true } -type PublishBuiltinEvaluatorResponse struct { +type UpdateBuiltinEvaluatorTagsResponse struct { Version *evaluator.EvaluatorVersion `thrift:"version,1,required" frugal:"1,required,evaluator.EvaluatorVersion" form:"version,required" json:"version,required"` BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` } -func NewPublishBuiltinEvaluatorResponse() *PublishBuiltinEvaluatorResponse { - return &PublishBuiltinEvaluatorResponse{} +func NewUpdateBuiltinEvaluatorTagsResponse() *UpdateBuiltinEvaluatorTagsResponse { + return &UpdateBuiltinEvaluatorTagsResponse{} } -func (p *PublishBuiltinEvaluatorResponse) InitDefault() { +func (p *UpdateBuiltinEvaluatorTagsResponse) InitDefault() { } -var PublishBuiltinEvaluatorResponse_Version_DEFAULT *evaluator.EvaluatorVersion +var UpdateBuiltinEvaluatorTagsResponse_Version_DEFAULT *evaluator.EvaluatorVersion -func (p *PublishBuiltinEvaluatorResponse) GetVersion() (v *evaluator.EvaluatorVersion) { +func (p *UpdateBuiltinEvaluatorTagsResponse) GetVersion() (v *evaluator.EvaluatorVersion) { if p == nil { return } if !p.IsSetVersion() { - return PublishBuiltinEvaluatorResponse_Version_DEFAULT + return UpdateBuiltinEvaluatorTagsResponse_Version_DEFAULT } return p.Version } -var PublishBuiltinEvaluatorResponse_BaseResp_DEFAULT *base.BaseResp +var UpdateBuiltinEvaluatorTagsResponse_BaseResp_DEFAULT *base.BaseResp -func (p *PublishBuiltinEvaluatorResponse) GetBaseResp() (v *base.BaseResp) { +func (p *UpdateBuiltinEvaluatorTagsResponse) GetBaseResp() (v *base.BaseResp) { if p == nil { return } if !p.IsSetBaseResp() { - return PublishBuiltinEvaluatorResponse_BaseResp_DEFAULT + return UpdateBuiltinEvaluatorTagsResponse_BaseResp_DEFAULT } return p.BaseResp } -func (p *PublishBuiltinEvaluatorResponse) SetVersion(val *evaluator.EvaluatorVersion) { +func (p *UpdateBuiltinEvaluatorTagsResponse) SetVersion(val *evaluator.EvaluatorVersion) { p.Version = val } -func (p *PublishBuiltinEvaluatorResponse) SetBaseResp(val *base.BaseResp) { +func (p *UpdateBuiltinEvaluatorTagsResponse) SetBaseResp(val *base.BaseResp) { p.BaseResp = val } -var fieldIDToName_PublishBuiltinEvaluatorResponse = map[int16]string{ +var fieldIDToName_UpdateBuiltinEvaluatorTagsResponse = map[int16]string{ 1: "version", 255: "BaseResp", } -func (p *PublishBuiltinEvaluatorResponse) IsSetVersion() bool { +func (p *UpdateBuiltinEvaluatorTagsResponse) IsSetVersion() bool { return p.Version != nil } -func (p *PublishBuiltinEvaluatorResponse) IsSetBaseResp() bool { +func (p *UpdateBuiltinEvaluatorTagsResponse) IsSetBaseResp() bool { return p.BaseResp != nil } -func (p *PublishBuiltinEvaluatorResponse) Read(iprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsResponse) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 var issetVersion bool = false @@ -20445,7 +20290,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_PublishBuiltinEvaluatorResponse[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_UpdateBuiltinEvaluatorTagsResponse[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -20454,10 +20299,10 @@ ReadFieldEndError: ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) RequiredFieldNotSetError: - return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_PublishBuiltinEvaluatorResponse[fieldId])) + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_UpdateBuiltinEvaluatorTagsResponse[fieldId])) } -func (p *PublishBuiltinEvaluatorResponse) ReadField1(iprot thrift.TProtocol) error { +func (p *UpdateBuiltinEvaluatorTagsResponse) ReadField1(iprot thrift.TProtocol) error { _field := evaluator.NewEvaluatorVersion() if err := _field.Read(iprot); err != nil { return err @@ -20465,7 +20310,7 @@ func (p *PublishBuiltinEvaluatorResponse) ReadField1(iprot thrift.TProtocol) err p.Version = _field return nil } -func (p *PublishBuiltinEvaluatorResponse) ReadField255(iprot thrift.TProtocol) error { +func (p *UpdateBuiltinEvaluatorTagsResponse) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBaseResp() if err := _field.Read(iprot); err != nil { return err @@ -20474,9 +20319,9 @@ func (p *PublishBuiltinEvaluatorResponse) ReadField255(iprot thrift.TProtocol) e return nil } -func (p *PublishBuiltinEvaluatorResponse) Write(oprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsResponse) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("PublishBuiltinEvaluatorResponse"); err != nil { + if err = oprot.WriteStructBegin("UpdateBuiltinEvaluatorTagsResponse"); err != nil { goto WriteStructBeginError } if p != nil { @@ -20506,7 +20351,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *PublishBuiltinEvaluatorResponse) writeField1(oprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsResponse) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("version", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -20522,7 +20367,7 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *PublishBuiltinEvaluatorResponse) writeField255(oprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsResponse) writeField255(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { goto WriteFieldBeginError } @@ -20539,15 +20384,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) } -func (p *PublishBuiltinEvaluatorResponse) String() string { +func (p *UpdateBuiltinEvaluatorTagsResponse) String() string { if p == nil { return "" } - return fmt.Sprintf("PublishBuiltinEvaluatorResponse(%+v)", *p) + return fmt.Sprintf("UpdateBuiltinEvaluatorTagsResponse(%+v)", *p) } -func (p *PublishBuiltinEvaluatorResponse) DeepEqual(ano *PublishBuiltinEvaluatorResponse) bool { +func (p *UpdateBuiltinEvaluatorTagsResponse) DeepEqual(ano *UpdateBuiltinEvaluatorTagsResponse) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -20562,14 +20407,14 @@ func (p *PublishBuiltinEvaluatorResponse) DeepEqual(ano *PublishBuiltinEvaluator return true } -func (p *PublishBuiltinEvaluatorResponse) Field1DeepEqual(src *evaluator.EvaluatorVersion) bool { +func (p *UpdateBuiltinEvaluatorTagsResponse) Field1DeepEqual(src *evaluator.EvaluatorVersion) bool { if !p.Version.DeepEqual(src) { return false } return true } -func (p *PublishBuiltinEvaluatorResponse) Field255DeepEqual(src *base.BaseResp) bool { +func (p *UpdateBuiltinEvaluatorTagsResponse) Field255DeepEqual(src *base.BaseResp) bool { if !p.BaseResp.DeepEqual(src) { return false @@ -22511,8 +22356,8 @@ type EvaluatorService interface { DeleteEvaluatorTemplate(ctx context.Context, request *DeleteEvaluatorTemplateRequest) (r *DeleteEvaluatorTemplateResponse, err error) // 调试预置评估器 DebugBuiltinEvaluator(ctx context.Context, req *DebugBuiltinEvaluatorRequest) (r *DebugBuiltinEvaluatorResponse, err error) - // 发布预置评估器 - PublishBuiltinEvaluator(ctx context.Context, req *PublishBuiltinEvaluatorRequest) (r *PublishBuiltinEvaluatorResponse, err error) + // 更新预置评估器tag + UpdateBuiltinEvaluatorTags(ctx context.Context, req *UpdateBuiltinEvaluatorTagsRequest) (r *UpdateBuiltinEvaluatorTagsResponse, err error) // 查询Tag ListEvaluatorTags(ctx context.Context, req *ListEvaluatorTagsRequest) (r *ListEvaluatorTagsResponse, err error) } @@ -22786,11 +22631,11 @@ func (p *EvaluatorServiceClient) DebugBuiltinEvaluator(ctx context.Context, req } return _result.GetSuccess(), nil } -func (p *EvaluatorServiceClient) PublishBuiltinEvaluator(ctx context.Context, req *PublishBuiltinEvaluatorRequest) (r *PublishBuiltinEvaluatorResponse, err error) { - var _args EvaluatorServicePublishBuiltinEvaluatorArgs +func (p *EvaluatorServiceClient) UpdateBuiltinEvaluatorTags(ctx context.Context, req *UpdateBuiltinEvaluatorTagsRequest) (r *UpdateBuiltinEvaluatorTagsResponse, err error) { + var _args EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs _args.Req = req - var _result EvaluatorServicePublishBuiltinEvaluatorResult - if err = p.Client_().Call(ctx, "PublishBuiltinEvaluator", &_args, &_result); err != nil { + var _result EvaluatorServiceUpdateBuiltinEvaluatorTagsResult + if err = p.Client_().Call(ctx, "UpdateBuiltinEvaluatorTags", &_args, &_result); err != nil { return } return _result.GetSuccess(), nil @@ -22852,7 +22697,7 @@ func NewEvaluatorServiceProcessor(handler EvaluatorService) *EvaluatorServicePro self.AddToProcessorMap("UpdateEvaluatorTemplate", &evaluatorServiceProcessorUpdateEvaluatorTemplate{handler: handler}) self.AddToProcessorMap("DeleteEvaluatorTemplate", &evaluatorServiceProcessorDeleteEvaluatorTemplate{handler: handler}) self.AddToProcessorMap("DebugBuiltinEvaluator", &evaluatorServiceProcessorDebugBuiltinEvaluator{handler: handler}) - self.AddToProcessorMap("PublishBuiltinEvaluator", &evaluatorServiceProcessorPublishBuiltinEvaluator{handler: handler}) + self.AddToProcessorMap("UpdateBuiltinEvaluatorTags", &evaluatorServiceProcessorUpdateBuiltinEvaluatorTags{handler: handler}) self.AddToProcessorMap("ListEvaluatorTags", &evaluatorServiceProcessorListEvaluatorTags{handler: handler}) return self } @@ -24170,16 +24015,16 @@ func (p *evaluatorServiceProcessorDebugBuiltinEvaluator) Process(ctx context.Con return true, err } -type evaluatorServiceProcessorPublishBuiltinEvaluator struct { +type evaluatorServiceProcessorUpdateBuiltinEvaluatorTags struct { handler EvaluatorService } -func (p *evaluatorServiceProcessorPublishBuiltinEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluatorServicePublishBuiltinEvaluatorArgs{} +func (p *evaluatorServiceProcessorUpdateBuiltinEvaluatorTags) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs{} if err = args.Read(iprot); err != nil { iprot.ReadMessageEnd() x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("PublishBuiltinEvaluator", thrift.EXCEPTION, seqId) + oprot.WriteMessageBegin("UpdateBuiltinEvaluatorTags", thrift.EXCEPTION, seqId) x.Write(oprot) oprot.WriteMessageEnd() oprot.Flush(ctx) @@ -24188,11 +24033,11 @@ func (p *evaluatorServiceProcessorPublishBuiltinEvaluator) Process(ctx context.C iprot.ReadMessageEnd() var err2 error - result := EvaluatorServicePublishBuiltinEvaluatorResult{} - var retval *PublishBuiltinEvaluatorResponse - if retval, err2 = p.handler.PublishBuiltinEvaluator(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing PublishBuiltinEvaluator: "+err2.Error()) - oprot.WriteMessageBegin("PublishBuiltinEvaluator", thrift.EXCEPTION, seqId) + result := EvaluatorServiceUpdateBuiltinEvaluatorTagsResult{} + var retval *UpdateBuiltinEvaluatorTagsResponse + if retval, err2 = p.handler.UpdateBuiltinEvaluatorTags(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing UpdateBuiltinEvaluatorTags: "+err2.Error()) + oprot.WriteMessageBegin("UpdateBuiltinEvaluatorTags", thrift.EXCEPTION, seqId) x.Write(oprot) oprot.WriteMessageEnd() oprot.Flush(ctx) @@ -24200,7 +24045,7 @@ func (p *evaluatorServiceProcessorPublishBuiltinEvaluator) Process(ctx context.C } else { result.Success = retval } - if err2 = oprot.WriteMessageBegin("PublishBuiltinEvaluator", thrift.REPLY, seqId); err2 != nil { + if err2 = oprot.WriteMessageBegin("UpdateBuiltinEvaluatorTags", thrift.REPLY, seqId); err2 != nil { err = err2 } if err2 = result.Write(oprot); err == nil && err2 != nil { @@ -33554,41 +33399,41 @@ func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) Field0DeepEqual(src *Debug return true } -type EvaluatorServicePublishBuiltinEvaluatorArgs struct { - Req *PublishBuiltinEvaluatorRequest `thrift:"req,1" frugal:"1,default,PublishBuiltinEvaluatorRequest"` +type EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs struct { + Req *UpdateBuiltinEvaluatorTagsRequest `thrift:"req,1" frugal:"1,default,UpdateBuiltinEvaluatorTagsRequest"` } -func NewEvaluatorServicePublishBuiltinEvaluatorArgs() *EvaluatorServicePublishBuiltinEvaluatorArgs { - return &EvaluatorServicePublishBuiltinEvaluatorArgs{} +func NewEvaluatorServiceUpdateBuiltinEvaluatorTagsArgs() *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs { + return &EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs{} } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) InitDefault() { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) InitDefault() { } -var EvaluatorServicePublishBuiltinEvaluatorArgs_Req_DEFAULT *PublishBuiltinEvaluatorRequest +var EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs_Req_DEFAULT *UpdateBuiltinEvaluatorTagsRequest -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) GetReq() (v *PublishBuiltinEvaluatorRequest) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) GetReq() (v *UpdateBuiltinEvaluatorTagsRequest) { if p == nil { return } if !p.IsSetReq() { - return EvaluatorServicePublishBuiltinEvaluatorArgs_Req_DEFAULT + return EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs_Req_DEFAULT } return p.Req } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) SetReq(val *PublishBuiltinEvaluatorRequest) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) SetReq(val *UpdateBuiltinEvaluatorTagsRequest) { p.Req = val } -var fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorArgs = map[int16]string{ +var fieldIDToName_EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs = map[int16]string{ 1: "req", } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) IsSetReq() bool { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) IsSetReq() bool { return p.Req != nil } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -33633,7 +33478,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -33643,8 +33488,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewPublishBuiltinEvaluatorRequest() +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewUpdateBuiltinEvaluatorTagsRequest() if err := _field.Read(iprot); err != nil { return err } @@ -33652,9 +33497,9 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) ReadField1(iprot thrift.TP return nil } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("PublishBuiltinEvaluator_args"); err != nil { + if err = oprot.WriteStructBegin("UpdateBuiltinEvaluatorTags_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -33680,7 +33525,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -33697,15 +33542,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) String() string { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServicePublishBuiltinEvaluatorArgs(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs(%+v)", *p) } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) DeepEqual(ano *EvaluatorServicePublishBuiltinEvaluatorArgs) bool { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) DeepEqual(ano *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -33717,7 +33562,7 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) DeepEqual(ano *EvaluatorSe return true } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) Field1DeepEqual(src *PublishBuiltinEvaluatorRequest) bool { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) Field1DeepEqual(src *UpdateBuiltinEvaluatorTagsRequest) bool { if !p.Req.DeepEqual(src) { return false @@ -33725,41 +33570,41 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) Field1DeepEqual(src *Publi return true } -type EvaluatorServicePublishBuiltinEvaluatorResult struct { - Success *PublishBuiltinEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,PublishBuiltinEvaluatorResponse"` +type EvaluatorServiceUpdateBuiltinEvaluatorTagsResult struct { + Success *UpdateBuiltinEvaluatorTagsResponse `thrift:"success,0,optional" frugal:"0,optional,UpdateBuiltinEvaluatorTagsResponse"` } -func NewEvaluatorServicePublishBuiltinEvaluatorResult() *EvaluatorServicePublishBuiltinEvaluatorResult { - return &EvaluatorServicePublishBuiltinEvaluatorResult{} +func NewEvaluatorServiceUpdateBuiltinEvaluatorTagsResult() *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult { + return &EvaluatorServiceUpdateBuiltinEvaluatorTagsResult{} } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) InitDefault() { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) InitDefault() { } -var EvaluatorServicePublishBuiltinEvaluatorResult_Success_DEFAULT *PublishBuiltinEvaluatorResponse +var EvaluatorServiceUpdateBuiltinEvaluatorTagsResult_Success_DEFAULT *UpdateBuiltinEvaluatorTagsResponse -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) GetSuccess() (v *PublishBuiltinEvaluatorResponse) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) GetSuccess() (v *UpdateBuiltinEvaluatorTagsResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluatorServicePublishBuiltinEvaluatorResult_Success_DEFAULT + return EvaluatorServiceUpdateBuiltinEvaluatorTagsResult_Success_DEFAULT } return p.Success } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) SetSuccess(x interface{}) { - p.Success = x.(*PublishBuiltinEvaluatorResponse) +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) SetSuccess(x interface{}) { + p.Success = x.(*UpdateBuiltinEvaluatorTagsResponse) } -var fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorResult = map[int16]string{ +var fieldIDToName_EvaluatorServiceUpdateBuiltinEvaluatorTagsResult = map[int16]string{ 0: "success", } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) IsSetSuccess() bool { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -33804,7 +33649,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateBuiltinEvaluatorTagsResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -33814,8 +33659,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewPublishBuiltinEvaluatorResponse() +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewUpdateBuiltinEvaluatorTagsResponse() if err := _field.Read(iprot); err != nil { return err } @@ -33823,9 +33668,9 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorResult) ReadField0(iprot thrift. return nil } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("PublishBuiltinEvaluator_result"); err != nil { + if err = oprot.WriteStructBegin("UpdateBuiltinEvaluatorTags_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -33851,7 +33696,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -33870,15 +33715,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) String() string { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluatorServicePublishBuiltinEvaluatorResult(%+v)", *p) + return fmt.Sprintf("EvaluatorServiceUpdateBuiltinEvaluatorTagsResult(%+v)", *p) } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) DeepEqual(ano *EvaluatorServicePublishBuiltinEvaluatorResult) bool { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) DeepEqual(ano *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -33890,7 +33735,7 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorResult) DeepEqual(ano *Evaluator return true } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) Field0DeepEqual(src *PublishBuiltinEvaluatorResponse) bool { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) Field0DeepEqual(src *UpdateBuiltinEvaluatorTagsResponse) bool { if !p.Success.DeepEqual(src) { return false diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go index 6be6a299d..2a673d78b 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go @@ -617,7 +617,7 @@ func (p *DebugBuiltinEvaluatorResponse) IsValid() error { } return nil } -func (p *PublishBuiltinEvaluatorRequest) IsValid() error { +func (p *UpdateBuiltinEvaluatorTagsRequest) IsValid() error { if p.Base != nil { if err := p.Base.IsValid(); err != nil { return fmt.Errorf("field Base not valid, %w", err) @@ -625,7 +625,7 @@ func (p *PublishBuiltinEvaluatorRequest) IsValid() error { } return nil } -func (p *PublishBuiltinEvaluatorResponse) IsValid() error { +func (p *UpdateBuiltinEvaluatorTagsResponse) IsValid() error { if p.Version != nil { if err := p.Version.IsValid(); err != nil { return fmt.Errorf("field Version not valid, %w", err) diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go index 61edcc981..671f74cb9 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go @@ -38,7 +38,7 @@ type Client interface { UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) - PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) + UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.UpdateBuiltinEvaluatorTagsResponse, err error) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) } @@ -206,9 +206,9 @@ func (p *kEvaluatorServiceClient) DebugBuiltinEvaluator(ctx context.Context, req return p.kClient.DebugBuiltinEvaluator(ctx, req) } -func (p *kEvaluatorServiceClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { +func (p *kEvaluatorServiceClient) UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.UpdateBuiltinEvaluatorTagsResponse, err error) { ctx = client.NewCtxWithCallOptions(ctx, callOptions) - return p.kClient.PublishBuiltinEvaluator(ctx, req) + return p.kClient.UpdateBuiltinEvaluatorTags(ctx, req) } func (p *kEvaluatorServiceClient) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) { diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go index 525f61528..185d03f08 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go @@ -202,10 +202,10 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), - "PublishBuiltinEvaluator": kitex.NewMethodInfo( - publishBuiltinEvaluatorHandler, - newEvaluatorServicePublishBuiltinEvaluatorArgs, - newEvaluatorServicePublishBuiltinEvaluatorResult, + "UpdateBuiltinEvaluatorTags": kitex.NewMethodInfo( + updateBuiltinEvaluatorTagsHandler, + newEvaluatorServiceUpdateBuiltinEvaluatorTagsArgs, + newEvaluatorServiceUpdateBuiltinEvaluatorTagsResult, false, kitex.WithStreamingMode(kitex.StreamingNone), ), @@ -762,10 +762,10 @@ func newEvaluatorServiceDebugBuiltinEvaluatorResult() interface{} { return evaluator.NewEvaluatorServiceDebugBuiltinEvaluatorResult() } -func publishBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { - realArg := arg.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs) - realResult := result.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorResult) - success, err := handler.(evaluator.EvaluatorService).PublishBuiltinEvaluator(ctx, realArg.Req) +func updateBuiltinEvaluatorTagsHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) + realResult := result.(*evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) + success, err := handler.(evaluator.EvaluatorService).UpdateBuiltinEvaluatorTags(ctx, realArg.Req) if err != nil { return err } @@ -773,12 +773,12 @@ func publishBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, ar return nil } -func newEvaluatorServicePublishBuiltinEvaluatorArgs() interface{} { - return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorArgs() +func newEvaluatorServiceUpdateBuiltinEvaluatorTagsArgs() interface{} { + return evaluator.NewEvaluatorServiceUpdateBuiltinEvaluatorTagsArgs() } -func newEvaluatorServicePublishBuiltinEvaluatorResult() interface{} { - return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorResult() +func newEvaluatorServiceUpdateBuiltinEvaluatorTagsResult() interface{} { + return evaluator.NewEvaluatorServiceUpdateBuiltinEvaluatorTagsResult() } func listEvaluatorTagsHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { @@ -1082,11 +1082,11 @@ func (p *kClient) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.Debu return _result.GetSuccess(), nil } -func (p *kClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { - var _args evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs +func (p *kClient) UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest) (r *evaluator.UpdateBuiltinEvaluatorTagsResponse, err error) { + var _args evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs _args.Req = req - var _result evaluator.EvaluatorServicePublishBuiltinEvaluatorResult - if err = p.c.Call(ctx, "PublishBuiltinEvaluator", &_args, &_result); err != nil { + var _result evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsResult + if err = p.c.Call(ctx, "UpdateBuiltinEvaluatorTags", &_args, &_result); err != nil { return } return _result.GetSuccess(), nil diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go index 2e7bc0d10..499849b8e 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go @@ -2454,34 +2454,6 @@ func (p *UpdateEvaluatorDraftRequest) FastRead(buf []byte) (int, error) { goto SkipFieldError } } - case 5: - if fieldTypeId == thrift.MAP { - l, err = p.FastReadField5(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 6: - if fieldTypeId == thrift.BOOL { - l, err = p.FastReadField6(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 255: if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField255(buf[offset:]) @@ -2590,62 +2562,6 @@ func (p *UpdateEvaluatorDraftRequest) FastReadField4(buf []byte) (int, error) { return offset, nil } -func (p *UpdateEvaluatorDraftRequest) FastReadField5(buf []byte) (int, error) { - offset := 0 - - _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) - offset += l - if err != nil { - return offset, err - } - _field := make(map[evaluator.EvaluatorTagKey][]string, size) - for i := 0; i < size; i++ { - var _key evaluator.EvaluatorTagKey - if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _key = v - } - - _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) - offset += l - if err != nil { - return offset, err - } - _val := make([]string, 0, size) - for i := 0; i < size; i++ { - var _elem string - if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _elem = v - } - - _val = append(_val, _elem) - } - - _field[_key] = _val - } - p.Tags = _field - return offset, nil -} - -func (p *UpdateEvaluatorDraftRequest) FastReadField6(buf []byte) (int, error) { - offset := 0 - - var _field *bool - if v, l, err := thrift.Binary.ReadBool(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _field = &v - } - p.Builtin = _field - return offset, nil -} - func (p *UpdateEvaluatorDraftRequest) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBase() @@ -2667,10 +2583,8 @@ func (p *UpdateEvaluatorDraftRequest) FastWriteNocopy(buf []byte, w thrift.Nocop if p != nil { offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) - offset += p.fastWriteField6(buf[offset:], w) offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField4(buf[offset:], w) - offset += p.fastWriteField5(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -2684,8 +2598,6 @@ func (p *UpdateEvaluatorDraftRequest) BLength() int { l += p.field2Length() l += p.field3Length() l += p.field4Length() - l += p.field5Length() - l += p.field6Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -2720,39 +2632,6 @@ func (p *UpdateEvaluatorDraftRequest) fastWriteField4(buf []byte, w thrift.Nocop return offset } -func (p *UpdateEvaluatorDraftRequest) fastWriteField5(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p.IsSetTags() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 5) - mapBeginOffset := offset - offset += thrift.Binary.MapBeginLength() - var length int - for k, v := range p.Tags { - length++ - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) - listBeginOffset := offset - offset += thrift.Binary.ListBeginLength() - var length int - for _, v := range v { - length++ - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) - } - thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) - } - thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) - } - return offset -} - -func (p *UpdateEvaluatorDraftRequest) fastWriteField6(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p.IsSetBuiltin() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.BOOL, 6) - offset += thrift.Binary.WriteBool(buf[offset:], *p.Builtin) - } - return offset -} - func (p *UpdateEvaluatorDraftRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBase() { @@ -2790,34 +2669,6 @@ func (p *UpdateEvaluatorDraftRequest) field4Length() int { return l } -func (p *UpdateEvaluatorDraftRequest) field5Length() int { - l := 0 - if p.IsSetTags() { - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.MapBeginLength() - for k, v := range p.Tags { - _, _ = k, v - - l += thrift.Binary.StringLengthNocopy(k) - l += thrift.Binary.ListBeginLength() - for _, v := range v { - _ = v - l += thrift.Binary.StringLengthNocopy(v) - } - } - } - return l -} - -func (p *UpdateEvaluatorDraftRequest) field6Length() int { - l := 0 - if p.IsSetBuiltin() { - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.BoolLength() - } - return l -} - func (p *UpdateEvaluatorDraftRequest) field255Length() int { l := 0 if p.IsSetBase() { @@ -2848,33 +2699,6 @@ func (p *UpdateEvaluatorDraftRequest) DeepCopy(s interface{}) error { p.EvaluatorType = src.EvaluatorType - if src.Tags != nil { - p.Tags = make(map[evaluator.EvaluatorTagKey][]string, len(src.Tags)) - for key, val := range src.Tags { - var _key evaluator.EvaluatorTagKey - _key = key - - var _val []string - if val != nil { - _val = make([]string, 0, len(val)) - for _, elem := range val { - var _elem string - if elem != "" { - _elem = kutils.StringDeepCopy(elem) - } - _val = append(_val, _elem) - } - } - - p.Tags[_key] = _val - } - } - - if src.Builtin != nil { - tmp := *src.Builtin - p.Builtin = &tmp - } - var _base *base.Base if src.Base != nil { _base = &base.Base{} @@ -14459,7 +14283,7 @@ func (p *DebugBuiltinEvaluatorResponse) DeepCopy(s interface{}) error { return nil } -func (p *PublishBuiltinEvaluatorRequest) FastRead(buf []byte) (int, error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14523,7 +14347,7 @@ func (p *PublishBuiltinEvaluatorRequest) FastRead(buf []byte) (int, error) { } } case 4: - if fieldTypeId == thrift.STRING { + if fieldTypeId == thrift.MAP { l, err = p.FastReadField4(buf[offset:]) offset += l if err != nil { @@ -14572,14 +14396,14 @@ func (p *PublishBuiltinEvaluatorRequest) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_PublishBuiltinEvaluatorRequest[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_UpdateBuiltinEvaluatorTagsRequest[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) RequiredFieldNotSetError: - return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_PublishBuiltinEvaluatorRequest[fieldId])) + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_UpdateBuiltinEvaluatorTagsRequest[fieldId])) } -func (p *PublishBuiltinEvaluatorRequest) FastReadField1(buf []byte) (int, error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField1(buf []byte) (int, error) { offset := 0 var _field int64 @@ -14593,7 +14417,7 @@ func (p *PublishBuiltinEvaluatorRequest) FastReadField1(buf []byte) (int, error) return offset, nil } -func (p *PublishBuiltinEvaluatorRequest) FastReadField2(buf []byte) (int, error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField2(buf []byte) (int, error) { offset := 0 var _field string @@ -14607,7 +14431,7 @@ func (p *PublishBuiltinEvaluatorRequest) FastReadField2(buf []byte) (int, error) return offset, nil } -func (p *PublishBuiltinEvaluatorRequest) FastReadField3(buf []byte) (int, error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField3(buf []byte) (int, error) { offset := 0 var _field *int64 @@ -14621,21 +14445,49 @@ func (p *PublishBuiltinEvaluatorRequest) FastReadField3(buf []byte) (int, error) return offset, nil } -func (p *PublishBuiltinEvaluatorRequest) FastReadField4(buf []byte) (int, error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField4(buf []byte) (int, error) { offset := 0 - var _field *evaluator.OperationType - if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) + offset += l + if err != nil { return offset, err - } else { + } + _field := make(map[evaluator.EvaluatorTagKey][]string, size) + for i := 0; i < size; i++ { + var _key evaluator.EvaluatorTagKey + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _key = v + } + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) offset += l - _field = &v + if err != nil { + return offset, err + } + _val := make([]string, 0, size) + for i := 0; i < size; i++ { + var _elem string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _elem = v + } + + _val = append(_val, _elem) + } + + _field[_key] = _val } - p.OperationType = _field + p.Tags = _field return offset, nil } -func (p *PublishBuiltinEvaluatorRequest) FastReadField255(buf []byte) (int, error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBase() if l, err := _field.FastRead(buf[offset:]); err != nil { @@ -14647,11 +14499,11 @@ func (p *PublishBuiltinEvaluatorRequest) FastReadField255(buf []byte) (int, erro return offset, nil } -func (p *PublishBuiltinEvaluatorRequest) FastWrite(buf []byte) int { +func (p *UpdateBuiltinEvaluatorTagsRequest) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *PublishBuiltinEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateBuiltinEvaluatorTagsRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -14664,7 +14516,7 @@ func (p *PublishBuiltinEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.No return offset } -func (p *PublishBuiltinEvaluatorRequest) BLength() int { +func (p *UpdateBuiltinEvaluatorTagsRequest) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -14677,21 +14529,21 @@ func (p *PublishBuiltinEvaluatorRequest) BLength() int { return l } -func (p *PublishBuiltinEvaluatorRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateBuiltinEvaluatorTagsRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) offset += thrift.Binary.WriteI64(buf[offset:], p.EvaluatorID) return offset } -func (p *PublishBuiltinEvaluatorRequest) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateBuiltinEvaluatorTagsRequest) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 2) offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, p.Version) return offset } -func (p *PublishBuiltinEvaluatorRequest) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateBuiltinEvaluatorTagsRequest) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetWorkspaceID() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 3) @@ -14700,16 +14552,31 @@ func (p *PublishBuiltinEvaluatorRequest) fastWriteField3(buf []byte, w thrift.No return offset } -func (p *PublishBuiltinEvaluatorRequest) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateBuiltinEvaluatorTagsRequest) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { offset := 0 - if p.IsSetOperationType() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 4) - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.OperationType) + if p.IsSetTags() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 4) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() + var length int + for k, v := range p.Tags { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range v { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) + } + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) } return offset } -func (p *PublishBuiltinEvaluatorRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateBuiltinEvaluatorTagsRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBase() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) @@ -14718,21 +14585,21 @@ func (p *PublishBuiltinEvaluatorRequest) fastWriteField255(buf []byte, w thrift. return offset } -func (p *PublishBuiltinEvaluatorRequest) field1Length() int { +func (p *UpdateBuiltinEvaluatorTagsRequest) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += thrift.Binary.I64Length() return l } -func (p *PublishBuiltinEvaluatorRequest) field2Length() int { +func (p *UpdateBuiltinEvaluatorTagsRequest) field2Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += thrift.Binary.StringLengthNocopy(p.Version) return l } -func (p *PublishBuiltinEvaluatorRequest) field3Length() int { +func (p *UpdateBuiltinEvaluatorTagsRequest) field3Length() int { l := 0 if p.IsSetWorkspaceID() { l += thrift.Binary.FieldBeginLength() @@ -14741,16 +14608,26 @@ func (p *PublishBuiltinEvaluatorRequest) field3Length() int { return l } -func (p *PublishBuiltinEvaluatorRequest) field4Length() int { +func (p *UpdateBuiltinEvaluatorTagsRequest) field4Length() int { l := 0 - if p.IsSetOperationType() { + if p.IsSetTags() { l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.StringLengthNocopy(*p.OperationType) + l += thrift.Binary.MapBeginLength() + for k, v := range p.Tags { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.ListBeginLength() + for _, v := range v { + _ = v + l += thrift.Binary.StringLengthNocopy(v) + } + } } return l } -func (p *PublishBuiltinEvaluatorRequest) field255Length() int { +func (p *UpdateBuiltinEvaluatorTagsRequest) field255Length() int { l := 0 if p.IsSetBase() { l += thrift.Binary.FieldBeginLength() @@ -14759,8 +14636,8 @@ func (p *PublishBuiltinEvaluatorRequest) field255Length() int { return l } -func (p *PublishBuiltinEvaluatorRequest) DeepCopy(s interface{}) error { - src, ok := s.(*PublishBuiltinEvaluatorRequest) +func (p *UpdateBuiltinEvaluatorTagsRequest) DeepCopy(s interface{}) error { + src, ok := s.(*UpdateBuiltinEvaluatorTagsRequest) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } @@ -14776,9 +14653,26 @@ func (p *PublishBuiltinEvaluatorRequest) DeepCopy(s interface{}) error { p.WorkspaceID = &tmp } - if src.OperationType != nil { - tmp := *src.OperationType - p.OperationType = &tmp + if src.Tags != nil { + p.Tags = make(map[evaluator.EvaluatorTagKey][]string, len(src.Tags)) + for key, val := range src.Tags { + var _key evaluator.EvaluatorTagKey + _key = key + + var _val []string + if val != nil { + _val = make([]string, 0, len(val)) + for _, elem := range val { + var _elem string + if elem != "" { + _elem = kutils.StringDeepCopy(elem) + } + _val = append(_val, _elem) + } + } + + p.Tags[_key] = _val + } } var _base *base.Base @@ -14793,7 +14687,7 @@ func (p *PublishBuiltinEvaluatorRequest) DeepCopy(s interface{}) error { return nil } -func (p *PublishBuiltinEvaluatorResponse) FastRead(buf []byte) (int, error) { +func (p *UpdateBuiltinEvaluatorTagsResponse) FastRead(buf []byte) (int, error) { var err error var offset int @@ -14857,14 +14751,14 @@ func (p *PublishBuiltinEvaluatorResponse) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_PublishBuiltinEvaluatorResponse[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_UpdateBuiltinEvaluatorTagsResponse[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) RequiredFieldNotSetError: - return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_PublishBuiltinEvaluatorResponse[fieldId])) + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_UpdateBuiltinEvaluatorTagsResponse[fieldId])) } -func (p *PublishBuiltinEvaluatorResponse) FastReadField1(buf []byte) (int, error) { +func (p *UpdateBuiltinEvaluatorTagsResponse) FastReadField1(buf []byte) (int, error) { offset := 0 _field := evaluator.NewEvaluatorVersion() if l, err := _field.FastRead(buf[offset:]); err != nil { @@ -14876,7 +14770,7 @@ func (p *PublishBuiltinEvaluatorResponse) FastReadField1(buf []byte) (int, error return offset, nil } -func (p *PublishBuiltinEvaluatorResponse) FastReadField255(buf []byte) (int, error) { +func (p *UpdateBuiltinEvaluatorTagsResponse) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBaseResp() if l, err := _field.FastRead(buf[offset:]); err != nil { @@ -14888,11 +14782,11 @@ func (p *PublishBuiltinEvaluatorResponse) FastReadField255(buf []byte) (int, err return offset, nil } -func (p *PublishBuiltinEvaluatorResponse) FastWrite(buf []byte) int { +func (p *UpdateBuiltinEvaluatorTagsResponse) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *PublishBuiltinEvaluatorResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateBuiltinEvaluatorTagsResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -14902,7 +14796,7 @@ func (p *PublishBuiltinEvaluatorResponse) FastWriteNocopy(buf []byte, w thrift.N return offset } -func (p *PublishBuiltinEvaluatorResponse) BLength() int { +func (p *UpdateBuiltinEvaluatorTagsResponse) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -14912,36 +14806,36 @@ func (p *PublishBuiltinEvaluatorResponse) BLength() int { return l } -func (p *PublishBuiltinEvaluatorResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateBuiltinEvaluatorTagsResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) offset += p.Version.FastWriteNocopy(buf[offset:], w) return offset } -func (p *PublishBuiltinEvaluatorResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateBuiltinEvaluatorTagsResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) return offset } -func (p *PublishBuiltinEvaluatorResponse) field1Length() int { +func (p *UpdateBuiltinEvaluatorTagsResponse) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.Version.BLength() return l } -func (p *PublishBuiltinEvaluatorResponse) field255Length() int { +func (p *UpdateBuiltinEvaluatorTagsResponse) field255Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.BaseResp.BLength() return l } -func (p *PublishBuiltinEvaluatorResponse) DeepCopy(s interface{}) error { - src, ok := s.(*PublishBuiltinEvaluatorResponse) +func (p *UpdateBuiltinEvaluatorTagsResponse) DeepCopy(s interface{}) error { + src, ok := s.(*UpdateBuiltinEvaluatorTagsResponse) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } @@ -22634,7 +22528,7 @@ func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) DeepCopy(s interface{}) er return nil } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) FastRead(buf []byte) (int, error) { var err error var offset int @@ -22678,14 +22572,14 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastRead(buf []byte) (int, ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorArgs[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastReadField1(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := NewPublishBuiltinEvaluatorRequest() + _field := NewUpdateBuiltinEvaluatorTagsRequest() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -22695,11 +22589,11 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastReadField1(buf []byte) return offset, nil } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastWrite(buf []byte) int { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -22708,7 +22602,7 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) FastWriteNocopy(buf []byte return offset } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) BLength() int { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -22717,29 +22611,29 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) BLength() int { return l } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) offset += p.Req.FastWriteNocopy(buf[offset:], w) return offset } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) field1Length() int { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.Req.BLength() return l } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServicePublishBuiltinEvaluatorArgs) +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _req *PublishBuiltinEvaluatorRequest + var _req *UpdateBuiltinEvaluatorTagsRequest if src.Req != nil { - _req = &PublishBuiltinEvaluatorRequest{} + _req = &UpdateBuiltinEvaluatorTagsRequest{} if err := _req.DeepCopy(src.Req); err != nil { return err } @@ -22749,7 +22643,7 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) DeepCopy(s interface{}) er return nil } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastRead(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) FastRead(buf []byte) (int, error) { var err error var offset int @@ -22793,14 +22687,14 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastRead(buf []byte) (in ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServicePublishBuiltinEvaluatorResult[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceUpdateBuiltinEvaluatorTagsResult[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastReadField0(buf []byte) (int, error) { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) FastReadField0(buf []byte) (int, error) { offset := 0 - _field := NewPublishBuiltinEvaluatorResponse() + _field := NewUpdateBuiltinEvaluatorTagsResponse() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { @@ -22810,11 +22704,11 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastReadField0(buf []byt return offset, nil } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastWrite(buf []byte) int { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField0(buf[offset:], w) @@ -22823,7 +22717,7 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorResult) FastWriteNocopy(buf []by return offset } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) BLength() int { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) BLength() int { l := 0 if p != nil { l += p.field0Length() @@ -22832,7 +22726,7 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorResult) BLength() int { return l } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetSuccess() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) @@ -22841,7 +22735,7 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorResult) fastWriteField0(buf []by return offset } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) field0Length() int { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) field0Length() int { l := 0 if p.IsSetSuccess() { l += thrift.Binary.FieldBeginLength() @@ -22850,15 +22744,15 @@ func (p *EvaluatorServicePublishBuiltinEvaluatorResult) field0Length() int { return l } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) DeepCopy(s interface{}) error { - src, ok := s.(*EvaluatorServicePublishBuiltinEvaluatorResult) +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } - var _success *PublishBuiltinEvaluatorResponse + var _success *UpdateBuiltinEvaluatorTagsResponse if src.Success != nil { - _success = &PublishBuiltinEvaluatorResponse{} + _success = &UpdateBuiltinEvaluatorTagsResponse{} if err := _success.DeepCopy(src.Success); err != nil { return err } @@ -23318,11 +23212,11 @@ func (p *EvaluatorServiceDebugBuiltinEvaluatorResult) GetResult() interface{} { return p.Success } -func (p *EvaluatorServicePublishBuiltinEvaluatorArgs) GetFirstArgument() interface{} { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) GetFirstArgument() interface{} { return p.Req } -func (p *EvaluatorServicePublishBuiltinEvaluatorResult) GetResult() interface{} { +func (p *EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) GetResult() interface{} { return p.Success } diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go index 61edcc981..671f74cb9 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go @@ -38,7 +38,7 @@ type Client interface { UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) - PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) + UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.UpdateBuiltinEvaluatorTagsResponse, err error) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) } @@ -206,9 +206,9 @@ func (p *kEvaluatorServiceClient) DebugBuiltinEvaluator(ctx context.Context, req return p.kClient.DebugBuiltinEvaluator(ctx, req) } -func (p *kEvaluatorServiceClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { +func (p *kEvaluatorServiceClient) UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.UpdateBuiltinEvaluatorTagsResponse, err error) { ctx = client.NewCtxWithCallOptions(ctx, callOptions) - return p.kClient.PublishBuiltinEvaluator(ctx, req) + return p.kClient.UpdateBuiltinEvaluatorTags(ctx, req) } func (p *kEvaluatorServiceClient) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) { diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go index 557f92a15..ac18d9cd1 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go @@ -203,10 +203,10 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), - "PublishBuiltinEvaluator": kitex.NewMethodInfo( - publishBuiltinEvaluatorHandler, - newEvaluatorServicePublishBuiltinEvaluatorArgs, - newEvaluatorServicePublishBuiltinEvaluatorResult, + "UpdateBuiltinEvaluatorTags": kitex.NewMethodInfo( + updateBuiltinEvaluatorTagsHandler, + newEvaluatorServiceUpdateBuiltinEvaluatorTagsArgs, + newEvaluatorServiceUpdateBuiltinEvaluatorTagsResult, false, kitex.WithStreamingMode(kitex.StreamingNone), ), @@ -763,10 +763,10 @@ func newEvaluatorServiceDebugBuiltinEvaluatorResult() interface{} { return evaluator.NewEvaluatorServiceDebugBuiltinEvaluatorResult() } -func publishBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { - realArg := arg.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs) - realResult := result.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorResult) - success, err := handler.(evaluator.EvaluatorService).PublishBuiltinEvaluator(ctx, realArg.Req) +func updateBuiltinEvaluatorTagsHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) + realResult := result.(*evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) + success, err := handler.(evaluator.EvaluatorService).UpdateBuiltinEvaluatorTags(ctx, realArg.Req) if err != nil { return err } @@ -774,12 +774,12 @@ func publishBuiltinEvaluatorHandler(ctx context.Context, handler interface{}, ar return nil } -func newEvaluatorServicePublishBuiltinEvaluatorArgs() interface{} { - return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorArgs() +func newEvaluatorServiceUpdateBuiltinEvaluatorTagsArgs() interface{} { + return evaluator.NewEvaluatorServiceUpdateBuiltinEvaluatorTagsArgs() } -func newEvaluatorServicePublishBuiltinEvaluatorResult() interface{} { - return evaluator.NewEvaluatorServicePublishBuiltinEvaluatorResult() +func newEvaluatorServiceUpdateBuiltinEvaluatorTagsResult() interface{} { + return evaluator.NewEvaluatorServiceUpdateBuiltinEvaluatorTagsResult() } func listEvaluatorTagsHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { @@ -1083,11 +1083,11 @@ func (p *kClient) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.Debu return _result.GetSuccess(), nil } -func (p *kClient) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest) (r *evaluator.PublishBuiltinEvaluatorResponse, err error) { - var _args evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs +func (p *kClient) UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest) (r *evaluator.UpdateBuiltinEvaluatorTagsResponse, err error) { + var _args evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs _args.Req = req - var _result evaluator.EvaluatorServicePublishBuiltinEvaluatorResult - if err = p.c.Call(ctx, "PublishBuiltinEvaluator", &_args, &_result); err != nil { + var _result evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsResult + if err = p.c.Call(ctx, "UpdateBuiltinEvaluatorTags", &_args, &_result); err != nil { return } return _result.GetSuccess(), nil diff --git a/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go b/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go index 22e8466b6..3ba24f59e 100644 --- a/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go +++ b/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go @@ -611,13 +611,13 @@ func (l *LocalEvaluatorService) DebugBuiltinEvaluator(ctx context.Context, req * return result.GetSuccess(), nil } -// PublishBuiltinEvaluator -// 发布预置评估器 -func (l *LocalEvaluatorService) PublishBuiltinEvaluator(ctx context.Context, req *evaluator.PublishBuiltinEvaluatorRequest, callOptions ...callopt.Option) (*evaluator.PublishBuiltinEvaluatorResponse, error) { +// UpdateBuiltinEvaluatorTags +// 更新预置评估器tag +func (l *LocalEvaluatorService) UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest, callOptions ...callopt.Option) (*evaluator.UpdateBuiltinEvaluatorTagsResponse, error) { chain := l.mds(func(ctx context.Context, in, out interface{}) error { - arg := in.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs) - result := out.(*evaluator.EvaluatorServicePublishBuiltinEvaluatorResult) - resp, err := l.impl.PublishBuiltinEvaluator(ctx, arg.Req) + arg := in.(*evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs) + result := out.(*evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsResult) + resp, err := l.impl.UpdateBuiltinEvaluatorTags(ctx, arg.Req) if err != nil { return err } @@ -625,9 +625,9 @@ func (l *LocalEvaluatorService) PublishBuiltinEvaluator(ctx context.Context, req return nil }) - arg := &evaluator.EvaluatorServicePublishBuiltinEvaluatorArgs{Req: req} - result := &evaluator.EvaluatorServicePublishBuiltinEvaluatorResult{} - ctx = l.injectRPCInfo(ctx, "PublishBuiltinEvaluator") + arg := &evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsArgs{Req: req} + result := &evaluator.EvaluatorServiceUpdateBuiltinEvaluatorTagsResult{} + ctx = l.injectRPCInfo(ctx, "UpdateBuiltinEvaluatorTags") if err := chain(ctx, arg, result); err != nil { return nil, err } diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index fe886b206..738196065 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -258,9 +258,9 @@ func (e *EvaluatorHandlerImpl) CreateEvaluator(ctx context.Context, request *eva // 转换请求参数为领域对象 evaluatorDO := evaluatorconvertor.ConvertEvaluatorDTO2DO(request.GetEvaluator()) - // 统一走 CreateEvaluator，是否创建tag由repo层依据 do.Builtin 决定 - var evaluatorID int64 - evaluatorID, err = e.evaluatorService.CreateEvaluator(ctx, evaluatorDO, request.GetCid()) + // 统一走 CreateEvaluator，是否创建tag由repo层依据 do.Builtin 决定 + var evaluatorID int64 + evaluatorID, err = e.evaluatorService.CreateEvaluator(ctx, evaluatorDO, request.GetCid()) if err != nil { return nil, err } @@ -421,29 +421,7 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluatorDraft(ctx context.Context, request evaluatorDTO := evaluatorconvertor.ConvertEvaluatorDO2DTO(evaluatorDO) evaluatorDTO.CurrentVersion.EvaluatorContent = request.EvaluatorContent evaluatorDTO.DraftSubmitted = ptr.Of(false) - - // 根据Builtin参数选择不同的更新方法 - if request.GetBuiltin() { - // auth builtin evaluator - err = e.authBuiltinManagement(ctx, request.GetWorkspaceID(), spaceTypeBuiltin) - if err != nil { - return nil, err - } - // 处理 Tags 字段 - if request.Tags != nil { - // 将 DTO 的 Tags 转换为 DO 的 Tags - tags := make(map[entity.EvaluatorTagKey][]string) - for tagKey, tagValues := range request.Tags { - convertedTagKey := evaluatorconvertor.ConvertEvaluatorTagKeyDTO2DO(tagKey) - tags[convertedTagKey] = tagValues - } - // 将转换后的 tags 设置到 evaluatorDTO 中 - evaluatorDTO.Tags = request.Tags // 直接使用 request.Tags，因为 evaluatorDTO.Tags 的类型与 request.Tags 相同 - } - err = e.evaluatorService.UpdateBuiltinEvaluatorDraft(ctx, evaluatorconvertor.ConvertEvaluatorDTO2DO(evaluatorDTO)) - } else { - err = e.evaluatorService.UpdateEvaluatorDraft(ctx, evaluatorconvertor.ConvertEvaluatorDTO2DO(evaluatorDTO)) - } + err = e.evaluatorService.UpdateEvaluatorDraft(ctx, evaluatorconvertor.ConvertEvaluatorDTO2DO(evaluatorDTO)) if err != nil { return nil, err } @@ -1542,24 +1520,30 @@ func (e *EvaluatorHandlerImpl) DebugBuiltinEvaluator(ctx context.Context, reques }, nil } -// PublishBuiltinEvaluator 发布预置评估器 -func (e *EvaluatorHandlerImpl) PublishBuiltinEvaluator(ctx context.Context, request *evaluator.PublishBuiltinEvaluatorRequest) (resp *evaluator.PublishBuiltinEvaluatorResponse, err error) { - // 鉴权 - err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ - ObjectID: strconv.FormatInt(request.GetEvaluatorID(), 10), - SpaceID: 0, // 预置评估器不需要空间权限 - ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, - }) +// UpdateBuiltinEvaluatorTags 发布预置评估器 +func (e *EvaluatorHandlerImpl) UpdateBuiltinEvaluatorTags(ctx context.Context, request *evaluatorservice.UpdateBuiltinEvaluatorTagsRequest) (resp *evaluatorservice.UpdateBuiltinEvaluatorTagsResponse, err error) { + // 1) 查 Evaluator 实体，判断是否属于预置评估器管理空间 + evaluatorDO, err := e.evaluatorService.GetEvaluator(ctx, request.GetWorkspaceID(), request.GetEvaluatorID(), false) if err != nil { return nil, err } + if evaluatorDO == nil { + return nil, errorx.NewByCode(errno.EvaluatorNotExistCode) + } + // 校验是否在builtin管理空间 + if err := e.authBuiltinManagement(ctx, request.GetWorkspaceID(), spaceTypeBuiltin); err != nil { + return nil, err + } - // TODO: 实现预置评估器发布逻辑 - // 这里需要根据具体的预置评估器发布需求来实现 - return &evaluator.PublishBuiltinEvaluatorResponse{ - Version: &evaluatordto.EvaluatorVersion{ - // 返回空的版本信息，具体实现需要根据业务需求 - }, + // 2) 调用 service，按 evaluatorID + version 更新标签 + ev, err := e.evaluatorService.UpdateBuiltinEvaluatorTags(ctx, request.GetEvaluatorID(), request.GetVersion(), evaluatorconvertor.ConvertEvaluatorTagsDTO2DO(request.GetTags())) + if err != nil { + return nil, err + } + + // 3) 返回版本信息 + return &evaluatorservice.UpdateBuiltinEvaluatorTagsResponse{ + Version: evaluatorconvertor.ConvertEvaluatorDO2DTO(ev).GetCurrentVersion(), }, nil } diff --git a/backend/modules/evaluation/domain/repo/evaluator.go b/backend/modules/evaluation/domain/repo/evaluator.go index 29a7e791f..6a031be5c 100644 --- a/backend/modules/evaluation/domain/repo/evaluator.go +++ b/backend/modules/evaluation/domain/repo/evaluator.go @@ -19,9 +19,10 @@ type IEvaluatorRepo interface { BatchDeleteEvaluator(ctx context.Context, ids []int64, userID string) error UpdateEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error - UpdateBuiltinEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error UpdateEvaluatorMeta(ctx context.Context, id int64, name, description, userID string) error UpdateBuiltinEvaluatorMeta(ctx context.Context, id int64, name, description, benchmark, vendor, userID string) error + // UpdateEvaluatorVersionTags 根据版本ID全量更新标签：不存在的新增，不在传入列表中的删除 + UpdateEvaluatorVersionTags(ctx context.Context, versionID int64, tags map[entity.EvaluatorTagKey][]string) error BatchGetEvaluatorMetaByID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) BatchGetEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) @@ -44,7 +45,7 @@ type ListEvaluatorRequest struct { SearchName string CreatorIDs []int64 EvaluatorType []entity.EvaluatorType - FilterOption *entity.EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 + FilterOption *entity.EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 PageSize int32 PageNum int32 OrderBy []*entity.OrderBy @@ -79,6 +80,6 @@ type ListBuiltinEvaluatorRequest struct { // ListBuiltinEvaluatorResponse 查询内置评估器的响应 type ListBuiltinEvaluatorResponse struct { - TotalCount int64 `json:"total_count"` // 总数量 - Evaluators []*entity.Evaluator `json:"evaluators"` // 评估器列表 + TotalCount int64 `json:"total_count"` // 总数量 + Evaluators []*entity.Evaluator `json:"evaluators"` // 评估器列表 } diff --git a/backend/modules/evaluation/domain/service/evaluator.go b/backend/modules/evaluation/domain/service/evaluator.go index 3ffca720c..c47856c3b 100644 --- a/backend/modules/evaluation/domain/service/evaluator.go +++ b/backend/modules/evaluation/domain/service/evaluator.go @@ -23,21 +23,21 @@ type EvaluatorService interface { CreateEvaluator(ctx context.Context, evaluator *entity.Evaluator, cid string) (int64, error) // UpdateEvaluatorMeta 修改 evaluator_version UpdateEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, userID string) error - // UpdateBuiltinEvaluatorMeta 修改内置评估器元信息（包含benchmark/vendor） - UpdateBuiltinEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, benchmark, vendor, userID string) error + // UpdateBuiltinEvaluatorMeta 修改内置评估器元信息（包含benchmark/vendor） + UpdateBuiltinEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, benchmark, vendor, userID string) error + // UpdateBuiltinEvaluatorTags 更新内置评估器版本的标签（按 evaluator_id + version 定位版本） + UpdateBuiltinEvaluatorTags(ctx context.Context, evaluatorID int64, version string, tags map[entity.EvaluatorTagKey][]string) (*entity.Evaluator, error) // UpdateEvaluatorDraft 修改 evaluator_version draft UpdateEvaluatorDraft(ctx context.Context, versionDO *entity.Evaluator) error - // UpdateBuiltinEvaluatorDraft 修改内置评估器草稿，包括tag的增量更新 - UpdateBuiltinEvaluatorDraft(ctx context.Context, versionDO *entity.Evaluator) error // DeleteEvaluator 删除 evaluator_version DeleteEvaluator(ctx context.Context, evaluatorIDs []int64, userID string) error // RunEvaluator evaluator_version 运行 RunEvaluator(ctx context.Context, request *entity.RunEvaluatorRequest) (*entity.EvaluatorRecord, error) // DebugEvaluator 调试 evaluator_version DebugEvaluator(ctx context.Context, evaluatorDO *entity.Evaluator, inputData *entity.EvaluatorInputData) (*entity.EvaluatorOutputData, error) - // GetEvaluatorVersion 按 version id 单个查询 evaluator_version version - // builtin=true 时查询内置评估器，需传入 spaceID；否则查询普通评估器 - GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, builtin bool) (*entity.Evaluator, error) + // GetEvaluatorVersion 按 version id 单个查询 evaluator_version version + // builtin=true 时查询内置评估器，需传入 spaceID；否则查询普通评估器 + GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, builtin bool) (*entity.Evaluator, error) // BatchGetEvaluatorVersion 按 version id 批量查询 evaluator_version version BatchGetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionIDs []int64, includeDeleted bool) ([]*entity.Evaluator, error) // ListEvaluatorVersion 按条件查询 evaluator_version version diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index 7d624ab8a..eb620a8a1 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -258,6 +258,34 @@ func (e *EvaluatorServiceImpl) UpdateBuiltinEvaluatorMeta(ctx context.Context, i return nil } +// UpdateBuiltinEvaluatorTags 根据 evaluatorID + version 更新该版本的标签 +func (e *EvaluatorServiceImpl) UpdateBuiltinEvaluatorTags(ctx context.Context, evaluatorID int64, version string, tags map[entity.EvaluatorTagKey][]string) (*entity.Evaluator, error) { + // 查出该 evaluator 的指定版本，拿到版本ID + listReq := &repo.ListEvaluatorVersionRequest{ + EvaluatorID: evaluatorID, + QueryVersions: []string{version}, + PageSize: 1, + PageNum: 1, + OrderBy: []*entity.OrderBy{}, + } + result, err := e.evaluatorRepo.ListEvaluatorVersion(ctx, listReq) + if err != nil { + return nil, err + } + if len(result.Versions) == 0 { + return nil, errorx.NewByCode(errno.EvaluatorVersionNotFoundCode) + } + ev := result.Versions[0] + versionID := ev.GetEvaluatorVersionID() + + // 调用 repo 更新该版本的标签 + if err := e.evaluatorRepo.UpdateEvaluatorVersionTags(ctx, versionID, tags); err != nil { + return nil, err + } + // 回填最新标签到返回对象（可选：这里仅返回版本，不做额外查询） + return ev, nil +} + // 校验UpdateEvaluator参数合法性 func (e *EvaluatorServiceImpl) validateUpdateEvaluatorMetaRequest(ctx context.Context, id, spaceID int64, name string) error { // 校验评估器名称是否已存在 @@ -283,16 +311,6 @@ func (e *EvaluatorServiceImpl) UpdateEvaluatorDraft(ctx context.Context, version return e.evaluatorRepo.UpdateEvaluatorDraft(ctx, versionDO) } -// UpdateBuiltinEvaluatorDraft 修改内置评估器草稿，包括tag的增量更新 -func (e *EvaluatorServiceImpl) UpdateBuiltinEvaluatorDraft(ctx context.Context, versionDO *entity.Evaluator) error { - versionDO.BaseInfo.SetUpdatedAt(gptr.Of(time.Now().UnixMilli())) - userIDInContext := session.UserIDInCtxOrEmpty(ctx) - versionDO.BaseInfo.SetUpdatedBy(&entity.UserInfo{ - UserID: gptr.Of(userIDInContext), - }) - return e.evaluatorRepo.UpdateBuiltinEvaluatorDraft(ctx, versionDO) -} - // DeleteEvaluator 删除 evaluator_version func (e *EvaluatorServiceImpl) DeleteEvaluator(ctx context.Context, evaluatorIDs []int64, userID string) error { return e.evaluatorRepo.BatchDeleteEvaluator(ctx, evaluatorIDs, userID) diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 8c7be236d..5ead8bb9b 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -6,7 +6,6 @@ package evaluator import ( "context" - "fmt" "strconv" "github.com/bytedance/gg/gptr" @@ -59,24 +58,24 @@ func (r *EvaluatorRepoImpl) SubmitEvaluatorVersion(ctx context.Context, evaluato if err != nil { return err } - err = r.evaluatorVersionDao.CreateEvaluatorVersion(ctx, evaluatorVersionPO, opt) + err = r.evaluatorVersionDao.CreateEvaluatorVersion(ctx, evaluatorVersionPO, opt) if err != nil { return err } - // 如果是预置评估器，且携带了标签，则为本次提交的版本ID创建tags - if evaluator.Builtin && len(evaluator.Tags) > 0 { - // 获取用户ID - userID := session.UserIDInCtxOrEmpty(ctx) - // 将 map[EvaluatorTagKey][]string 转为 map[string][]string - tags := make(map[string][]string) - for tagKey, tagValues := range evaluator.Tags { - tags[string(tagKey)] = tagValues - } - // 以提交版本的 evaluator_version_id 作为 source_id - if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorVersionPO.ID, int32(entity.EvaluatorTagKeyType_Evaluator), userID, tags, opt); err != nil { - return err - } - } + // 如果是预置评估器，且携带了标签，则为本次提交的版本ID创建tags + if evaluator.Builtin && len(evaluator.Tags) > 0 { + // 获取用户ID + userID := session.UserIDInCtxOrEmpty(ctx) + // 将 map[EvaluatorTagKey][]string 转为 map[string][]string + tags := make(map[string][]string) + for tagKey, tagValues := range evaluator.Tags { + tags[string(tagKey)] = tagValues + } + // 以提交版本的 evaluator_version_id 作为 source_id + if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorVersionPO.ID, int32(entity.EvaluatorTagKeyType_Evaluator), userID, tags, opt); err != nil { + return err + } + } return nil }) if err != nil { @@ -105,127 +104,6 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorDraft(ctx context.Context, evaluator }) } -// UpdateBuiltinEvaluatorDraft 更新内置评估器草稿，包括tag的增量更新 -func (r *EvaluatorRepoImpl) UpdateBuiltinEvaluatorDraft(ctx context.Context, evaluator *entity.Evaluator) error { - po, err := convertor.ConvertEvaluatorVersionDO2PO(evaluator) - if err != nil { - return err - } - - // 获取用户ID - userID := session.UserIDInCtxOrEmpty(ctx) - - return r.dbProvider.Transaction(ctx, func(tx *gorm.DB) error { - opt := db.WithTransaction(tx) - - // 更新Evaluator最新版本 - err := r.evaluatorDao.UpdateEvaluatorDraftSubmitted(ctx, po.EvaluatorID, false, gptr.Indirect(evaluator.BaseInfo.UpdatedBy.UserID), opt) - if err != nil { - return err - } - - // 更新evaluator版本信息 - err = r.evaluatorVersionDao.UpdateEvaluatorDraft(ctx, po, opt) - if err != nil { - return err - } - - // 处理tag的增量更新 - if evaluator.Tags != nil { - // 获取草稿版本的ID作为source_id - draftVersions, err := r.evaluatorVersionDao.BatchGetEvaluatorDraftByEvaluatorID(ctx, []int64{po.EvaluatorID}, false, opt) - if err != nil { - return err - } - if len(draftVersions) == 0 { - return fmt.Errorf("draft version not found for evaluator %d", po.EvaluatorID) - } - draftVersion := draftVersions[0] - - // 获取现有的tags - existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{draftVersion.ID}, int32(entity.EvaluatorTagKeyType_Evaluator), opt) - if err != nil { - return err - } - - // 构建现有tags的map - existingTagMap := make(map[string]map[string]bool) // tagKey -> {tagValue: true} - for _, tag := range existingTags { - if existingTagMap[tag.TagKey] == nil { - existingTagMap[tag.TagKey] = make(map[string]bool) - } - existingTagMap[tag.TagKey][tag.TagValue] = true - } - - // 构建新tags的map - newTagMap := make(map[string]map[string]bool) // tagKey -> {tagValue: true} - for tagKey, tagValues := range evaluator.Tags { - tagKeyStr := string(tagKey) - if newTagMap[tagKeyStr] == nil { - newTagMap[tagKeyStr] = make(map[string]bool) - } - for _, tagValue := range tagValues { - newTagMap[tagKeyStr][tagValue] = true - } - } - - // 找出需要删除的tags（在现有tags中但不在新tags中） - tagsToDelete := make(map[string][]string) - for tagKey, existingValues := range existingTagMap { - if newValues, exists := newTagMap[tagKey]; exists { - // 该tagKey存在，检查需要删除的值 - for tagValue := range existingValues { - if !newValues[tagValue] { - tagsToDelete[tagKey] = append(tagsToDelete[tagKey], tagValue) - } - } - } else { - // 该tagKey不存在，删除所有值 - for tagValue := range existingValues { - tagsToDelete[tagKey] = append(tagsToDelete[tagKey], tagValue) - } - } - } - - // 找出需要新增的tags（在新tags中但不在现有tags中） - tagsToCreate := make(map[string][]string) - for tagKey, newValues := range newTagMap { - if existingValues, exists := existingTagMap[tagKey]; exists { - // 该tagKey存在，检查需要新增的值 - for tagValue := range newValues { - if !existingValues[tagValue] { - tagsToCreate[tagKey] = append(tagsToCreate[tagKey], tagValue) - } - } - } else { - // 该tagKey不存在，新增所有值 - for tagValue := range newValues { - tagsToCreate[tagKey] = append(tagsToCreate[tagKey], tagValue) - } - } - } - - // 删除不需要的tags - if len(tagsToDelete) > 0 { - err = r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, draftVersion.ID, int32(entity.EvaluatorTagKeyType_Evaluator), tagsToDelete, opt) - if err != nil { - return err - } - } - - // 新增需要的tags - if len(tagsToCreate) > 0 { - err = r.tagDAO.BatchCreateEvaluatorTags(ctx, draftVersion.ID, int32(entity.EvaluatorTagKeyType_Evaluator), userID, tagsToCreate, opt) - if err != nil { - return err - } - } - } - - return nil - }) -} - func (r *EvaluatorRepoImpl) BatchGetEvaluatorMetaByID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { evaluatorPOS, err := r.evaluatorDao.BatchGetEvaluatorByID(ctx, ids, includeDeleted) if err != nil { @@ -299,7 +177,7 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorDraftByEvaluatorID(ctx context.Cont for _, evaluatorVersionPO := range evaluatorVersionPOS { evaluatorID2VersionPO[evaluatorVersionPO.EvaluatorID] = evaluatorVersionPO } - evaluatorPOS, err := r.evaluatorDao.BatchGetEvaluatorByID(ctx, ids, includeDeleted, opts...) + evaluatorPOS, err := r.evaluatorDao.BatchGetEvaluatorByID(ctx, ids, includeDeleted, opts...) if err != nil { return nil, err } @@ -307,30 +185,30 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorDraftByEvaluatorID(ctx context.Cont for _, evaluatorPO := range evaluatorPOS { evaluatorMap[evaluatorPO.ID] = evaluatorPO } - // 如果是预置评估器，收集草稿版本ID用于批量查询tags（以版本ID为source_id） - builtinVersionIDs := make([]int64, 0) - for _, evaluatorPO := range evaluatorPOS { - if evaluatorPO.Builtin == 1 { - if evPO, ok := evaluatorID2VersionPO[evaluatorPO.ID]; ok && evPO != nil { - builtinVersionIDs = append(builtinVersionIDs, evPO.ID) - } - } - } - // 批量查询所有tags - var allTags []*model.EvaluatorTag - if len(builtinVersionIDs) > 0 { - allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, builtinVersionIDs, int32(entity.EvaluatorTagKeyType_Evaluator), opts...) - if err != nil { - allTags = []*model.EvaluatorTag{} - } - } - // 将tags按sourceID分组 - tagsBySourceID := make(map[int64][]*model.EvaluatorTag) - for _, tag := range allTags { - tagsBySourceID[tag.SourceID] = append(tagsBySourceID[tag.SourceID], tag) - } + // 如果是预置评估器，收集草稿版本ID用于批量查询tags（以版本ID为source_id） + builtinVersionIDs := make([]int64, 0) + for _, evaluatorPO := range evaluatorPOS { + if evaluatorPO.Builtin == 1 { + if evPO, ok := evaluatorID2VersionPO[evaluatorPO.ID]; ok && evPO != nil { + builtinVersionIDs = append(builtinVersionIDs, evPO.ID) + } + } + } + // 批量查询所有tags + var allTags []*model.EvaluatorTag + if len(builtinVersionIDs) > 0 { + allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, builtinVersionIDs, int32(entity.EvaluatorTagKeyType_Evaluator), opts...) + if err != nil { + allTags = []*model.EvaluatorTag{} + } + } + // 将tags按sourceID分组 + tagsBySourceID := make(map[int64][]*model.EvaluatorTag) + for _, tag := range allTags { + tagsBySourceID[tag.SourceID] = append(tagsBySourceID[tag.SourceID], tag) + } evaluatorDOList := make([]*entity.Evaluator, 0, len(evaluatorPOS)) - for _, evaluatorPO := range evaluatorPOS { + for _, evaluatorPO := range evaluatorPOS { evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorPO) if evaluatorVersionPO, exist := evaluatorID2VersionPO[evaluatorPO.ID]; exist { evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) @@ -338,10 +216,10 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorDraftByEvaluatorID(ctx context.Cont return nil, err } evaluatorDO.SetEvaluatorVersion(evaluatorVersionDO) - // 如果是预置评估器，回填该草稿版本的tags（以版本ID为source_id） - if evaluatorPO.Builtin == 1 { - r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.ID, tagsBySourceID) - } + // 如果是预置评估器，回填该草稿版本的tags（以版本ID为source_id） + if evaluatorPO.Builtin == 1 { + r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.ID, tagsBySourceID) + } } evaluatorDOList = append(evaluatorDOList, evaluatorDO) } @@ -423,10 +301,7 @@ func (r *EvaluatorRepoImpl) CreateEvaluator(ctx context.Context, do *entity.Eval evaluatorVersionPO.EvaluatorID = evaluatorPO.ID - // 获取用户ID（用于可能的内置评估器 tag 创建） - userID := session.UserIDInCtxOrEmpty(ctx) - - err = r.dbProvider.Transaction(ctx, func(tx *gorm.DB) error { + err = r.dbProvider.Transaction(ctx, func(tx *gorm.DB) error { opt := db.WithTransaction(tx) err = r.evaluatorDao.CreateEvaluator(ctx, evaluatorPO, opt) @@ -439,23 +314,13 @@ func (r *EvaluatorRepoImpl) CreateEvaluator(ctx context.Context, do *entity.Eval if err != nil { return err } - evaluatorVersionPO.ID = genIDs[2] + evaluatorVersionPO.ID = genIDs[2] evaluatorVersionPO.Version = consts.EvaluatorVersionDraftKey evaluatorVersionPO.Description = gptr.Of("") err = r.evaluatorVersionDao.CreateEvaluatorVersion(ctx, evaluatorVersionPO, opt) if err != nil { return err } - // 如果是内置评估器，创建 tags（以草稿版本ID为 source_id） - if do.Builtin && len(do.Tags) > 0 { - tags := make(map[string][]string) - for tagKey, tagValues := range do.Tags { - tags[string(tagKey)] = tagValues - } - if err = r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorVersionPO.ID, int32(entity.EvaluatorTagKeyType_Evaluator), userID, tags, opt); err != nil { - return err - } - } return nil }) if err != nil { @@ -518,12 +383,12 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorMeta(ctx context.Context, id int64, n // UpdateBuiltinEvaluatorMeta 更新内置评估器的 benchmark 和 vendor 字段 func (r *EvaluatorRepoImpl) UpdateBuiltinEvaluatorMeta(ctx context.Context, id int64, name, description, benchmark, vendor, userID string) error { po := &model.Evaluator{ - ID: id, - Name: gptr.Of(name), + ID: id, + Name: gptr.Of(name), Description: gptr.Of(description), - Benchmark: gptr.Of(benchmark), - Vendor: gptr.Of(vendor), - UpdatedBy: userID, + Benchmark: gptr.Of(benchmark), + Vendor: gptr.Of(vendor), + UpdatedBy: userID, } err := r.evaluatorDao.UpdateBuiltinEvaluatorMeta(ctx, po) if err != nil { @@ -532,6 +397,67 @@ func (r *EvaluatorRepoImpl) UpdateBuiltinEvaluatorMeta(ctx context.Context, id i return nil } +// UpdateEvaluatorVersionTags 根据版本ID全量更新标签：不存在的新增，不在传入列表中的删除 +func (r *EvaluatorRepoImpl) UpdateEvaluatorVersionTags(ctx context.Context, versionID int64, tags map[entity.EvaluatorTagKey][]string) error { + return r.dbProvider.Transaction(ctx, func(tx *gorm.DB) error { + opt := db.WithTransaction(tx) + // 查询当前已有标签 + existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{versionID}, int32(entity.EvaluatorTagKeyType_Evaluator), opt) + if err != nil { + return err + } + // 构建现有集合 + existing := make(map[string]map[string]bool) + for _, t := range existingTags { + if _, ok := existing[t.TagKey]; !ok { + existing[t.TagKey] = make(map[string]bool) + } + existing[t.TagKey][t.TagValue] = true + } + // 目标集 + target := make(map[string]map[string]bool) + for k, vs := range tags { + kstr := string(k) + if _, ok := target[kstr]; !ok { + target[kstr] = make(map[string]bool) + } + for _, v := range vs { + target[kstr][v] = true + } + } + // 计算需要删除 + del := make(map[string][]string) + for k, vals := range existing { + for v := range vals { + if !target[k][v] { + del[k] = append(del[k], v) + } + } + } + if len(del) > 0 { + if err := r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, versionID, int32(entity.EvaluatorTagKeyType_Evaluator), del, opt); err != nil { + return err + } + } + // 计算需要新增 + add := make(map[string][]string) + for k, vals := range target { + for v := range vals { + if !existing[k][v] { + add[k] = append(add[k], v) + } + } + } + if len(add) > 0 { + userID := session.UserIDInCtxOrEmpty(ctx) + if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, versionID, int32(entity.EvaluatorTagKeyType_Evaluator), userID, add, opt); err != nil { + return err + } + } + return nil + }) +} + // BatchDeleteEvaluator 根据 ID 删除 Evaluator func (r *EvaluatorRepoImpl) BatchDeleteEvaluator(ctx context.Context, ids []int64, userID string) (err error) { return r.dbProvider.Transaction(ctx, func(tx *gorm.DB) error { @@ -633,9 +559,9 @@ func (r *EvaluatorRepoImpl) ListBuiltinEvaluator(ctx context.Context, req *repo. // 构建DAO层查询请求 daoReq := &mysql.ListEvaluatorRequest{ SpaceID: req.SpaceID, - SearchName: "", // 内置评估器不需要名称搜索 - CreatorIDs: []int64{}, // 内置评估器不需要创建者过滤 - EvaluatorType: []int32{}, // 可以根据需要添加类型过滤 + SearchName: "", // 内置评估器不需要名称搜索 + CreatorIDs: []int64{}, // 内置评估器不需要创建者过滤 + EvaluatorType: []int32{}, // 可以根据需要添加类型过滤 IDs: evaluatorIDs, // 使用筛选后的IDs PageSize: req.PageSize, PageNum: req.PageNum, @@ -711,16 +637,16 @@ func (r *EvaluatorRepoImpl) BatchGetBuiltinEvaluatorByVersionID(ctx context.Cont evaluatorMap[evaluatorPO.ID] = evaluatorPO } - // 收集所有 evaluator_version 的ID用于查询tags（以版本ID为source_id） - versionIDs := make([]int64, 0, len(evaluatorVersionPOS)) - for _, ev := range evaluatorVersionPOS { - versionIDs = append(versionIDs, ev.ID) - } + // 收集所有 evaluator_version 的ID用于查询tags（以版本ID为source_id） + versionIDs := make([]int64, 0, len(evaluatorVersionPOS)) + for _, ev := range evaluatorVersionPOS { + versionIDs = append(versionIDs, ev.ID) + } - // 批量查询所有tags（以版本ID为source_id） - var allTags []*model.EvaluatorTag - if len(versionIDs) > 0 { - allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, versionIDs, int32(entity.EvaluatorTagKeyType_Evaluator)) + // 批量查询所有tags（以版本ID为source_id） + var allTags []*model.EvaluatorTag + if len(versionIDs) > 0 { + allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, versionIDs, int32(entity.EvaluatorTagKeyType_Evaluator)) if err != nil { // 如果批量查询tags失败，记录错误但继续处理 allTags = []*model.EvaluatorTag{} @@ -769,8 +695,8 @@ func (r *EvaluatorRepoImpl) BatchGetBuiltinEvaluatorByVersionID(ctx context.Cont continue } - // 设置tags信息（以版本ID为source_id） - r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.ID, tagsBySourceID) + // 设置tags信息（以版本ID为source_id） + r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.ID, tagsBySourceID) evaluatorDOList = append(evaluatorDOList, evaluatorDO) } diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift index 6a3deb230..a709a8b61 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift @@ -73,8 +73,6 @@ struct UpdateEvaluatorDraftRequest { 2: required i64 workspace_id (api.body='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') // 空间 id 3: required evaluator.EvaluatorContent evaluator_content (api.body='evaluator_content', go.tag='json:"evaluator_content"') 4: required evaluator.EvaluatorType evaluator_type (api.body='evaluator_type', go.tag='json:"evaluator_type"') - 5: optional map> tags (api.body='tags', go.tag = 'json:"tags"') - 6: optional bool builtin (api.body='builtin', go.tag = 'json:"builtin"') // 是否预置评估器 255: optional base.Base Base } @@ -412,16 +410,16 @@ struct DebugBuiltinEvaluatorResponse { 255: base.BaseResp BaseResp } -struct PublishBuiltinEvaluatorRequest { +struct UpdateBuiltinEvaluatorTagsRequest { 1: required i64 evaluator_id (api.path='evaluator_id', api.js_conv='true', go.tag='json:"evaluator_id"') 2: required string version (api.body='version') 3: optional i64 workspace_id (api.body='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') - 4: optional evaluator.OperationType operation_type (api.body='operation_type', go.tag='json:"operation_type"') // 上下架操作类型 + 4: optional map> tags (api.body='tags', go.tag = 'json:"tags"') // 评估器标签 255: optional base.Base Base } -struct PublishBuiltinEvaluatorResponse { +struct UpdateBuiltinEvaluatorTagsResponse { 1: required evaluator.EvaluatorVersion version (api.body='version') 255: base.BaseResp BaseResp @@ -518,8 +516,8 @@ service EvaluatorService { // 调试预置评估器 DebugBuiltinEvaluatorResponse DebugBuiltinEvaluator(1: DebugBuiltinEvaluatorRequest req) (api.post="/api/evaluation/v1/evaluators/debug_builtin")// 调试预置评估器 - // 发布预置评估器 - PublishBuiltinEvaluatorResponse PublishBuiltinEvaluator(1: PublishBuiltinEvaluatorRequest req) (api.post="/api/evaluation/v1/evaluators/publish_builtin")// 发布预置评估器 + // 更新预置评估器tag + UpdateBuiltinEvaluatorTagsResponse UpdateBuiltinEvaluatorTags(1: UpdateBuiltinEvaluatorTagsRequest req) (api.post="/api/evaluation/v1/evaluators/update_builtin_tags")// 更新预置评估器 // 查询Tag ListEvaluatorTagsResponse ListEvaluatorTags(1: ListEvaluatorTagsRequest req) (api.post="/api/evaluation/v1/evaluators/list_tags") diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index 4baa4ff4d..8e0cedfea 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -43,11 +43,7 @@ const EvaluatorTagKey EvaluatorTagKey_Objective = "Objective" // 评估目 const EvaluatorTagKey EvaluatorTagKey_BusinessScenario = "BusinessScenario" // 业务场景 (安全风控/AI Coding等) const EvaluatorTagKey EvaluatorTagKey_BoxType = "BoxType" // 黑白盒类型 const EvaluatorTagKey EvaluatorTagKey_Name = "Name" // 评估器名称 - -// 上下架操作类型枚举 -typedef string OperationType(ts.enum="true") -const OperationType OperationType_Publish = "Publish" // 上架 -const OperationType OperationType_Retreat = "Retreat" // 下架 +const EvaluatorTagKey EvaluatorTagKey_Visible = "Visible" // 可见性 struct Tool { 1: ToolType type (go.tag ='mapstructure:"type"') From 1f20deddac6a1d5a8e37f8bf46adce78831b1534 Mon Sep 17 00:00:00 2001 From: tpfz Date: Wed, 29 Oct 2025 14:55:46 +0800 Subject: [PATCH 04/42] feat: [Coda] evaluator updates (LogID: 202510291452360100911101340058942) Co-Authored-By: Coda --- .../coze/loop/apis/evaluator_service.go | 18 +- .../api/handler/coze/loop/apis/wire_gen.go | 1 + .../router/coze/loop/apis/coze.loop.apis.go | 14 +- .../api/router/coze/loop/apis/middleware.go | 10 + .../evaluation/domain/evaluator/evaluator.go | 20 +- .../domain/evaluator/k-evaluator.go | 2 +- .../coze.loop.evaluation.evaluator.go | 134 ++++++++--- ...oze.loop.evaluation.evaluator_validator.go | 6 +- .../k-coze.loop.evaluation.evaluator.go | 83 +++++-- .../convertor/evaluator/evaluator_tag.go | 8 +- .../convertor/evaluator/evaluator_tag_test.go | 14 +- .../evaluation/application/evaluator_app.go | 46 +++- .../evaluation/application/wire_gen.go | 10 +- .../evaluation/domain/entity/evaluator.go | 12 + .../evaluation/domain/repo/evaluator.go | 3 +- .../domain/repo/evaluator_template.go | 3 + .../domain/repo/mocks/evaluator_mock.go | 23 +- .../evaluation/domain/service/evaluator.go | 6 +- .../domain/service/evaluator_impl.go | 32 +-- .../service/mocks/evaluator_service_mock.go | 25 +- .../infra/repo/evaluator/evaluator_impl.go | 170 ++++++++++---- .../repo/evaluator/evaluator_impl_test.go | 20 +- .../repo/evaluator/evaluator_template_impl.go | 130 ++++++++++- .../evaluator/evaluator_template_impl_test.go | 214 ++++++++++-------- .../infra/repo/evaluator/mysql/evaluator.go | 32 +-- .../repo/evaluator/mysql/evaluator_tag.go | 24 +- .../evaluator/mysql/evaluator_template.go | 26 ++- .../evaluator/mysql/mocks/evaluator_mock.go | 19 -- .../mysql/mocks/evaluator_tag_mock.go | 8 +- .../modules/evaluation/pkg/conf/evaluator.go | 5 +- .../coze.loop.evaluation.evaluator.thrift | 19 +- .../loop/evaluation/domain/evaluator.thrift | 10 +- 32 files changed, 722 insertions(+), 425 deletions(-) diff --git a/backend/api/handler/coze/loop/apis/evaluator_service.go b/backend/api/handler/coze/loop/apis/evaluator_service.go index 607d7099f..350d93c1a 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service.go @@ -12,7 +12,7 @@ import ( "github.com/cloudwego/hertz/pkg/protocol/consts" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/apis/evaluatorservice" - evaluator "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" + "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" ) var localEvaluatorSvc evaluatorservice.Client @@ -219,22 +219,6 @@ func DebugBuiltinEvaluator(ctx context.Context, c *app.RequestContext) { c.JSON(consts.StatusOK, resp) } -// PublishBuiltinEvaluator . -// @router /api/evaluation/v1/evaluators/publish_builtin [POST] -func PublishBuiltinEvaluator(ctx context.Context, c *app.RequestContext) { - var err error - var req evaluator.PublishBuiltinEvaluatorRequest - err = c.BindAndValidate(&req) - if err != nil { - c.String(consts.StatusBadRequest, err.Error()) - return - } - - resp := new(evaluator.PublishBuiltinEvaluatorResponse) - - c.JSON(consts.StatusOK, resp) -} - // CreateEvaluatorTemplate . // @router /api/evaluation/v1/evaluators/create_template [POST] func CreateEvaluatorTemplate(ctx context.Context, c *app.RequestContext) { diff --git a/backend/api/handler/coze/loop/apis/wire_gen.go b/backend/api/handler/coze/loop/apis/wire_gen.go index c2b7d9762..0376c7561 100644 --- a/backend/api/handler/coze/loop/apis/wire_gen.go +++ b/backend/api/handler/coze/loop/apis/wire_gen.go @@ -8,6 +8,7 @@ package apis import ( "context" + "github.com/cloudwego/kitex/pkg/endpoint" "github.com/coze-dev/coze-loop/backend/infra/ck" "github.com/coze-dev/coze-loop/backend/infra/db" diff --git a/backend/api/router/coze/loop/apis/coze.loop.apis.go b/backend/api/router/coze/loop/apis/coze.loop.apis.go index d629a6e69..496fb7109 100644 --- a/backend/api/router/coze/loop/apis/coze.loop.apis.go +++ b/backend/api/router/coze/loop/apis/coze.loop.apis.go @@ -140,18 +140,21 @@ func Register(r *server.Hertz, handler *apis.APIHandler) { _evaluation_sets.GET("/:evaluation_set_id", append(_getevaluationsetMw(handler), apis.GetEvaluationSet)...) _evaluation_sets.PATCH("/:evaluation_set_id", append(_updateevaluationsetMw(handler), apis.UpdateEvaluationSet)...) _evaluation_sets.POST("/list", append(_listevaluationsetsMw(handler), apis.ListEvaluationSets)...) + _v11.POST("/evaluator_template", append(_evaluator_templateMw(handler), apis.CreateEvaluatorTemplate)...) + _evaluator_template := _v11.Group("/evaluator_template", _evaluator_templateMw(handler)...) + _evaluator_template.DELETE("/:evaluator_template_id", append(_deleteevaluatortemplateMw(handler), apis.DeleteEvaluatorTemplate)...) + _evaluator_template.PATCH("/:evaluator_template_id", append(_updateevaluatortemplateMw(handler), apis.UpdateEvaluatorTemplate)...) _v11.POST("/evaluators", append(_evaluatorsMw(handler), apis.CreateEvaluator)...) _evaluators := _v11.Group("/evaluators", _evaluatorsMw(handler)...) _evaluators.POST("/batch_debug", append(_batchdebugevaluatorMw(handler), apis.BatchDebugEvaluator)...) _evaluators.POST("/check_name", append(_checkevaluatornameMw(handler), apis.CheckEvaluatorName)...) - _evaluators.POST("/create_template", append(_createevaluatortemplateMw(handler), apis.CreateEvaluatorTemplate)...) _evaluators.POST("/debug", append(_debugevaluatorMw(handler), apis.DebugEvaluator)...) _evaluators.POST("/debug_builtin", append(_debugbuiltinevaluatorMw(handler), apis.DebugBuiltinEvaluator)...) _evaluators.POST("/default_prompt_evaluator_tools", append(_getdefaultpromptevaluatortoolsMw(handler), apis.GetDefaultPromptEvaluatorTools)...) - _evaluators.POST("/delete_template", append(_deleteevaluatortemplateMw(handler), apis.DeleteEvaluatorTemplate)...) _evaluators.DELETE("/:evaluator_id", append(_evaluator_idMw(handler), apis.DeleteEvaluator)...) _evaluator_id := _evaluators.Group("/:evaluator_id", _evaluator_idMw(handler)...) _evaluator_id.POST("/submit_version", append(_submitevaluatorversionMw(handler), apis.SubmitEvaluatorVersion)...) + _evaluator_id.PATCH("/update_builtin_tags", append(_updatebuiltinevaluatortagsMw(handler), apis.UpdateBuiltinEvaluatorTags)...) { _versions2 := _evaluator_id.Group("/versions", _versions2Mw(handler)...) _versions2.POST("/list", append(_listevaluatorversionsMw(handler), apis.ListEvaluatorVersions)...) @@ -162,9 +165,6 @@ func Register(r *server.Hertz, handler *apis.APIHandler) { _evaluators.POST("/get_template_info", append(_gettemplateinfoMw(handler), apis.GetTemplateInfo)...) _evaluators.POST("/list_tags", append(_listevaluatortagsMw(handler), apis.ListEvaluatorTags)...) _evaluators.POST("/list_template", append(_listtemplatesMw(handler), apis.ListTemplates)...) - _evaluators.POST("/list_template_v2", append(_listtemplatesv2Mw(handler), apis.ListTemplatesV2)...) - _evaluators.POST("/update_builtin_tags", append(_updatebuiltinevaluatortagsMw(handler), apis.UpdateBuiltinEvaluatorTags)...) - _evaluators.POST("/update_template", append(_updateevaluatortemplateMw(handler), apis.UpdateEvaluatorTemplate)...) _evaluators.POST("/validate", append(_validateevaluatorMw(handler), apis.ValidateEvaluator)...) { _eval_target_records := _v11.Group("/eval_target_records", _eval_target_recordsMw(handler)...) @@ -184,6 +184,10 @@ func Register(r *server.Hertz, handler *apis.APIHandler) { _evaluator_records := _v11.Group("/evaluator_records", _evaluator_recordsMw(handler)...) _evaluator_records.PATCH("/:evaluator_record_id", append(_updateevaluatorrecordMw(handler), apis.UpdateEvaluatorRecord)...) } + { + _evaluator_template0 := _v11.Group("/evaluator_template", _evaluator_template0Mw(handler)...) + _evaluator_template0.POST("/list", append(_listtemplatesv2Mw(handler), apis.ListTemplatesV2)...) + } { _evaluators0 := _v11.Group("/evaluators", _evaluators0Mw(handler)...) _evaluators0.POST("/batch_get", append(_batchgetevaluatorsMw(handler), apis.BatchGetEvaluators)...) diff --git a/backend/api/router/coze/loop/apis/middleware.go b/backend/api/router/coze/loop/apis/middleware.go index b579cb89a..99461efbb 100644 --- a/backend/api/router/coze/loop/apis/middleware.go +++ b/backend/api/router/coze/loop/apis/middleware.go @@ -1517,3 +1517,13 @@ func _updatebuiltinevaluatortagsMw(handler *apis.APIHandler) []app.HandlerFunc { // your code... return nil } + +func _evaluator_templateMw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} + +func _evaluator_template0Mw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go index f9946abc5..2a0fe8e41 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go @@ -30,11 +30,11 @@ const ( EvaluatorTagKeyVisible = "Visible" - FilterLogicOpUnknown = "Unknown" + EvaluatorFilterLogicOpUnknown = "Unknown" - FilterLogicOpAnd = "And" + EvaluatorFilterLogicOpAnd = "And" - FilterLogicOpOr = "Or" + EvaluatorFilterLogicOpOr = "Or" EvaluatorFilterOperatorTypeUnknown = "Unknown" @@ -286,7 +286,7 @@ type LanguageType = string type EvaluatorTagKey = string // 筛选逻辑操作符 -type FilterLogicOp = string +type EvaluatorFilterLogicOp = string // Evaluator筛选操作符 type EvaluatorFilterOperatorType = string @@ -5213,7 +5213,7 @@ type EvaluatorFilters struct { // 筛选条件列表 FilterConditions []*EvaluatorFilterCondition `thrift:"filter_conditions,1,optional" frugal:"1,optional,list" form:"filter_conditions" json:"filter_conditions,omitempty" query:"filter_conditions"` // 逻辑操作符 - LogicOp *FilterLogicOp `thrift:"logic_op,2,optional" frugal:"2,optional,string" form:"logic_op" json:"logic_op,omitempty" query:"logic_op"` + LogicOp *EvaluatorFilterLogicOp `thrift:"logic_op,2,optional" frugal:"2,optional,string" form:"logic_op" json:"logic_op,omitempty" query:"logic_op"` } func NewEvaluatorFilters() *EvaluatorFilters { @@ -5235,9 +5235,9 @@ func (p *EvaluatorFilters) GetFilterConditions() (v []*EvaluatorFilterCondition) return p.FilterConditions } -var EvaluatorFilters_LogicOp_DEFAULT FilterLogicOp +var EvaluatorFilters_LogicOp_DEFAULT EvaluatorFilterLogicOp -func (p *EvaluatorFilters) GetLogicOp() (v FilterLogicOp) { +func (p *EvaluatorFilters) GetLogicOp() (v EvaluatorFilterLogicOp) { if p == nil { return } @@ -5249,7 +5249,7 @@ func (p *EvaluatorFilters) GetLogicOp() (v FilterLogicOp) { func (p *EvaluatorFilters) SetFilterConditions(val []*EvaluatorFilterCondition) { p.FilterConditions = val } -func (p *EvaluatorFilters) SetLogicOp(val *FilterLogicOp) { +func (p *EvaluatorFilters) SetLogicOp(val *EvaluatorFilterLogicOp) { p.LogicOp = val } @@ -5354,7 +5354,7 @@ func (p *EvaluatorFilters) ReadField1(iprot thrift.TProtocol) error { } func (p *EvaluatorFilters) ReadField2(iprot thrift.TProtocol) error { - var _field *FilterLogicOp + var _field *EvaluatorFilterLogicOp if v, err := iprot.ReadString(); err != nil { return err } else { @@ -5477,7 +5477,7 @@ func (p *EvaluatorFilters) Field1DeepEqual(src []*EvaluatorFilterCondition) bool } return true } -func (p *EvaluatorFilters) Field2DeepEqual(src *FilterLogicOp) bool { +func (p *EvaluatorFilters) Field2DeepEqual(src *EvaluatorFilterLogicOp) bool { if p.LogicOp == src { return true diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go index 96ecd581e..956b47e41 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go @@ -3729,7 +3729,7 @@ func (p *EvaluatorFilters) FastReadField1(buf []byte) (int, error) { func (p *EvaluatorFilters) FastReadField2(buf []byte) (int, error) { offset := 0 - var _field *FilterLogicOp + var _field *EvaluatorFilterLogicOp if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { return offset, err } else { diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go index 60bf88172..945031b95 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go @@ -6459,7 +6459,7 @@ type GetEvaluatorVersionRequest struct { // 是否查询已删除的评估器，默认不查询 IncludeDeleted *bool `thrift:"include_deleted,3,optional" frugal:"3,optional,bool" json:"include_deleted,omitempty" query:"include_deleted"` // 是否预置评估器 - Builtin *bool `thrift:"builtin,4,optional" frugal:"4,optional,bool" json:"builtin" form:"builtin" ` + Builtin *bool `thrift:"builtin,4,optional" frugal:"4,optional,bool" json:"builtin" query:"builtin" ` Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } @@ -20177,8 +20177,8 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) Field255DeepEqual(src *base.Base) bo } type UpdateBuiltinEvaluatorTagsResponse struct { - Version *evaluator.EvaluatorVersion `thrift:"version,1,required" frugal:"1,required,evaluator.EvaluatorVersion" form:"version,required" json:"version,required"` - BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` + Evaluator *evaluator.Evaluator `thrift:"evaluator,1,required" frugal:"1,required,evaluator.Evaluator" form:"evaluator,required" json:"evaluator,required"` + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` } func NewUpdateBuiltinEvaluatorTagsResponse() *UpdateBuiltinEvaluatorTagsResponse { @@ -20188,16 +20188,16 @@ func NewUpdateBuiltinEvaluatorTagsResponse() *UpdateBuiltinEvaluatorTagsResponse func (p *UpdateBuiltinEvaluatorTagsResponse) InitDefault() { } -var UpdateBuiltinEvaluatorTagsResponse_Version_DEFAULT *evaluator.EvaluatorVersion +var UpdateBuiltinEvaluatorTagsResponse_Evaluator_DEFAULT *evaluator.Evaluator -func (p *UpdateBuiltinEvaluatorTagsResponse) GetVersion() (v *evaluator.EvaluatorVersion) { +func (p *UpdateBuiltinEvaluatorTagsResponse) GetEvaluator() (v *evaluator.Evaluator) { if p == nil { return } - if !p.IsSetVersion() { - return UpdateBuiltinEvaluatorTagsResponse_Version_DEFAULT + if !p.IsSetEvaluator() { + return UpdateBuiltinEvaluatorTagsResponse_Evaluator_DEFAULT } - return p.Version + return p.Evaluator } var UpdateBuiltinEvaluatorTagsResponse_BaseResp_DEFAULT *base.BaseResp @@ -20211,20 +20211,20 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) GetBaseResp() (v *base.BaseResp) { } return p.BaseResp } -func (p *UpdateBuiltinEvaluatorTagsResponse) SetVersion(val *evaluator.EvaluatorVersion) { - p.Version = val +func (p *UpdateBuiltinEvaluatorTagsResponse) SetEvaluator(val *evaluator.Evaluator) { + p.Evaluator = val } func (p *UpdateBuiltinEvaluatorTagsResponse) SetBaseResp(val *base.BaseResp) { p.BaseResp = val } var fieldIDToName_UpdateBuiltinEvaluatorTagsResponse = map[int16]string{ - 1: "version", + 1: "evaluator", 255: "BaseResp", } -func (p *UpdateBuiltinEvaluatorTagsResponse) IsSetVersion() bool { - return p.Version != nil +func (p *UpdateBuiltinEvaluatorTagsResponse) IsSetEvaluator() bool { + return p.Evaluator != nil } func (p *UpdateBuiltinEvaluatorTagsResponse) IsSetBaseResp() bool { @@ -20234,7 +20234,7 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) IsSetBaseResp() bool { func (p *UpdateBuiltinEvaluatorTagsResponse) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 - var issetVersion bool = false + var issetEvaluator bool = false if _, err = iprot.ReadStructBegin(); err != nil { goto ReadStructBeginError @@ -20255,7 +20255,7 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) Read(iprot thrift.TProtocol) (err e if err = p.ReadField1(iprot); err != nil { goto ReadFieldError } - issetVersion = true + issetEvaluator = true } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } @@ -20280,7 +20280,7 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) Read(iprot thrift.TProtocol) (err e goto ReadStructEndError } - if !issetVersion { + if !issetEvaluator { fieldId = 1 goto RequiredFieldNotSetError } @@ -20303,11 +20303,11 @@ RequiredFieldNotSetError: } func (p *UpdateBuiltinEvaluatorTagsResponse) ReadField1(iprot thrift.TProtocol) error { - _field := evaluator.NewEvaluatorVersion() + _field := evaluator.NewEvaluator() if err := _field.Read(iprot); err != nil { return err } - p.Version = _field + p.Evaluator = _field return nil } func (p *UpdateBuiltinEvaluatorTagsResponse) ReadField255(iprot thrift.TProtocol) error { @@ -20352,10 +20352,10 @@ WriteStructEndError: } func (p *UpdateBuiltinEvaluatorTagsResponse) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("version", thrift.STRUCT, 1); err != nil { + if err = oprot.WriteFieldBegin("evaluator", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } - if err := p.Version.Write(oprot); err != nil { + if err := p.Evaluator.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -20398,7 +20398,7 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) DeepEqual(ano *UpdateBuiltinEvaluat } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.Version) { + if !p.Field1DeepEqual(ano.Evaluator) { return false } if !p.Field255DeepEqual(ano.BaseResp) { @@ -20407,9 +20407,9 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) DeepEqual(ano *UpdateBuiltinEvaluat return true } -func (p *UpdateBuiltinEvaluatorTagsResponse) Field1DeepEqual(src *evaluator.EvaluatorVersion) bool { +func (p *UpdateBuiltinEvaluatorTagsResponse) Field1DeepEqual(src *evaluator.Evaluator) bool { - if !p.Version.DeepEqual(src) { + if !p.Evaluator.DeepEqual(src) { return false } return true @@ -20917,8 +20917,9 @@ func (p *CreateEvaluatorTemplateResponse) Field255DeepEqual(src *base.BaseResp) } type UpdateEvaluatorTemplateRequest struct { - EvaluatorTemplate *evaluator.EvaluatorTemplate `thrift:"evaluator_template,1,required" frugal:"1,required,evaluator.EvaluatorTemplate" form:"evaluator_template,required" json:"evaluator_template,required"` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + EvaluatorTemplateID int64 `thrift:"evaluator_template_id,1,required" frugal:"1,required,i64" json:"evaluator_template_id" path:"evaluator_template_id,required" ` + EvaluatorTemplate *evaluator.EvaluatorTemplate `thrift:"evaluator_template,2,required" frugal:"2,required,evaluator.EvaluatorTemplate" form:"evaluator_template,required" json:"evaluator_template,required"` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewUpdateEvaluatorTemplateRequest() *UpdateEvaluatorTemplateRequest { @@ -20928,6 +20929,13 @@ func NewUpdateEvaluatorTemplateRequest() *UpdateEvaluatorTemplateRequest { func (p *UpdateEvaluatorTemplateRequest) InitDefault() { } +func (p *UpdateEvaluatorTemplateRequest) GetEvaluatorTemplateID() (v int64) { + if p != nil { + return p.EvaluatorTemplateID + } + return +} + var UpdateEvaluatorTemplateRequest_EvaluatorTemplate_DEFAULT *evaluator.EvaluatorTemplate func (p *UpdateEvaluatorTemplateRequest) GetEvaluatorTemplate() (v *evaluator.EvaluatorTemplate) { @@ -20951,6 +20959,9 @@ func (p *UpdateEvaluatorTemplateRequest) GetBase() (v *base.Base) { } return p.Base } +func (p *UpdateEvaluatorTemplateRequest) SetEvaluatorTemplateID(val int64) { + p.EvaluatorTemplateID = val +} func (p *UpdateEvaluatorTemplateRequest) SetEvaluatorTemplate(val *evaluator.EvaluatorTemplate) { p.EvaluatorTemplate = val } @@ -20959,7 +20970,8 @@ func (p *UpdateEvaluatorTemplateRequest) SetBase(val *base.Base) { } var fieldIDToName_UpdateEvaluatorTemplateRequest = map[int16]string{ - 1: "evaluator_template", + 1: "evaluator_template_id", + 2: "evaluator_template", 255: "Base", } @@ -20974,6 +20986,7 @@ func (p *UpdateEvaluatorTemplateRequest) IsSetBase() bool { func (p *UpdateEvaluatorTemplateRequest) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 + var issetEvaluatorTemplateID bool = false var issetEvaluatorTemplate bool = false if _, err = iprot.ReadStructBegin(); err != nil { @@ -20991,10 +21004,19 @@ func (p *UpdateEvaluatorTemplateRequest) Read(iprot thrift.TProtocol) (err error switch fieldId { case 1: - if fieldTypeId == thrift.STRUCT { + if fieldTypeId == thrift.I64 { if err = p.ReadField1(iprot); err != nil { goto ReadFieldError } + issetEvaluatorTemplateID = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } issetEvaluatorTemplate = true } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError @@ -21020,10 +21042,15 @@ func (p *UpdateEvaluatorTemplateRequest) Read(iprot thrift.TProtocol) (err error goto ReadStructEndError } - if !issetEvaluatorTemplate { + if !issetEvaluatorTemplateID { fieldId = 1 goto RequiredFieldNotSetError } + + if !issetEvaluatorTemplate { + fieldId = 2 + goto RequiredFieldNotSetError + } return nil ReadStructBeginError: return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) @@ -21043,6 +21070,17 @@ RequiredFieldNotSetError: } func (p *UpdateEvaluatorTemplateRequest) ReadField1(iprot thrift.TProtocol) error { + + var _field int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = v + } + p.EvaluatorTemplateID = _field + return nil +} +func (p *UpdateEvaluatorTemplateRequest) ReadField2(iprot thrift.TProtocol) error { _field := evaluator.NewEvaluatorTemplate() if err := _field.Read(iprot); err != nil { return err @@ -21069,6 +21107,10 @@ func (p *UpdateEvaluatorTemplateRequest) Write(oprot thrift.TProtocol) (err erro fieldId = 1 goto WriteFieldError } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -21092,10 +21134,10 @@ WriteStructEndError: } func (p *UpdateEvaluatorTemplateRequest) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("evaluator_template", thrift.STRUCT, 1); err != nil { + if err = oprot.WriteFieldBegin("evaluator_template_id", thrift.I64, 1); err != nil { goto WriteFieldBeginError } - if err := p.EvaluatorTemplate.Write(oprot); err != nil { + if err := oprot.WriteI64(p.EvaluatorTemplateID); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -21107,6 +21149,22 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } +func (p *UpdateEvaluatorTemplateRequest) writeField2(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("evaluator_template", thrift.STRUCT, 2); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorTemplate.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} func (p *UpdateEvaluatorTemplateRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { @@ -21140,7 +21198,10 @@ func (p *UpdateEvaluatorTemplateRequest) DeepEqual(ano *UpdateEvaluatorTemplateR } else if p == nil || ano == nil { return false } - if !p.Field1DeepEqual(ano.EvaluatorTemplate) { + if !p.Field1DeepEqual(ano.EvaluatorTemplateID) { + return false + } + if !p.Field2DeepEqual(ano.EvaluatorTemplate) { return false } if !p.Field255DeepEqual(ano.Base) { @@ -21149,7 +21210,14 @@ func (p *UpdateEvaluatorTemplateRequest) DeepEqual(ano *UpdateEvaluatorTemplateR return true } -func (p *UpdateEvaluatorTemplateRequest) Field1DeepEqual(src *evaluator.EvaluatorTemplate) bool { +func (p *UpdateEvaluatorTemplateRequest) Field1DeepEqual(src int64) bool { + + if p.EvaluatorTemplateID != src { + return false + } + return true +} +func (p *UpdateEvaluatorTemplateRequest) Field2DeepEqual(src *evaluator.EvaluatorTemplate) bool { if !p.EvaluatorTemplate.DeepEqual(src) { return false @@ -21411,7 +21479,7 @@ func (p *UpdateEvaluatorTemplateResponse) Field255DeepEqual(src *base.BaseResp) } type DeleteEvaluatorTemplateRequest struct { - EvaluatorTemplateID int64 `thrift:"evaluator_template_id,1,required" frugal:"1,required,i64" json:"evaluator_template_id" form:"evaluator_template_id,required" ` + EvaluatorTemplateID int64 `thrift:"evaluator_template_id,1,required" frugal:"1,required,i64" json:"evaluator_template_id" path:"evaluator_template_id,required" ` Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go index 2a673d78b..dac35cbf3 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go @@ -626,9 +626,9 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) IsValid() error { return nil } func (p *UpdateBuiltinEvaluatorTagsResponse) IsValid() error { - if p.Version != nil { - if err := p.Version.IsValid(); err != nil { - return fmt.Errorf("field Version not valid, %w", err) + if p.Evaluator != nil { + if err := p.Evaluator.IsValid(); err != nil { + return fmt.Errorf("field Evaluator not valid, %w", err) } } if p.BaseResp != nil { diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go index 499849b8e..fba702aac 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go @@ -14694,7 +14694,7 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) FastRead(buf []byte) (int, error) { var l int var fieldTypeId thrift.TType var fieldId int16 - var issetVersion bool = false + var issetEvaluator bool = false for { fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) offset += l @@ -14712,7 +14712,7 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) FastRead(buf []byte) (int, error) { if err != nil { goto ReadFieldError } - issetVersion = true + issetEvaluator = true } else { l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -14743,7 +14743,7 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) FastRead(buf []byte) (int, error) { } } - if !issetVersion { + if !issetEvaluator { fieldId = 1 goto RequiredFieldNotSetError } @@ -14760,13 +14760,13 @@ RequiredFieldNotSetError: func (p *UpdateBuiltinEvaluatorTagsResponse) FastReadField1(buf []byte) (int, error) { offset := 0 - _field := evaluator.NewEvaluatorVersion() + _field := evaluator.NewEvaluator() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l } - p.Version = _field + p.Evaluator = _field return offset, nil } @@ -14809,7 +14809,7 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) BLength() int { func (p *UpdateBuiltinEvaluatorTagsResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Version.FastWriteNocopy(buf[offset:], w) + offset += p.Evaluator.FastWriteNocopy(buf[offset:], w) return offset } @@ -14823,7 +14823,7 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) fastWriteField255(buf []byte, w thr func (p *UpdateBuiltinEvaluatorTagsResponse) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() - l += p.Version.BLength() + l += p.Evaluator.BLength() return l } @@ -14840,14 +14840,14 @@ func (p *UpdateBuiltinEvaluatorTagsResponse) DeepCopy(s interface{}) error { return fmt.Errorf("%T's type not matched %T", s, p) } - var _version *evaluator.EvaluatorVersion - if src.Version != nil { - _version = &evaluator.EvaluatorVersion{} - if err := _version.DeepCopy(src.Version); err != nil { + var _evaluator *evaluator.Evaluator + if src.Evaluator != nil { + _evaluator = &evaluator.Evaluator{} + if err := _evaluator.DeepCopy(src.Evaluator); err != nil { return err } } - p.Version = _version + p.Evaluator = _evaluator var _baseResp *base.BaseResp if src.BaseResp != nil { @@ -15220,6 +15220,7 @@ func (p *UpdateEvaluatorTemplateRequest) FastRead(buf []byte) (int, error) { var l int var fieldTypeId thrift.TType var fieldId int16 + var issetEvaluatorTemplateID bool = false var issetEvaluatorTemplate bool = false for { fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) @@ -15232,12 +15233,27 @@ func (p *UpdateEvaluatorTemplateRequest) FastRead(buf []byte) (int, error) { } switch fieldId { case 1: - if fieldTypeId == thrift.STRUCT { + if fieldTypeId == thrift.I64 { l, err = p.FastReadField1(buf[offset:]) offset += l if err != nil { goto ReadFieldError } + issetEvaluatorTemplateID = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 2: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField2(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } issetEvaluatorTemplate = true } else { l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) @@ -15269,10 +15285,15 @@ func (p *UpdateEvaluatorTemplateRequest) FastRead(buf []byte) (int, error) { } } - if !issetEvaluatorTemplate { + if !issetEvaluatorTemplateID { fieldId = 1 goto RequiredFieldNotSetError } + + if !issetEvaluatorTemplate { + fieldId = 2 + goto RequiredFieldNotSetError + } return offset, nil ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) @@ -15286,6 +15307,20 @@ RequiredFieldNotSetError: func (p *UpdateEvaluatorTemplateRequest) FastReadField1(buf []byte) (int, error) { offset := 0 + + var _field int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.EvaluatorTemplateID = _field + return offset, nil +} + +func (p *UpdateEvaluatorTemplateRequest) FastReadField2(buf []byte) (int, error) { + offset := 0 _field := evaluator.NewEvaluatorTemplate() if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err @@ -15316,6 +15351,7 @@ func (p *UpdateEvaluatorTemplateRequest) FastWriteNocopy(buf []byte, w thrift.No offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -15326,6 +15362,7 @@ func (p *UpdateEvaluatorTemplateRequest) BLength() int { l := 0 if p != nil { l += p.field1Length() + l += p.field2Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -15334,7 +15371,14 @@ func (p *UpdateEvaluatorTemplateRequest) BLength() int { func (p *UpdateEvaluatorTemplateRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], p.EvaluatorTemplateID) + return offset +} + +func (p *UpdateEvaluatorTemplateRequest) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 2) offset += p.EvaluatorTemplate.FastWriteNocopy(buf[offset:], w) return offset } @@ -15349,6 +15393,13 @@ func (p *UpdateEvaluatorTemplateRequest) fastWriteField255(buf []byte, w thrift. } func (p *UpdateEvaluatorTemplateRequest) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + return l +} + +func (p *UpdateEvaluatorTemplateRequest) field2Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.EvaluatorTemplate.BLength() @@ -15370,6 +15421,8 @@ func (p *UpdateEvaluatorTemplateRequest) DeepCopy(s interface{}) error { return fmt.Errorf("%T's type not matched %T", s, p) } + p.EvaluatorTemplateID = src.EvaluatorTemplateID + var _evaluatorTemplate *evaluator.EvaluatorTemplate if src.EvaluatorTemplate != nil { _evaluatorTemplate = &evaluator.EvaluatorTemplate{} diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go index 3e030101d..bce86697c 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go @@ -28,12 +28,12 @@ func ConvertEvaluatorTagKeyDTO2DO(dtoKey evaluatordto.EvaluatorTagKey) evaluator } } -// ConvertFilterLogicOpDTO2DO 将DTO的FilterLogicOp转换为DO的FilterLogicOp -func ConvertFilterLogicOpDTO2DO(dtoOp evaluatordto.FilterLogicOp) evaluatordo.FilterLogicOp { +// ConvertFilterLogicOpDTO2DO 将DTO的EvaluatorFilterLogicOp转换为DO的FilterLogicOp +func ConvertFilterLogicOpDTO2DO(dtoOp evaluatordto.EvaluatorFilterLogicOp) evaluatordo.FilterLogicOp { switch dtoOp { - case evaluatordto.FilterLogicOpAnd: + case evaluatordto.EvaluatorFilterLogicOpAnd: return evaluatordo.FilterLogicOp_And - case evaluatordto.FilterLogicOpOr: + case evaluatordto.EvaluatorFilterLogicOpOr: return evaluatordo.FilterLogicOp_Or default: return evaluatordo.FilterLogicOp_Unknown diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go index bc1b57cf9..ed1df3264 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go @@ -35,7 +35,7 @@ func TestConvertEvaluatorFilterOptionDTO2DO(t *testing.T) { Operator: evaluatordto.EvaluatorFilterOperatorTypeEqual, Value: "LLM", } - logicOp := evaluatordto.FilterLogicOpAnd + logicOp := evaluatordto.EvaluatorFilterLogicOpAnd filters := &evaluatordto.EvaluatorFilters{ FilterConditions: []*evaluatordto.EvaluatorFilterCondition{filterCondition}, LogicOp: &logicOp, @@ -71,7 +71,7 @@ func TestConvertEvaluatorTagKeyDTO2DO(t *testing.T) { t.Parallel() testCases := []struct { - dtoKey evaluatordto.EvaluatorTagKey + dtoKey evaluatordto.EvaluatorTagKey expected evaluatordo.EvaluatorTagKey }{ {evaluatordto.EvaluatorTagKeyCategory, evaluatordo.EvaluatorTagKey_Category}, @@ -92,12 +92,12 @@ func TestConvertFilterLogicOpDTO2DO(t *testing.T) { t.Parallel() testCases := []struct { - dtoOp evaluatordto.FilterLogicOp + dtoOp evaluatordto.EvaluatorFilterLogicOp expected evaluatordo.FilterLogicOp }{ - {evaluatordto.FilterLogicOpAnd, evaluatordo.FilterLogicOp_And}, - {evaluatordto.FilterLogicOpOr, evaluatordo.FilterLogicOp_Or}, - {evaluatordto.FilterLogicOpUnknown, evaluatordo.FilterLogicOp_Unknown}, + {evaluatordto.EvaluatorFilterLogicOpAnd, evaluatordo.FilterLogicOp_And}, + {evaluatordto.EvaluatorFilterLogicOpOr, evaluatordo.FilterLogicOp_Or}, + {evaluatordto.EvaluatorFilterLogicOpUnknown, evaluatordo.FilterLogicOp_Unknown}, {"", evaluatordo.FilterLogicOp_Unknown}, } @@ -159,7 +159,7 @@ func TestConvertEvaluatorFiltersDTO2DO(t *testing.T) { assert.Nil(t, result) // 测试只有逻辑操作符的情况 - logicOp := evaluatordto.FilterLogicOpOr + logicOp := evaluatordto.EvaluatorFilterLogicOpOr dto := &evaluatordto.EvaluatorFilters{ LogicOp: &logicOp, } diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index 738196065..da67dab48 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -348,6 +348,12 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluator(ctx context.Context, request *eva if err != nil { return nil, err } + // 如果是builtin分支，补充管理空间校验 + if request.GetBuiltin() { + if err := e.authBuiltinManagement(ctx, request.GetWorkspaceID(), spaceTypeBuiltin); err != nil { + return nil, err + } + } // 机审 auditTexts := make([]string, 0) auditTexts = append(auditTexts, request.GetName()) @@ -368,15 +374,30 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluator(ctx context.Context, request *eva return nil, errorx.NewByCode(errno.RiskContentDetectedCode) } userIDInContext := session.UserIDInCtxOrEmpty(ctx) - if request.GetBuiltin() { - // 内置评估器更新元信息（允许更新 benchmark/vendor） - if err = e.evaluatorService.UpdateBuiltinEvaluatorMeta(ctx, request.GetEvaluatorID(), request.GetWorkspaceID(), request.GetName(), request.GetDescription(), request.GetBenchmark(), request.GetVendor(), userIDInContext); err != nil { - return nil, err - } - } else { - if err = e.evaluatorService.UpdateEvaluatorMeta(ctx, request.GetEvaluatorID(), request.GetWorkspaceID(), request.GetName(), request.GetDescription(), userIDInContext); err != nil { - return nil, err - } + // 组装请求 + req := &entity.UpdateEvaluatorMetaRequest{ + ID: request.GetEvaluatorID(), + SpaceID: request.GetWorkspaceID(), + UpdatedBy: userIDInContext, + } + if request.Name != nil { + req.Name = request.Name + } + if request.Description != nil { + req.Description = request.Description + } + if request.Builtin != nil { + req.Builtin = request.Builtin + } + if request.Benchmark != nil { + req.Benchmark = request.Benchmark + } + if request.Vendor != nil { + req.Vendor = request.Vendor + } + + if err = e.evaluatorService.UpdateEvaluatorMeta(ctx, req); err != nil { + return nil, err } return &evaluatorservice.UpdateEvaluatorResponse{}, nil } @@ -1541,9 +1562,12 @@ func (e *EvaluatorHandlerImpl) UpdateBuiltinEvaluatorTags(ctx context.Context, r return nil, err } - // 3) 返回版本信息 + // 3) 组装更新后的标签并返回 Evaluator（最终标签集合等于请求中的标签集合） + if ev != nil { + ev.Tags = evaluatorconvertor.ConvertEvaluatorTagsDTO2DO(request.GetTags()) + } return &evaluatorservice.UpdateBuiltinEvaluatorTagsResponse{ - Version: evaluatorconvertor.ConvertEvaluatorDO2DTO(ev).GetCurrentVersion(), + Evaluator: evaluatorconvertor.ConvertEvaluatorDO2DTO(ev), }, nil } diff --git a/backend/modules/evaluation/application/wire_gen.go b/backend/modules/evaluation/application/wire_gen.go index 3985d5a8a..50a6b4807 100644 --- a/backend/modules/evaluation/application/wire_gen.go +++ b/backend/modules/evaluation/application/wire_gen.go @@ -8,6 +8,7 @@ package application import ( "context" + "github.com/coze-dev/coze-loop/backend/infra/ck" "github.com/coze-dev/coze-loop/backend/infra/db" "github.com/coze-dev/coze-loop/backend/infra/external/audit" @@ -82,7 +83,8 @@ func InitExperimentApplication(ctx context.Context, idgen2 idgen.IIDGenerator, d evaluatorVersionDAO := mysql2.NewEvaluatorVersionDAO(db2) evaluatorTagDAO := mysql2.NewEvaluatorTagDAO(db2) iLatestWriteTracker := platestwrite.NewLatestWriteTracker(cmdable) - iEvaluatorRepo := evaluator.NewEvaluatorRepo(idgen2, db2, evaluatorDAO, evaluatorVersionDAO, evaluatorTagDAO, iLatestWriteTracker) + evaluatorTemplateDAO := mysql2.NewEvaluatorTemplateDAO(db2) + iEvaluatorRepo := evaluator.NewEvaluatorRepo(idgen2, db2, evaluatorDAO, evaluatorVersionDAO, evaluatorTagDAO, iLatestWriteTracker, evaluatorTemplateDAO) evaluatorRecordDAO := mysql2.NewEvaluatorRecordDAO(db2) iEvaluatorRecordRepo := evaluator.NewEvaluatorRecordRepo(idgen2, db2, evaluatorRecordDAO) iIdemDAO := redis2.NewIdemDAO(cmdable) @@ -172,7 +174,8 @@ func InitEvaluatorApplication(ctx context.Context, idgen2 idgen.IIDGenerator, au evaluatorVersionDAO := mysql2.NewEvaluatorVersionDAO(db2) evaluatorTagDAO := mysql2.NewEvaluatorTagDAO(db2) iLatestWriteTracker := platestwrite.NewLatestWriteTracker(cmdable) - iEvaluatorRepo := evaluator.NewEvaluatorRepo(idgen2, db2, evaluatorDAO, evaluatorVersionDAO, evaluatorTagDAO, iLatestWriteTracker) + evaluatorTemplateDAO := mysql2.NewEvaluatorTemplateDAO(db2) + iEvaluatorRepo := evaluator.NewEvaluatorRepo(idgen2, db2, evaluatorDAO, evaluatorVersionDAO, evaluatorTagDAO, iLatestWriteTracker, evaluatorTemplateDAO) evaluatorRecordDAO := mysql2.NewEvaluatorRecordDAO(db2) iEvaluatorRecordRepo := evaluator.NewEvaluatorRecordRepo(idgen2, db2, evaluatorRecordDAO) iIdemDAO := redis2.NewIdemDAO(cmdable) @@ -200,8 +203,7 @@ func InitEvaluatorApplication(ctx context.Context, idgen2 idgen.IIDGenerator, au iExptEvaluatorRefDAO := mysql.NewExptEvaluatorRefDAO(db2) iExperimentRepo := experiment.NewExptRepo(iExptDAO, iExptEvaluatorRefDAO, idgen2) evaluatorRecordService := service.NewEvaluatorRecordServiceImpl(idgen2, iEvaluatorRecordRepo, exptEventPublisher, evaluatorEventPublisher, userInfoService, iExperimentRepo) - evaluatorTemplateDAO := mysql2.NewEvaluatorTemplateDAO(db2) - evaluatorTemplateRepo := evaluator.NewEvaluatorTemplateRepo(evaluatorTagDAO, evaluatorTemplateDAO) + evaluatorTemplateRepo := evaluator.NewEvaluatorTemplateRepo(evaluatorTagDAO, evaluatorTemplateDAO, idgen2) evaluatorTemplateService := service.NewEvaluatorTemplateService(evaluatorTemplateRepo) iFileProvider := foundation.NewFileRPCProvider(fileClient) evaluationEvaluatorService := NewEvaluatorHandlerImpl(idgen2, iConfiger, iAuthProvider, evaluatorService, evaluatorRecordService, evaluatorTemplateService, evaluatorExecMetrics, userInfoService, auditClient, benefitSvc, iFileProvider, v) diff --git a/backend/modules/evaluation/domain/entity/evaluator.go b/backend/modules/evaluation/domain/entity/evaluator.go index 281f4965b..3511f2234 100644 --- a/backend/modules/evaluation/domain/entity/evaluator.go +++ b/backend/modules/evaluation/domain/entity/evaluator.go @@ -34,6 +34,18 @@ var EvaluatorTypeSet = map[EvaluatorType]struct{}{ EvaluatorTypeCode: {}, } +// UpdateEvaluatorMetaRequest 用于更新评估器元信息的参数 +type UpdateEvaluatorMetaRequest struct { + ID int64 + SpaceID int64 + Name *string + Description *string + Builtin *bool + Benchmark *string + Vendor *string + UpdatedBy string +} + // GetEvaluatorVersionID 获取评估器版本ID func (e *Evaluator) GetEvaluatorVersionID() int64 { switch e.EvaluatorType { diff --git a/backend/modules/evaluation/domain/repo/evaluator.go b/backend/modules/evaluation/domain/repo/evaluator.go index 6a031be5c..33564f75d 100644 --- a/backend/modules/evaluation/domain/repo/evaluator.go +++ b/backend/modules/evaluation/domain/repo/evaluator.go @@ -19,8 +19,7 @@ type IEvaluatorRepo interface { BatchDeleteEvaluator(ctx context.Context, ids []int64, userID string) error UpdateEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error - UpdateEvaluatorMeta(ctx context.Context, id int64, name, description, userID string) error - UpdateBuiltinEvaluatorMeta(ctx context.Context, id int64, name, description, benchmark, vendor, userID string) error + UpdateEvaluatorMeta(ctx context.Context, req *entity.UpdateEvaluatorMetaRequest) error // UpdateEvaluatorVersionTags 根据版本ID全量更新标签：不存在的新增，不在传入列表中的删除 UpdateEvaluatorVersionTags(ctx context.Context, versionID int64, tags map[entity.EvaluatorTagKey][]string) error diff --git a/backend/modules/evaluation/domain/repo/evaluator_template.go b/backend/modules/evaluation/domain/repo/evaluator_template.go index 5068e065c..bcd0373cf 100644 --- a/backend/modules/evaluation/domain/repo/evaluator_template.go +++ b/backend/modules/evaluation/domain/repo/evaluator_template.go @@ -27,6 +27,9 @@ type EvaluatorTemplateRepo interface { // ListEvaluatorTemplate 根据筛选条件查询evaluator_template列表，支持tag筛选和分页 ListEvaluatorTemplate(ctx context.Context, req *ListEvaluatorTemplateRequest) (*ListEvaluatorTemplateResponse, error) + + // IncrPopularityByID 基于ID将 popularity + 1 + IncrPopularityByID(ctx context.Context, id int64) error } // ListEvaluatorTemplateRequest 查询evaluator_template的请求参数 diff --git a/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go b/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go index 0855ebcff..378626653 100644 --- a/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go +++ b/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go @@ -161,7 +161,6 @@ func (mr *MockIEvaluatorRepoMockRecorder) CheckVersionExist(ctx, evaluatorID, ve return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckVersionExist", reflect.TypeOf((*MockIEvaluatorRepo)(nil).CheckVersionExist), ctx, evaluatorID, version) } - // CreateEvaluator mocks base method. func (m *MockIEvaluatorRepo) CreateEvaluator(ctx context.Context, evaluator *entity.Evaluator) (int64, error) { m.ctrl.T.Helper() @@ -250,20 +249,6 @@ func (mr *MockIEvaluatorRepoMockRecorder) UpdateBuiltinEvaluatorDraft(ctx, versi return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateBuiltinEvaluatorDraft", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateBuiltinEvaluatorDraft), ctx, version) } -// UpdateBuiltinEvaluatorMeta mocks base method. -func (m *MockIEvaluatorRepo) UpdateBuiltinEvaluatorMeta(ctx context.Context, id int64, name, description, benchmark, vendor, userID string) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateBuiltinEvaluatorMeta", ctx, id, name, description, benchmark, vendor, userID) - ret0, _ := ret[0].(error) - return ret0 -} - -// UpdateBuiltinEvaluatorMeta indicates an expected call of UpdateBuiltinEvaluatorMeta. -func (mr *MockIEvaluatorRepoMockRecorder) UpdateBuiltinEvaluatorMeta(ctx, id, name, description, benchmark, vendor, userID any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateBuiltinEvaluatorMeta", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateBuiltinEvaluatorMeta), ctx, id, name, description, benchmark, vendor, userID) -} - // UpdateEvaluatorDraft mocks base method. func (m *MockIEvaluatorRepo) UpdateEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error { m.ctrl.T.Helper() @@ -279,15 +264,15 @@ func (mr *MockIEvaluatorRepoMockRecorder) UpdateEvaluatorDraft(ctx, version any) } // UpdateEvaluatorMeta mocks base method. -func (m *MockIEvaluatorRepo) UpdateEvaluatorMeta(ctx context.Context, id int64, name, description, userID string) error { +func (m *MockIEvaluatorRepo) UpdateEvaluatorMeta(ctx context.Context, req *entity.UpdateEvaluatorMetaRequest) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateEvaluatorMeta", ctx, id, name, description, userID) + ret := m.ctrl.Call(m, "UpdateEvaluatorMeta", ctx, req) ret0, _ := ret[0].(error) return ret0 } // UpdateEvaluatorMeta indicates an expected call of UpdateEvaluatorMeta. -func (mr *MockIEvaluatorRepoMockRecorder) UpdateEvaluatorMeta(ctx, id, name, description, userID any) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) UpdateEvaluatorMeta(ctx, req any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorMeta", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateEvaluatorMeta), ctx, id, name, description, userID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorMeta", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateEvaluatorMeta), ctx, req) } diff --git a/backend/modules/evaluation/domain/service/evaluator.go b/backend/modules/evaluation/domain/service/evaluator.go index c47856c3b..549a71bd1 100644 --- a/backend/modules/evaluation/domain/service/evaluator.go +++ b/backend/modules/evaluation/domain/service/evaluator.go @@ -21,10 +21,8 @@ type EvaluatorService interface { GetEvaluator(ctx context.Context, spaceID, evaluatorID int64, includeDeleted bool) (*entity.Evaluator, error) // CreateEvaluator 创建 evaluator_version CreateEvaluator(ctx context.Context, evaluator *entity.Evaluator, cid string) (int64, error) - // UpdateEvaluatorMeta 修改 evaluator_version - UpdateEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, userID string) error - // UpdateBuiltinEvaluatorMeta 修改内置评估器元信息（包含benchmark/vendor） - UpdateBuiltinEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, benchmark, vendor, userID string) error + // UpdateEvaluatorMeta 修改评估器元信息（支持 builtin/benchmark/vendor 可选更新） + UpdateEvaluatorMeta(ctx context.Context, req *entity.UpdateEvaluatorMetaRequest) error // UpdateBuiltinEvaluatorTags 更新内置评估器版本的标签（按 evaluator_id + version 定位版本） UpdateBuiltinEvaluatorTags(ctx context.Context, evaluatorID int64, version string, tags map[entity.EvaluatorTagKey][]string) (*entity.Evaluator, error) // UpdateEvaluatorDraft 修改 evaluator_version draft diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index eb620a8a1..570ce39af 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -228,34 +228,18 @@ func (e *EvaluatorServiceImpl) validateCreateEvaluatorRequest(ctx context.Contex } // UpdateEvaluatorMeta 修改 evaluator_version -func (e *EvaluatorServiceImpl) UpdateEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, userID string) error { - validateErr := e.validateUpdateEvaluatorMetaRequest(ctx, id, spaceID, name) - if validateErr != nil { - return validateErr - } - - if err := e.evaluatorRepo.UpdateEvaluatorMeta(ctx, id, name, description, userID); err != nil { - return err +func (e *EvaluatorServiceImpl) UpdateEvaluatorMeta(ctx context.Context, req *entity.UpdateEvaluatorMetaRequest) error { + if req == nil { + return errorx.NewByCode(errno.CommonInvalidParamCode) } - return nil -} - -// UpdateBuiltinEvaluatorMeta 修改内置评估器元信息（包含benchmark/vendor） -func (e *EvaluatorServiceImpl) UpdateBuiltinEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, benchmark, vendor, userID string) error { - // 仅当修改了名称时校验重名；description/benchmark/vendor 不需要重名校验 - if name != "" { - exist, err := e.evaluatorRepo.CheckNameExist(ctx, spaceID, id, name) - if err != nil { - return err - } - if exist { - return errorx.NewByCode(errno.EvaluatorNameExistCode) - } + name := "" + if req.Name != nil { + name = *req.Name } - if err := e.evaluatorRepo.UpdateBuiltinEvaluatorMeta(ctx, id, name, description, benchmark, vendor, userID); err != nil { + if err := e.validateUpdateEvaluatorMetaRequest(ctx, req.ID, req.SpaceID, name); err != nil { return err } - return nil + return e.evaluatorRepo.UpdateEvaluatorMeta(ctx, req) } // UpdateBuiltinEvaluatorTags 根据 evaluatorID + version 更新该版本的标签 diff --git a/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go b/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go index 8bde8e4ea..c979045cc 100644 --- a/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go +++ b/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go @@ -148,7 +148,7 @@ func (mr *MockEvaluatorServiceMockRecorder) GetEvaluator(ctx, spaceID, evaluator // GetEvaluatorVersion mocks base method. func (m *MockEvaluatorService) GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, builtin bool) (*entity.Evaluator, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetEvaluatorVersion", ctx, spaceID, evaluatorVersionID, includeDeleted, builtin) + ret := m.ctrl.Call(m, "GetEvaluatorVersion", ctx, spaceID, evaluatorVersionID, includeDeleted, builtin) ret0, _ := ret[0].(*entity.Evaluator) ret1, _ := ret[1].(error) return ret0, ret1 @@ -157,7 +157,7 @@ func (m *MockEvaluatorService) GetEvaluatorVersion(ctx context.Context, spaceID // GetEvaluatorVersion indicates an expected call of GetEvaluatorVersion. func (mr *MockEvaluatorServiceMockRecorder) GetEvaluatorVersion(ctx, spaceID, evaluatorVersionID, includeDeleted, builtin any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorVersion", reflect.TypeOf((*MockEvaluatorService)(nil).GetEvaluatorVersion), ctx, spaceID, evaluatorVersionID, includeDeleted, builtin) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorVersion", reflect.TypeOf((*MockEvaluatorService)(nil).GetEvaluatorVersion), ctx, spaceID, evaluatorVersionID, includeDeleted, builtin) } // ListBuiltinEvaluator mocks base method. @@ -253,28 +253,15 @@ func (mr *MockEvaluatorServiceMockRecorder) UpdateEvaluatorDraft(ctx, versionDO } // UpdateEvaluatorMeta mocks base method. -func (m *MockEvaluatorService) UpdateEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, userID string) error { +func (m *MockEvaluatorService) UpdateEvaluatorMeta(ctx context.Context, req *entity.UpdateEvaluatorMetaRequest) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateEvaluatorMeta", ctx, id, spaceID, name, description, userID) + ret := m.ctrl.Call(m, "UpdateEvaluatorMeta", ctx, req) ret0, _ := ret[0].(error) return ret0 } -// UpdateBuiltinEvaluatorMeta mocks base method. -func (m *MockEvaluatorService) UpdateBuiltinEvaluatorMeta(ctx context.Context, id, spaceID int64, name, description, benchmark, vendor, userID string) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateBuiltinEvaluatorMeta", ctx, id, spaceID, name, description, benchmark, vendor, userID) - ret0, _ := ret[0].(error) - return ret0 -} - -// UpdateBuiltinEvaluatorMeta indicates an expected call of UpdateBuiltinEvaluatorMeta. -func (mr *MockEvaluatorServiceMockRecorder) UpdateBuiltinEvaluatorMeta(ctx, id, spaceID, name, description, benchmark, vendor, userID any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateBuiltinEvaluatorMeta", reflect.TypeOf((*MockEvaluatorService)(nil).UpdateBuiltinEvaluatorMeta), ctx, id, spaceID, name, description, benchmark, vendor, userID) -} // UpdateEvaluatorMeta indicates an expected call of UpdateEvaluatorMeta. -func (mr *MockEvaluatorServiceMockRecorder) UpdateEvaluatorMeta(ctx, id, spaceID, name, description, userID any) *gomock.Call { +func (mr *MockEvaluatorServiceMockRecorder) UpdateEvaluatorMeta(ctx, req any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorMeta", reflect.TypeOf((*MockEvaluatorService)(nil).UpdateEvaluatorMeta), ctx, id, spaceID, name, description, userID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorMeta", reflect.TypeOf((*MockEvaluatorService)(nil).UpdateEvaluatorMeta), ctx, req) } diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 5ead8bb9b..9ecd17450 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -26,22 +26,24 @@ import ( // EvaluatorRepoImpl 实现 EvaluatorRepo 接口 type EvaluatorRepoImpl struct { - idgen idgen.IIDGenerator - evaluatorDao mysql.EvaluatorDAO - evaluatorVersionDao mysql.EvaluatorVersionDAO - tagDAO mysql.EvaluatorTagDAO - dbProvider db.Provider - lwt platestwrite.ILatestWriteTracker + idgen idgen.IIDGenerator + evaluatorDao mysql.EvaluatorDAO + evaluatorVersionDao mysql.EvaluatorVersionDAO + tagDAO mysql.EvaluatorTagDAO + evaluatorTemplateDAO mysql.EvaluatorTemplateDAO + dbProvider db.Provider + lwt platestwrite.ILatestWriteTracker } -func NewEvaluatorRepo(idgen idgen.IIDGenerator, provider db.Provider, evaluatorDao mysql.EvaluatorDAO, evaluatorVersionDao mysql.EvaluatorVersionDAO, tagDAO mysql.EvaluatorTagDAO, lwt platestwrite.ILatestWriteTracker) repo.IEvaluatorRepo { +func NewEvaluatorRepo(idgen idgen.IIDGenerator, provider db.Provider, evaluatorDao mysql.EvaluatorDAO, evaluatorVersionDao mysql.EvaluatorVersionDAO, tagDAO mysql.EvaluatorTagDAO, lwt platestwrite.ILatestWriteTracker, evaluatorTemplateDAO mysql.EvaluatorTemplateDAO) repo.IEvaluatorRepo { singletonEvaluatorRepo := &EvaluatorRepoImpl{ - evaluatorDao: evaluatorDao, - evaluatorVersionDao: evaluatorVersionDao, - tagDAO: tagDAO, - dbProvider: provider, - idgen: idgen, - lwt: lwt, + evaluatorDao: evaluatorDao, + evaluatorVersionDao: evaluatorVersionDao, + tagDAO: tagDAO, + evaluatorTemplateDAO: evaluatorTemplateDAO, + dbProvider: provider, + idgen: idgen, + lwt: lwt, } return singletonEvaluatorRepo } @@ -62,18 +64,41 @@ func (r *EvaluatorRepoImpl) SubmitEvaluatorVersion(ctx context.Context, evaluato if err != nil { return err } + // 提交版本成功后，根据模板ID为模板热度 +1（若可解析） + r.incrTemplatePopularityByEvaluator(ctx, evaluator, opt) // 如果是预置评估器，且携带了标签，则为本次提交的版本ID创建tags if evaluator.Builtin && len(evaluator.Tags) > 0 { - // 获取用户ID userID := session.UserIDInCtxOrEmpty(ctx) - // 将 map[EvaluatorTagKey][]string 转为 map[string][]string - tags := make(map[string][]string) - for tagKey, tagValues := range evaluator.Tags { - tags[string(tagKey)] = tagValues + // 统计需要创建的总标签数 + total := 0 + for _, tagValues := range evaluator.Tags { + total += len(tagValues) } - // 以提交版本的 evaluator_version_id 作为 source_id - if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorVersionPO.ID, int32(entity.EvaluatorTagKeyType_Evaluator), userID, tags, opt); err != nil { - return err + if total > 0 { + // 生成所需的ID + ids, err := r.idgen.GenMultiIDs(ctx, total) + if err != nil { + return err + } + idx := 0 + evaluatorTags := make([]*model.EvaluatorTag, 0, total) + for tagKey, tagValues := range evaluator.Tags { + for _, tagValue := range tagValues { + evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ + ID: ids[idx], + SourceID: evaluatorVersionPO.ID, + TagType: int32(entity.EvaluatorTagKeyType_Evaluator), + TagKey: string(tagKey), + TagValue: tagValue, + CreatedBy: userID, + UpdatedBy: userID, + }) + idx++ + } + } + if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags, opt); err != nil { + return err + } } } return nil @@ -84,6 +109,28 @@ func (r *EvaluatorRepoImpl) SubmitEvaluatorVersion(ctx context.Context, evaluato return nil } +// incrTemplatePopularityByEvaluator 根据 Evaluator 的模板ID为模板热度 +1 +func (r *EvaluatorRepoImpl) incrTemplatePopularityByEvaluator(ctx context.Context, evaluator *entity.Evaluator, opts ...db.Option) { + var templateIDStr string + switch evaluator.EvaluatorType { + case entity.EvaluatorTypePrompt: + if evaluator.PromptEvaluatorVersion != nil { + templateIDStr = evaluator.PromptEvaluatorVersion.PromptTemplateKey + } + case entity.EvaluatorTypeCode: + if evaluator.CodeEvaluatorVersion != nil && evaluator.CodeEvaluatorVersion.CodeTemplateKey != nil { + templateIDStr = *evaluator.CodeEvaluatorVersion.CodeTemplateKey + } + } + if templateIDStr == "" { + return + } + // 模板key存的是模板ID（字符串），转换为int64 + if id, err := strconv.ParseInt(templateIDStr, 10, 64); err == nil { + _ = r.evaluatorTemplateDAO.IncrPopularityByID(ctx, id, opts...) + } +} + func (r *EvaluatorRepoImpl) UpdateEvaluatorDraft(ctx context.Context, evaluator *entity.Evaluator) error { po, err := convertor.ConvertEvaluatorVersionDO2PO(evaluator) if err != nil { @@ -321,6 +368,8 @@ func (r *EvaluatorRepoImpl) CreateEvaluator(ctx context.Context, do *entity.Eval if err != nil { return err } + // 创建成功后，根据模板ID为模板热度 +1（若可解析） + r.incrTemplatePopularityByEvaluator(ctx, do, opt) return nil }) if err != nil { @@ -366,35 +415,29 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorDraft(ctx context.Context, ids []in } // UpdateEvaluatorMeta 更新 Evaluator -func (r *EvaluatorRepoImpl) UpdateEvaluatorMeta(ctx context.Context, id int64, name, description, userID string) error { - po := &model.Evaluator{ - ID: id, - Name: gptr.Of(name), - Description: gptr.Of(description), - UpdatedBy: userID, - } - err := r.evaluatorDao.UpdateEvaluatorMeta(ctx, po) - if err != nil { - return err +func (r *EvaluatorRepoImpl) UpdateEvaluatorMeta(ctx context.Context, req *entity.UpdateEvaluatorMetaRequest) error { + po := &model.Evaluator{ID: req.ID, UpdatedBy: req.UpdatedBy} + if req.Name != nil { + po.Name = req.Name } - return nil -} - -// UpdateBuiltinEvaluatorMeta 更新内置评估器的 benchmark 和 vendor 字段 -func (r *EvaluatorRepoImpl) UpdateBuiltinEvaluatorMeta(ctx context.Context, id int64, name, description, benchmark, vendor, userID string) error { - po := &model.Evaluator{ - ID: id, - Name: gptr.Of(name), - Description: gptr.Of(description), - Benchmark: gptr.Of(benchmark), - Vendor: gptr.Of(vendor), - UpdatedBy: userID, - } - err := r.evaluatorDao.UpdateBuiltinEvaluatorMeta(ctx, po) - if err != nil { - return err + if req.Description != nil { + po.Description = req.Description } - return nil + if req.Benchmark != nil { + po.Benchmark = req.Benchmark + } + if req.Vendor != nil { + po.Vendor = req.Vendor + } + if req.Builtin != nil { + // 将 bool 转为 1/2 存入 + if *req.Builtin { + po.Builtin = 1 + } else { + po.Builtin = 2 + } + } + return r.evaluatorDao.UpdateEvaluatorMeta(ctx, po) } // UpdateEvaluatorVersionTags 根据版本ID全量更新标签：不存在的新增，不在传入列表中的删除 @@ -450,8 +493,35 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorVersionTags(ctx context.Context, vers } if len(add) > 0 { userID := session.UserIDInCtxOrEmpty(ctx) - if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, versionID, int32(entity.EvaluatorTagKeyType_Evaluator), userID, add, opt); err != nil { - return err + // 统计需要新增的标签数量 + total := 0 + for _, vals := range add { + total += len(vals) + } + if total > 0 { + ids, err := r.idgen.GenMultiIDs(ctx, total) + if err != nil { + return err + } + idx := 0 + evaluatorTags := make([]*model.EvaluatorTag, 0, total) + for k, vals := range add { + for _, v := range vals { + evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ + ID: ids[idx], + SourceID: versionID, + TagType: int32(entity.EvaluatorTagKeyType_Evaluator), + TagKey: k, + TagValue: v, + CreatedBy: userID, + UpdatedBy: userID, + }) + idx++ + } + } + if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags, opt); err != nil { + return err + } } } return nil diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index 70e8d86dc..0d92a6bf2 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -1543,7 +1543,7 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { }, }, Tags: map[entity.EvaluatorTagKey][]string{ - entity.EvaluatorTagKey_Category: {"LLM", "Code"}, + entity.EvaluatorTagKey_Category: {"LLM", "Code"}, entity.EvaluatorTagKey_Objective: {"Quality"}, }, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ @@ -1608,9 +1608,9 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { DeleteEvaluatorTagsByConditions(gomock.Any(), int64(100), int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any(), gomock.Any()). Return(nil) - // 设置新增tags的期望 + // 设置新增tags的期望 mockTagDAO.EXPECT(). - BatchCreateEvaluatorTags(gomock.Any(), int64(100), int32(entity.EvaluatorTagKeyType_Evaluator), "test_user", gomock.Any(), gomock.Any()). + BatchCreateEvaluatorTags(gomock.Any(), gomock.Any(), gomock.Any()). Return(nil) }, expectedError: nil, @@ -1914,13 +1914,13 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorMeta(t *testing.T) { mockLWT := platestwritemocks.NewMockILatestWriteTracker(ctrl) tests := []struct { - name string - id int64 - benchmark string - vendor string - userID string - mockSetup func() - expectedError error + name string + id int64 + benchmark string + vendor string + userID string + mockSetup func() + expectedError error }{ { name: "成功更新内置评估器元数据", diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go index 40745d0ac..a750d0b5d 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go @@ -7,23 +7,28 @@ import ( "context" "errors" + "github.com/coze-dev/coze-loop/backend/infra/idgen" + "github.com/coze-dev/coze-loop/backend/infra/middleware/session" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" ) // EvaluatorTemplateRepoImpl 实现 EvaluatorTemplateRepo 接口 type EvaluatorTemplateRepoImpl struct { tagDAO mysql.EvaluatorTagDAO templateDAO mysql.EvaluatorTemplateDAO + idgen idgen.IIDGenerator } // NewEvaluatorTemplateRepo 创建 EvaluatorTemplateRepoImpl 实例 -func NewEvaluatorTemplateRepo(tagDAO mysql.EvaluatorTagDAO, templateDAO mysql.EvaluatorTemplateDAO) repo.EvaluatorTemplateRepo { +func NewEvaluatorTemplateRepo(tagDAO mysql.EvaluatorTagDAO, templateDAO mysql.EvaluatorTemplateDAO, idgen idgen.IIDGenerator) repo.EvaluatorTemplateRepo { return &EvaluatorTemplateRepoImpl{ tagDAO: tagDAO, templateDAO: templateDAO, + idgen: idgen, } } @@ -115,6 +120,41 @@ func (r *EvaluatorTemplateRepoImpl) CreateEvaluatorTemplate(ctx context.Context, return nil, err } + // 若携带了标签，则为模板创建tags（以模板ID作为 source_id） + if template != nil && len(template.Tags) > 0 { + userID := session.UserIDInCtxOrEmpty(ctx) + // 统计总标签数 + total := 0 + for _, vals := range template.Tags { + total += len(vals) + } + if total > 0 { + ids, err := r.idgen.GenMultiIDs(ctx, total) + if err != nil { + return nil, err + } + idx := 0 + evaluatorTags := make([]*model.EvaluatorTag, 0, total) + for tagKey, tagValues := range template.Tags { + for _, tagValue := range tagValues { + evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ + ID: ids[idx], + SourceID: createdPO.ID, + TagType: int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), + TagKey: string(tagKey), + TagValue: tagValue, + CreatedBy: userID, + UpdatedBy: userID, + }) + idx++ + } + } + if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags); err != nil { + return nil, err + } + } + } + // 转换PO到DO createdDO, err := convertor.ConvertEvaluatorTemplatePO2DOWithBaseInfo(createdPO) if err != nil { @@ -142,6 +182,89 @@ func (r *EvaluatorTemplateRepoImpl) UpdateEvaluatorTemplate(ctx context.Context, return nil, err } + // 标签全量对齐：新增补充、删除不在集合内的，保持未变化的不动 + if template != nil { + // 查询当前已有标签 + existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{template.ID}, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate)) + if err != nil { + return nil, err + } + // 构建现有集合 + existing := make(map[string]map[string]bool) + for _, t := range existingTags { + if _, ok := existing[t.TagKey]; !ok { + existing[t.TagKey] = make(map[string]bool) + } + existing[t.TagKey][t.TagValue] = true + } + // 目标集 + target := make(map[string]map[string]bool) + for k, vs := range template.Tags { + kstr := string(k) + if _, ok := target[kstr]; !ok { + target[kstr] = make(map[string]bool) + } + for _, v := range vs { + target[kstr][v] = true + } + } + // 计算需要删除 + del := make(map[string][]string) + for k, vals := range existing { + for v := range vals { + if !target[k][v] { + del[k] = append(del[k], v) + } + } + } + if len(del) > 0 { + if err := r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, template.ID, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), del); err != nil { + return nil, err + } + } + // 计算需要新增 + add := make(map[string][]string) + for k, vals := range target { + for v := range vals { + if !existing[k][v] { + add[k] = append(add[k], v) + } + } + } + if len(add) > 0 { + userID := session.UserIDInCtxOrEmpty(ctx) + total := 0 + for _, vs := range add { + total += len(vs) + } + if total > 0 { + ids, err := r.idgen.GenMultiIDs(ctx, total) + if err != nil { + return nil, err + } + idx := 0 + evaluatorTags := make([]*model.EvaluatorTag, 0, total) + for k, vs := range add { + for _, v := range vs { + evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ + ID: ids[idx], + SourceID: template.ID, + TagType: int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), + TagKey: k, + TagValue: v, + CreatedBy: userID, + UpdatedBy: userID, + }) + idx++ + } + } + if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags); err != nil { + return nil, err + } + } + } + } + // 转换PO到DO updatedDO, err := convertor.ConvertEvaluatorTemplatePO2DOWithBaseInfo(updatedPO) if err != nil { @@ -176,3 +299,8 @@ func (r *EvaluatorTemplateRepoImpl) GetEvaluatorTemplate(ctx context.Context, id return templateDO, nil } + +// IncrPopularityByID 基于ID将 popularity + 1 +func (r *EvaluatorTemplateRepoImpl) IncrPopularityByID(ctx context.Context, id int64) error { + return r.templateDAO.IncrPopularityByID(ctx, id) +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go index c90e5cdfb..7c0155a4b 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go @@ -30,8 +30,8 @@ func (m *MockEvaluatorTagDAO) GetSourceIDsByFilterConditions(ctx context.Context return args.Get(0).([]int64), args.Get(1).(int64), args.Error(2) } -func (m *MockEvaluatorTagDAO) BatchCreateEvaluatorTags(ctx context.Context, sourceID int64, tagType int32, userID string, tags map[string][]string, opts ...db.Option) error { - args := m.Called(ctx, sourceID, tagType, userID, tags, opts) +func (m *MockEvaluatorTagDAO) BatchCreateEvaluatorTags(ctx context.Context, evaluatorTags []*model.EvaluatorTag, opts ...db.Option) error { + args := m.Called(ctx, evaluatorTags, opts) return args.Error(0) } @@ -45,6 +45,23 @@ func (m *MockEvaluatorTagDAO) BatchGetTagsBySourceIDsAndType(ctx context.Context return args.Get(0).([]*model.EvaluatorTag), args.Error(1) } +// stubIDGen 为测试提供简单的自增ID生成器 +type stubIDGen struct{ cur int64 } + +func (s *stubIDGen) GenID(ctx context.Context) (int64, error) { + s.cur++ + return s.cur, nil +} + +func (s *stubIDGen) GenMultiIDs(ctx context.Context, counts int) ([]int64, error) { + ids := make([]int64, counts) + for i := 0; i < counts; i++ { + s.cur++ + ids[i] = s.cur + } + return ids, nil +} + // MockEvaluatorTemplateDAO 模拟模板DAO type MockEvaluatorTemplateDAO struct { mock.Mock @@ -75,19 +92,24 @@ func (m *MockEvaluatorTemplateDAO) ListEvaluatorTemplate(ctx context.Context, re return args.Get(0).(*mysql.ListEvaluatorTemplateResponse), args.Error(1) } +func (m *MockEvaluatorTemplateDAO) IncrPopularityByID(ctx context.Context, id int64, opts ...db.Option) error { + args := m.Called(ctx, id, opts) + return args.Error(0) +} + func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { t.Parallel() tests := []struct { - name string - request *repo.ListEvaluatorTemplateRequest - mockTagIDs []int64 - mockTagError error - mockTemplates *mysql.ListEvaluatorTemplateResponse + name string + request *repo.ListEvaluatorTemplateRequest + mockTagIDs []int64 + mockTagError error + mockTemplates *mysql.ListEvaluatorTemplateResponse mockTemplateError error - expectedResult *repo.ListEvaluatorTemplateResponse - expectedError bool - description string + expectedResult *repo.ListEvaluatorTemplateResponse + expectedError bool + description string }{ { name: "no filter conditions", @@ -102,28 +124,28 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { TotalCount: 2, Templates: []*model.EvaluatorTemplate{ { - ID: 1, - SpaceID: gptr.Of(int64(123)), - Name: gptr.Of("Template A"), - Description: gptr.Of("Description A"), + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template A"), + Description: gptr.Of("Description A"), EvaluatorType: gptr.Of(int32(1)), - Benchmark: gptr.Of("benchmark1"), - Vendor: gptr.Of("vendor1"), - Popularity: 100, - CreatedBy: "user1", - UpdatedBy: "user1", + Benchmark: gptr.Of("benchmark1"), + Vendor: gptr.Of("vendor1"), + Popularity: 100, + CreatedBy: "user1", + UpdatedBy: "user1", }, { - ID: 2, - SpaceID: gptr.Of(int64(123)), - Name: gptr.Of("Template B"), - Description: gptr.Of("Description B"), + ID: 2, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template B"), + Description: gptr.Of("Description B"), EvaluatorType: gptr.Of(int32(2)), - Benchmark: gptr.Of("benchmark2"), - Vendor: gptr.Of("vendor2"), - Popularity: 200, - CreatedBy: "user2", - UpdatedBy: "user2", + Benchmark: gptr.Of("benchmark2"), + Vendor: gptr.Of("vendor2"), + Popularity: 200, + CreatedBy: "user2", + UpdatedBy: "user2", }, }, }, @@ -131,14 +153,14 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { TotalCount: 2, Templates: []*entity.EvaluatorTemplate{ { - ID: 1, - SpaceID: 123, - Name: "Template A", - Description: "Description A", + ID: 1, + SpaceID: 123, + Name: "Template A", + Description: "Description A", EvaluatorType: entity.EvaluatorType(1), - Benchmark: "benchmark1", - Vendor: "vendor1", - Popularity: 100, + Benchmark: "benchmark1", + Vendor: "vendor1", + Popularity: 100, BaseInfo: &entity.BaseInfo{ CreatedBy: &entity.UserInfo{ UserID: gptr.Of("user1"), @@ -149,14 +171,14 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { }, }, { - ID: 2, - SpaceID: 123, - Name: "Template B", - Description: "Description B", + ID: 2, + SpaceID: 123, + Name: "Template B", + Description: "Description B", EvaluatorType: entity.EvaluatorType(2), - Benchmark: "benchmark2", - Vendor: "vendor2", - Popularity: 200, + Benchmark: "benchmark2", + Vendor: "vendor2", + Popularity: 200, BaseInfo: &entity.BaseInfo{ CreatedBy: &entity.UserInfo{ UserID: gptr.Of("user2"), @@ -194,16 +216,16 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { TotalCount: 1, Templates: []*model.EvaluatorTemplate{ { - ID: 1, - SpaceID: gptr.Of(int64(123)), - Name: gptr.Of("Template A"), - Description: gptr.Of("Description A"), + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template A"), + Description: gptr.Of("Description A"), EvaluatorType: gptr.Of(int32(1)), - Benchmark: gptr.Of("benchmark1"), - Vendor: gptr.Of("vendor1"), - Popularity: 100, - CreatedBy: "user1", - UpdatedBy: "user1", + Benchmark: gptr.Of("benchmark1"), + Vendor: gptr.Of("vendor1"), + Popularity: 100, + CreatedBy: "user1", + UpdatedBy: "user1", }, }, }, @@ -211,14 +233,14 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { TotalCount: 1, Templates: []*entity.EvaluatorTemplate{ { - ID: 1, - SpaceID: 123, - Name: "Template A", - Description: "Description A", + ID: 1, + SpaceID: 123, + Name: "Template A", + Description: "Description A", EvaluatorType: entity.EvaluatorType(1), - Benchmark: "benchmark1", - Vendor: "vendor1", - Popularity: 100, + Benchmark: "benchmark1", + Vendor: "vendor1", + Popularity: 100, BaseInfo: &entity.BaseInfo{ CreatedBy: &entity.UserInfo{ UserID: gptr.Of("user1"), @@ -251,7 +273,7 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { PageNum: 1, IncludeDeleted: false, }, - mockTagError: assert.AnError, + mockTagError: assert.AnError, expectedError: true, description: "标签查询出错时，应该返回错误", }, @@ -282,16 +304,16 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { TotalCount: 2, Templates: []*model.EvaluatorTemplate{ { - ID: 1, - SpaceID: gptr.Of(int64(123)), - Name: gptr.Of("Template A"), - Description: gptr.Of("Description A"), + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template A"), + Description: gptr.Of("Description A"), EvaluatorType: gptr.Of(int32(1)), - Benchmark: gptr.Of("benchmark1"), - Vendor: gptr.Of("vendor1"), - Popularity: 100, - CreatedBy: "user1", - UpdatedBy: "user1", + Benchmark: gptr.Of("benchmark1"), + Vendor: gptr.Of("vendor1"), + Popularity: 100, + CreatedBy: "user1", + UpdatedBy: "user1", }, }, }, @@ -299,14 +321,14 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { TotalCount: 2, Templates: []*entity.EvaluatorTemplate{ { - ID: 1, - SpaceID: 123, - Name: "Template A", - Description: "Description A", + ID: 1, + SpaceID: 123, + Name: "Template A", + Description: "Description A", EvaluatorType: entity.EvaluatorType(1), - Benchmark: "benchmark1", - Vendor: "vendor1", - Popularity: 100, + Benchmark: "benchmark1", + Vendor: "vendor1", + Popularity: 100, BaseInfo: &entity.BaseInfo{ CreatedBy: &entity.UserInfo{ UserID: gptr.Of("user1"), @@ -398,7 +420,7 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { } // 创建repo实例 - repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO) + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, &stubIDGen{}) // 执行测试 ctx := context.Background() @@ -452,26 +474,26 @@ func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { { name: "valid po", po: &model.EvaluatorTemplate{ - ID: 1, - SpaceID: gptr.Of(int64(123)), - Name: gptr.Of("Test Template"), - Description: gptr.Of("Test Description"), + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Test Template"), + Description: gptr.Of("Test Description"), EvaluatorType: gptr.Of(int32(1)), - Benchmark: gptr.Of("test_benchmark"), - Vendor: gptr.Of("test_vendor"), - Popularity: 100, - CreatedBy: "user1", - UpdatedBy: "user1", + Benchmark: gptr.Of("test_benchmark"), + Vendor: gptr.Of("test_vendor"), + Popularity: 100, + CreatedBy: "user1", + UpdatedBy: "user1", }, expected: &entity.EvaluatorTemplate{ - ID: 1, - SpaceID: 123, - Name: "Test Template", - Description: "Test Description", + ID: 1, + SpaceID: 123, + Name: "Test Template", + Description: "Test Description", EvaluatorType: entity.EvaluatorType(1), - Benchmark: "test_benchmark", - Vendor: "test_vendor", - Popularity: 100, + Benchmark: "test_benchmark", + Vendor: "test_vendor", + Popularity: 100, BaseInfo: &entity.BaseInfo{ CreatedBy: &entity.UserInfo{ UserID: gptr.Of("user1"), @@ -565,7 +587,7 @@ func TestEvaluatorTemplateRepoImpl_CreateEvaluatorTemplate(t *testing.T) { mockTemplateDAO := &MockEvaluatorTemplateDAO{} mockTagDAO := &MockEvaluatorTagDAO{} - repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO) + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, &stubIDGen{}) if tt.template != nil { mockTemplateDAO.On("CreateEvaluatorTemplate", mock.Anything, mock.Anything, mock.Anything).Return(tt.mockTemplate, tt.mockError) @@ -643,7 +665,7 @@ func TestEvaluatorTemplateRepoImpl_UpdateEvaluatorTemplate(t *testing.T) { mockTemplateDAO := &MockEvaluatorTemplateDAO{} mockTagDAO := &MockEvaluatorTagDAO{} - repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO) + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, &stubIDGen{}) if tt.template != nil { mockTemplateDAO.On("UpdateEvaluatorTemplate", mock.Anything, mock.Anything, mock.Anything).Return(tt.mockTemplate, tt.mockError) @@ -703,7 +725,7 @@ func TestEvaluatorTemplateRepoImpl_DeleteEvaluatorTemplate(t *testing.T) { mockTemplateDAO := &MockEvaluatorTemplateDAO{} mockTagDAO := &MockEvaluatorTagDAO{} - repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO) + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, &stubIDGen{}) mockTemplateDAO.On("DeleteEvaluatorTemplate", mock.Anything, tt.id, tt.userID, mock.Anything).Return(tt.mockError) @@ -779,7 +801,7 @@ func TestEvaluatorTemplateRepoImpl_GetEvaluatorTemplate(t *testing.T) { mockTemplateDAO := &MockEvaluatorTemplateDAO{} mockTagDAO := &MockEvaluatorTagDAO{} - repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO) + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, &stubIDGen{}) mockTemplateDAO.On("GetEvaluatorTemplate", mock.Anything, tt.id, tt.includeDeleted, mock.Anything).Return(tt.mockTemplate, tt.mockError) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go index b8ea6683f..b00228830 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go @@ -26,7 +26,6 @@ type EvaluatorDAO interface { GetEvaluatorByID(ctx context.Context, id int64, includeDeleted bool, opts ...db.Option) (*model.Evaluator, error) BatchGetEvaluatorByID(ctx context.Context, ids []int64, includeDeleted bool, opts ...db.Option) ([]*model.Evaluator, error) UpdateEvaluatorMeta(ctx context.Context, do *model.Evaluator, opts ...db.Option) error - UpdateBuiltinEvaluatorMeta(ctx context.Context, do *model.Evaluator, opts ...db.Option) error UpdateEvaluatorDraftSubmitted(ctx context.Context, evaluatorID int64, draftSubmitted bool, userID string, opts ...db.Option) error BatchDeleteEvaluator(ctx context.Context, ids []int64, userID string, opts ...db.Option) error ListEvaluator(ctx context.Context, req *ListEvaluatorRequest, opts ...db.Option) (*ListEvaluatorResponse, error) @@ -122,29 +121,16 @@ func (dao *EvaluatorDAOImpl) UpdateEvaluatorMeta(ctx context.Context, po *model. updateMap["name"] = po.Name updateMap["description"] = po.Description updateMap["updated_by"] = po.UpdatedBy - return dbsession.WithContext(ctx).Model(&model.Evaluator{}). - Where("id = ?", po.ID). // 添加ID筛选条件 - Where("deleted_at IS NULL"). // 添加软删除筛选条件 - Updates(updateMap). // 使用Updates代替Save，避免全字段覆盖 - Error -} - -// UpdateBuiltinEvaluatorMeta 更新内置评估器的 benchmark 和 vendor 字段 -func (dao *EvaluatorDAOImpl) UpdateBuiltinEvaluatorMeta(ctx context.Context, po *model.Evaluator, opts ...db.Option) error { - // 通过opts获取当前的db session实例 - dbsession := dao.provider.NewSession(ctx, opts...) - updateMap := make(map[string]interface{}) - // 更新 benchmark 和 vendor 字段 - updateMap["benchmark"] = po.Benchmark - updateMap["vendor"] = po.Vendor - // 允许同时更新名称与描述 - if po.Name != nil { - updateMap["name"] = po.Name + // 可选字段：builtin/benchmark/vendor，如果传入则更新 + if po.Benchmark != nil { + updateMap["benchmark"] = po.Benchmark } - if po.Description != nil { - updateMap["description"] = po.Description + if po.Vendor != nil { + updateMap["vendor"] = po.Vendor + } + if po.Builtin != 0 { + updateMap["builtin"] = po.Builtin } - updateMap["updated_by"] = po.UpdatedBy return dbsession.WithContext(ctx).Model(&model.Evaluator{}). Where("id = ?", po.ID). // 添加ID筛选条件 Where("deleted_at IS NULL"). // 添加软删除筛选条件 @@ -209,7 +195,7 @@ type ListEvaluatorRequest struct { SearchName string CreatorIDs []int64 EvaluatorType []int32 - IDs []int64 // 新增：支持按ID查询 + IDs []int64 // 新增：支持按ID查询 PageSize int32 PageNum int32 OrderBy []*OrderBy diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index 1733440ac..af327275b 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -26,7 +26,7 @@ type EvaluatorTagDAO interface { // GetSourceIDsByFilterConditions 根据筛选条件查询source_id列表，支持复杂的AND/OR逻辑和分页 GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, opts ...db.Option) ([]int64, int64, error) // BatchCreateEvaluatorTags 批量创建评估器标签 - BatchCreateEvaluatorTags(ctx context.Context, sourceID int64, tagType int32, userID string, tags map[string][]string, opts ...db.Option) error + BatchCreateEvaluatorTags(ctx context.Context, evaluatorTags []*model.EvaluatorTag, opts ...db.Option) error // DeleteEvaluatorTagsByConditions 根据sourceID、tagType、tags条件删除标签 DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, tags map[string][]string, opts ...db.Option) error } @@ -70,27 +70,7 @@ func (dao *EvaluatorTagDAOImpl) BatchGetTagsBySourceIDsAndType(ctx context.Conte } // BatchCreateEvaluatorTags 批量创建评估器标签 -func (dao *EvaluatorTagDAOImpl) BatchCreateEvaluatorTags(ctx context.Context, sourceID int64, tagType int32, userID string, tags map[string][]string, opts ...db.Option) error { - if len(tags) == 0 { - return nil - } - - // 构建model.EvaluatorTag列表 - var evaluatorTags []*model.EvaluatorTag - for tagKey, tagValues := range tags { - for _, tagValue := range tagValues { - tag := &model.EvaluatorTag{ - SourceID: sourceID, - TagType: tagType, - TagKey: tagKey, - TagValue: tagValue, - CreatedBy: userID, - UpdatedBy: userID, - } - evaluatorTags = append(evaluatorTags, tag) - } - } - +func (dao *EvaluatorTagDAOImpl) BatchCreateEvaluatorTags(ctx context.Context, evaluatorTags []*model.EvaluatorTag, opts ...db.Option) error { if len(evaluatorTags) == 0 { return nil } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_template.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_template.go index 1292ffc54..ee254c669 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_template.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_template.go @@ -34,6 +34,9 @@ type EvaluatorTemplateDAO interface { // ListEvaluatorTemplate 根据筛选条件查询evaluator_template列表，支持tag筛选和分页 ListEvaluatorTemplate(ctx context.Context, req *ListEvaluatorTemplateRequest, opts ...db.Option) (*ListEvaluatorTemplateResponse, error) + + // IncrPopularityByID 基于ID将 popularity + 1 + IncrPopularityByID(ctx context.Context, id int64, opts ...db.Option) error } var ( @@ -56,10 +59,10 @@ func NewEvaluatorTemplateDAO(p db.Provider) EvaluatorTemplateDAO { } type ListEvaluatorTemplateRequest struct { - IDs []int64 - PageSize int32 - PageNum int32 - IncludeDeleted bool + IDs []int64 + PageSize int32 + PageNum int32 + IncludeDeleted bool } type ListEvaluatorTemplateResponse struct { @@ -67,7 +70,6 @@ type ListEvaluatorTemplateResponse struct { Templates []*model.EvaluatorTemplate } - func (dao *EvaluatorTemplateDAOImpl) ListEvaluatorTemplate(ctx context.Context, req *ListEvaluatorTemplateRequest, opts ...db.Option) (*ListEvaluatorTemplateResponse, error) { // 通过opts获取当前的db session实例 if contexts.CtxWriteDB(ctx) { @@ -209,3 +211,17 @@ func (dao *EvaluatorTemplateDAOImpl) GetEvaluatorTemplate(ctx context.Context, i return &template, nil } + +// IncrPopularityByID 基于ID将 popularity + 1 +func (dao *EvaluatorTemplateDAOImpl) IncrPopularityByID(ctx context.Context, id int64, opts ...db.Option) error { + if contexts.CtxWriteDB(ctx) { + opts = append(opts, db.WithMaster()) + } + dbsession := dao.provider.NewSession(ctx, opts...) + return dbsession.WithContext(ctx). + Model(&model.EvaluatorTemplate{}). + Where("id = ?", id). + Where("deleted_at IS NULL"). + UpdateColumn("popularity", gorm.Expr("popularity + 1")). + Error +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go index 22ee483d3..50db0136d 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go @@ -161,25 +161,6 @@ func (mr *MockEvaluatorDAOMockRecorder) ListEvaluator(ctx, req any, opts ...any) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluator", reflect.TypeOf((*MockEvaluatorDAO)(nil).ListEvaluator), varargs...) } -// UpdateBuiltinEvaluatorMeta mocks base method. -func (m *MockEvaluatorDAO) UpdateBuiltinEvaluatorMeta(ctx context.Context, do *model.Evaluator, opts ...db.Option) error { - m.ctrl.T.Helper() - varargs := []any{ctx, do} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "UpdateBuiltinEvaluatorMeta", varargs...) - ret0, _ := ret[0].(error) - return ret0 -} - -// UpdateBuiltinEvaluatorMeta indicates an expected call of UpdateBuiltinEvaluatorMeta. -func (mr *MockEvaluatorDAOMockRecorder) UpdateBuiltinEvaluatorMeta(ctx, do any, opts ...any) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]any{ctx, do}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateBuiltinEvaluatorMeta", reflect.TypeOf((*MockEvaluatorDAO)(nil).UpdateBuiltinEvaluatorMeta), varargs...) -} - // UpdateEvaluatorDraftSubmitted mocks base method. func (m *MockEvaluatorDAO) UpdateEvaluatorDraftSubmitted(ctx context.Context, evaluatorID int64, draftSubmitted bool, userID string, opts ...db.Option) error { m.ctrl.T.Helper() diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go index 1b45a9c6f..931f29484 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go @@ -44,9 +44,9 @@ func (m *MockEvaluatorTagDAO) EXPECT() *MockEvaluatorTagDAOMockRecorder { } // BatchCreateEvaluatorTags mocks base method. -func (m *MockEvaluatorTagDAO) BatchCreateEvaluatorTags(ctx context.Context, sourceID int64, tagType int32, userID string, tags map[string][]string, opts ...db.Option) error { +func (m *MockEvaluatorTagDAO) BatchCreateEvaluatorTags(ctx context.Context, evaluatorTags []*model.EvaluatorTag, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []any{ctx, sourceID, tagType, userID, tags} + varargs := []any{ctx, evaluatorTags} for _, a := range opts { varargs = append(varargs, a) } @@ -56,9 +56,9 @@ func (m *MockEvaluatorTagDAO) BatchCreateEvaluatorTags(ctx context.Context, sour } // BatchCreateEvaluatorTags indicates an expected call of BatchCreateEvaluatorTags. -func (mr *MockEvaluatorTagDAOMockRecorder) BatchCreateEvaluatorTags(ctx, sourceID, tagType, userID, tags any, opts ...any) *gomock.Call { +func (mr *MockEvaluatorTagDAOMockRecorder) BatchCreateEvaluatorTags(ctx, evaluatorTags any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{ctx, sourceID, tagType, userID, tags}, opts...) + varargs := append([]any{ctx, evaluatorTags}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchCreateEvaluatorTags", reflect.TypeOf((*MockEvaluatorTagDAO)(nil).BatchCreateEvaluatorTags), varargs...) } diff --git a/backend/modules/evaluation/pkg/conf/evaluator.go b/backend/modules/evaluation/pkg/conf/evaluator.go index 270905a8f..8adb563d4 100755 --- a/backend/modules/evaluation/pkg/conf/evaluator.go +++ b/backend/modules/evaluation/pkg/conf/evaluator.go @@ -252,9 +252,8 @@ type evaluatorConfiger struct { func (c *evaluatorConfiger) GetEvaluatorTagConf(ctx context.Context) (etf map[evaluatordto.EvaluatorTagKey][]string) { const key = "evaluator_tag_config" etf = make(map[evaluatordto.EvaluatorTagKey][]string) - typ := make(map[evaluatordto.EvaluatorTagKey][]string) - if c.loader.UnmarshalKey(ctx, key, &typ, conf.WithTagName("json")) == nil && len(typ) > 0 { - return typ + if c.loader.UnmarshalKey(ctx, key, &etf, conf.WithTagName("json")) == nil && len(etf) > 0 { + return etf } return DefaultEvaluatorTagConf() } diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift index a709a8b61..599ee886c 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift @@ -136,7 +136,7 @@ struct GetEvaluatorVersionRequest { 1: required i64 workspace_id (api.query='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') 2: required i64 evaluator_version_id (api.path='evaluator_version_id', api.js_conv='true', go.tag='json:"evaluator_version_id"') 3: optional bool include_deleted (api.query='include_deleted') // 是否查询已删除的评估器，默认不查询 - 4: optional bool builtin (api.body='builtin', go.tag = 'json:"builtin"') // 是否预置评估器 + 4: optional bool builtin (api.query='builtin', go.tag = 'json:"builtin"') // 是否预置评估器 255: optional base.Base Base } @@ -420,7 +420,7 @@ struct UpdateBuiltinEvaluatorTagsRequest { } struct UpdateBuiltinEvaluatorTagsResponse { - 1: required evaluator.EvaluatorVersion version (api.body='version') + 1: required evaluator.Evaluator evaluator (api.body='evaluator') 255: base.BaseResp BaseResp } @@ -437,7 +437,8 @@ struct CreateEvaluatorTemplateResponse { } struct UpdateEvaluatorTemplateRequest { - 1: required evaluator.EvaluatorTemplate evaluator_template (api.body='evaluator_template') + 1: required i64 evaluator_template_id (api.path='evaluator_template_id', api.js_conv='true', go.tag='json:"evaluator_template_id"') + 2: required evaluator.EvaluatorTemplate evaluator_template (api.body='evaluator_template') 255: optional base.Base Base } @@ -448,7 +449,7 @@ struct UpdateEvaluatorTemplateResponse { } struct DeleteEvaluatorTemplateRequest { - 1: required i64 evaluator_template_id (api.body='evaluator_template_id', api.js_conv='true', go.tag='json:"evaluator_template_id"') + 1: required i64 evaluator_template_id (api.path='evaluator_template_id', api.js_conv='true', go.tag='json:"evaluator_template_id"') 255: optional base.Base Base } @@ -504,20 +505,20 @@ service EvaluatorService { ValidateEvaluatorResponse ValidateEvaluator(1: ValidateEvaluatorRequest request) (api.post="/api/evaluation/v1/evaluators/validate") // 查询评估器模板 - ListTemplatesV2Response ListTemplatesV2(1: ListTemplatesV2Request request) (api.post="/api/evaluation/v1/evaluators/list_template_v2") + ListTemplatesV2Response ListTemplatesV2(1: ListTemplatesV2Request request) (api.post="/api/evaluation/v1/evaluator_template/list") // 创建评估器模板 - CreateEvaluatorTemplateResponse CreateEvaluatorTemplate(1: CreateEvaluatorTemplateRequest request) (api.post="/api/evaluation/v1/evaluators/create_template") + CreateEvaluatorTemplateResponse CreateEvaluatorTemplate(1: CreateEvaluatorTemplateRequest request) (api.post="/api/evaluation/v1/evaluator_template") // 更新评估器模板 - UpdateEvaluatorTemplateResponse UpdateEvaluatorTemplate(1: UpdateEvaluatorTemplateRequest request) (api.post="/api/evaluation/v1/evaluators/update_template") + UpdateEvaluatorTemplateResponse UpdateEvaluatorTemplate(1: UpdateEvaluatorTemplateRequest request) (api.patch="/api/evaluation/v1/evaluator_template/:evaluator_template_id") // 删除 - DeleteEvaluatorTemplateResponse DeleteEvaluatorTemplate(1: DeleteEvaluatorTemplateRequest request) (api.post="/api/evaluation/v1/evaluators/delete_template") + DeleteEvaluatorTemplateResponse DeleteEvaluatorTemplate(1: DeleteEvaluatorTemplateRequest request) (api.delete="/api/evaluation/v1/evaluator_template/:evaluator_template_id") // 调试预置评估器 DebugBuiltinEvaluatorResponse DebugBuiltinEvaluator(1: DebugBuiltinEvaluatorRequest req) (api.post="/api/evaluation/v1/evaluators/debug_builtin")// 调试预置评估器 // 更新预置评估器tag - UpdateBuiltinEvaluatorTagsResponse UpdateBuiltinEvaluatorTags(1: UpdateBuiltinEvaluatorTagsRequest req) (api.post="/api/evaluation/v1/evaluators/update_builtin_tags")// 更新预置评估器 + UpdateBuiltinEvaluatorTagsResponse UpdateBuiltinEvaluatorTags(1: UpdateBuiltinEvaluatorTagsRequest req) (api.patch="/api/evaluation/v1/evaluators/:evaluator_id/update_builtin_tags")// 更新预置评估器 // 查询Tag ListEvaluatorTagsResponse ListEvaluatorTags(1: ListEvaluatorTagsRequest req) (api.post="/api/evaluation/v1/evaluators/list_tags") diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index 8e0cedfea..4658c73a6 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -132,14 +132,14 @@ struct EvaluatorFilterOption { // Evaluator筛选条件 struct EvaluatorFilters { 1: optional list filter_conditions // 筛选条件列表 - 2: optional FilterLogicOp logic_op // 逻辑操作符 + 2: optional EvaluatorFilterLogicOp logic_op // 逻辑操作符 } // 筛选逻辑操作符 -typedef string FilterLogicOp(ts.enum="true") -const FilterLogicOp FilterLogicOp_Unknown = "Unknown" -const FilterLogicOp FilterLogicOp_And = "And" // 与操作 -const FilterLogicOp FilterLogicOp_Or = "Or" // 或操作 +typedef string EvaluatorFilterLogicOp(ts.enum="true") +const EvaluatorFilterLogicOp EvaluatorFilterLogicOp_Unknown = "Unknown" +const EvaluatorFilterLogicOp EvaluatorFilterLogicOp_And = "And" // 与操作 +const EvaluatorFilterLogicOp EvaluatorFilterLogicOp_Or = "Or" // 或操作 // Evaluator筛选条件 struct EvaluatorFilterCondition { From 48f97fb1edbc4c295f96573015aaf9e96340bdb5 Mon Sep 17 00:00:00 2001 From: tpfz Date: Thu, 30 Oct 2025 21:26:27 +0800 Subject: [PATCH 05/42] feat: [Coda] squash evaluator updates (LogID: 20251030212451010091110134070EE5D) Co-Authored-By: Coda --- .../coze/loop/apis/evaluator_service.go | 12 +- .../evaluation/domain/evaluator/evaluator.go | 395 +++++++--- .../domain/evaluator/k-evaluator.go | 306 ++++++-- .../coze.loop.evaluation.evaluator.go | 706 ++++++++++++++---- ...oze.loop.evaluation.evaluator_validator.go | 15 + .../k-coze.loop.evaluation.evaluator.go | 522 ++++++++++--- .../convertor/evaluator/evaluator.go | 76 +- .../convertor/evaluator/evaluator_template.go | 20 +- .../evaluation/application/evaluator_app.go | 123 +-- .../evaluation/domain/entity/evaluator.go | 13 +- .../evaluation/domain/entity/evaluator_tag.go | 8 +- .../domain/entity/evaluator_template.go | 12 +- .../modules/evaluation/domain/entity/param.go | 102 ++- .../evaluation/domain/repo/evaluator.go | 10 +- .../evaluation/domain/service/evaluator.go | 4 +- .../domain/service/evaluator_impl.go | 98 +-- .../domain/service/evaluator_template_impl.go | 23 +- .../infra/repo/evaluator/evaluator_impl.go | 277 +++---- .../repo/evaluator/evaluator_impl_test.go | 4 +- .../repo/evaluator/evaluator_template_impl.go | 213 ++++-- .../evaluator/evaluator_template_impl_test.go | 14 +- .../evaluator/list_builtin_evaluator_test.go | 31 +- .../evaluator/mysql/convertor/evaluator.go | 56 +- .../mysql/convertor/evaluator_template.go | 2 +- .../infra/repo/evaluator/mysql/evaluator.go | 64 +- .../repo/evaluator/mysql/evaluator_tag.go | 26 +- .../mysql/evaluator_tag_filter_test.go | 55 +- .../repo/evaluator/mysql/evaluator_version.go | 34 +- .../mysql/gorm_gen/model/evaluator.gen.go | 31 +- .../mysql/gorm_gen/model/evaluator_tag.gen.go | 1 + .../mysql/gorm_gen/query/evaluator.gen.go | 38 +- .../mysql/gorm_gen/query/evaluator_tag.gen.go | 6 +- .../evaluator/mysql/mocks/evaluator_mock.go | 20 + .../mysql/mocks/evaluator_tag_mock.go | 24 +- .../coze.loop.evaluation.evaluator.thrift | 14 +- .../loop/evaluation/domain/evaluator.thrift | 11 +- .../mysql-init/init-sql/evaluator.sql | 1 + .../mysql-init/init-sql/evaluator_tag.sql | 1 + 38 files changed, 2344 insertions(+), 1024 deletions(-) diff --git a/backend/api/handler/coze/loop/apis/evaluator_service.go b/backend/api/handler/coze/loop/apis/evaluator_service.go index 350d93c1a..8da52dd99 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service.go @@ -238,17 +238,7 @@ func CreateEvaluatorTemplate(ctx context.Context, c *app.RequestContext) { // UpdateEvaluatorTemplate . // @router /api/evaluation/v1/evaluators/update_template [POST] func UpdateEvaluatorTemplate(ctx context.Context, c *app.RequestContext) { - var err error - var req evaluator.UpdateEvaluatorTemplateRequest - err = c.BindAndValidate(&req) - if err != nil { - c.String(consts.StatusBadRequest, err.Error()) - return - } - - resp := new(evaluator.UpdateEvaluatorTemplateResponse) - - c.JSON(consts.StatusOK, resp) + invokeAndRender(ctx, c, localEvaluatorSvc.UpdateEvaluatorTemplate) } // DeleteEvaluatorTemplate . diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go index 2a0fe8e41..d7fcd5bf4 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go @@ -16,6 +16,10 @@ const ( LanguageTypeJS = "JS" + EvaluatorTagLangTypeZh = "zh-CN" + + EvaluatorTagLangTypeEn = "en-US" + EvaluatorTagKeyCategory = "Category" EvaluatorTagKeyTargetType = "TargetType" @@ -28,8 +32,6 @@ const ( EvaluatorTagKeyName = "Name" - EvaluatorTagKeyVisible = "Visible" - EvaluatorFilterLogicOpUnknown = "Unknown" EvaluatorFilterLogicOpAnd = "And" @@ -282,6 +284,8 @@ func (p *EvaluatorRunStatus) Value() (driver.Value, error) { type LanguageType = string +type EvaluatorTagLangType = string + // Evaluator筛选字段 type EvaluatorTagKey = string @@ -2839,19 +2843,20 @@ func (p *EvaluatorContent) Field102DeepEqual(src *CodeEvaluator) bool { } type Evaluator struct { - EvaluatorID *int64 `thrift:"evaluator_id,1,optional" frugal:"1,optional,i64" json:"evaluator_id" form:"evaluator_id" query:"evaluator_id"` - WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" form:"workspace_id" query:"workspace_id"` - EvaluatorType *EvaluatorType `thrift:"evaluator_type,3,optional" frugal:"3,optional,EvaluatorType" form:"evaluator_type" json:"evaluator_type,omitempty" query:"evaluator_type"` - Name *string `thrift:"name,4,optional" frugal:"4,optional,string" form:"name" json:"name,omitempty" query:"name"` - Description *string `thrift:"description,5,optional" frugal:"5,optional,string" form:"description" json:"description,omitempty" query:"description"` - DraftSubmitted *bool `thrift:"draft_submitted,6,optional" frugal:"6,optional,bool" form:"draft_submitted" json:"draft_submitted,omitempty" query:"draft_submitted"` - BaseInfo *common.BaseInfo `thrift:"base_info,7,optional" frugal:"7,optional,common.BaseInfo" form:"base_info" json:"base_info,omitempty" query:"base_info"` - CurrentVersion *EvaluatorVersion `thrift:"current_version,11,optional" frugal:"11,optional,EvaluatorVersion" form:"current_version" json:"current_version,omitempty" query:"current_version"` - LatestVersion *string `thrift:"latest_version,12,optional" frugal:"12,optional,string" form:"latest_version" json:"latest_version,omitempty" query:"latest_version"` - Builtin *bool `thrift:"builtin,20,optional" frugal:"20,optional,bool" json:"builtin" form:"builtin" query:"builtin"` - Benchmark *string `thrift:"benchmark,21,optional" frugal:"21,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` - Vendor *string `thrift:"vendor,22,optional" frugal:"22,optional,string" json:"vendor" form:"vendor" query:"vendor"` - Tags map[EvaluatorTagKey][]string `thrift:"tags,23" frugal:"23,default,map>" json:"tags" form:"tags" query:"tags"` + EvaluatorID *int64 `thrift:"evaluator_id,1,optional" frugal:"1,optional,i64" json:"evaluator_id" form:"evaluator_id" query:"evaluator_id"` + WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" form:"workspace_id" query:"workspace_id"` + EvaluatorType *EvaluatorType `thrift:"evaluator_type,3,optional" frugal:"3,optional,EvaluatorType" form:"evaluator_type" json:"evaluator_type,omitempty" query:"evaluator_type"` + Name *string `thrift:"name,4,optional" frugal:"4,optional,string" form:"name" json:"name,omitempty" query:"name"` + Description *string `thrift:"description,5,optional" frugal:"5,optional,string" form:"description" json:"description,omitempty" query:"description"` + DraftSubmitted *bool `thrift:"draft_submitted,6,optional" frugal:"6,optional,bool" form:"draft_submitted" json:"draft_submitted,omitempty" query:"draft_submitted"` + BaseInfo *common.BaseInfo `thrift:"base_info,7,optional" frugal:"7,optional,common.BaseInfo" form:"base_info" json:"base_info,omitempty" query:"base_info"` + CurrentVersion *EvaluatorVersion `thrift:"current_version,11,optional" frugal:"11,optional,EvaluatorVersion" form:"current_version" json:"current_version,omitempty" query:"current_version"` + LatestVersion *string `thrift:"latest_version,12,optional" frugal:"12,optional,string" form:"latest_version" json:"latest_version,omitempty" query:"latest_version"` + Builtin *bool `thrift:"builtin,20,optional" frugal:"20,optional,bool" json:"builtin" form:"builtin" query:"builtin"` + Benchmark *string `thrift:"benchmark,21,optional" frugal:"21,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` + Vendor *string `thrift:"vendor,22,optional" frugal:"22,optional,string" json:"vendor" form:"vendor" query:"vendor"` + BuiltinVisibleVersion *string `thrift:"builtin_visible_version,23,optional" frugal:"23,optional,string" json:"builtin_visible_version" form:"builtin_visible_version" query:"builtin_visible_version"` + Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `thrift:"tags,100,optional" frugal:"100,optional,map>>" json:"tags" form:"tags" query:"tags"` } func NewEvaluator() *Evaluator { @@ -3005,11 +3010,28 @@ func (p *Evaluator) GetVendor() (v string) { return *p.Vendor } -func (p *Evaluator) GetTags() (v map[EvaluatorTagKey][]string) { - if p != nil { - return p.Tags +var Evaluator_BuiltinVisibleVersion_DEFAULT string + +func (p *Evaluator) GetBuiltinVisibleVersion() (v string) { + if p == nil { + return } - return + if !p.IsSetBuiltinVisibleVersion() { + return Evaluator_BuiltinVisibleVersion_DEFAULT + } + return *p.BuiltinVisibleVersion +} + +var Evaluator_Tags_DEFAULT map[EvaluatorTagLangType]map[EvaluatorTagKey][]string + +func (p *Evaluator) GetTags() (v map[EvaluatorTagLangType]map[EvaluatorTagKey][]string) { + if p == nil { + return + } + if !p.IsSetTags() { + return Evaluator_Tags_DEFAULT + } + return p.Tags } func (p *Evaluator) SetEvaluatorID(val *int64) { p.EvaluatorID = val @@ -3047,24 +3069,28 @@ func (p *Evaluator) SetBenchmark(val *string) { func (p *Evaluator) SetVendor(val *string) { p.Vendor = val } -func (p *Evaluator) SetTags(val map[EvaluatorTagKey][]string) { +func (p *Evaluator) SetBuiltinVisibleVersion(val *string) { + p.BuiltinVisibleVersion = val +} +func (p *Evaluator) SetTags(val map[EvaluatorTagLangType]map[EvaluatorTagKey][]string) { p.Tags = val } var fieldIDToName_Evaluator = map[int16]string{ - 1: "evaluator_id", - 2: "workspace_id", - 3: "evaluator_type", - 4: "name", - 5: "description", - 6: "draft_submitted", - 7: "base_info", - 11: "current_version", - 12: "latest_version", - 20: "builtin", - 21: "benchmark", - 22: "vendor", - 23: "tags", + 1: "evaluator_id", + 2: "workspace_id", + 3: "evaluator_type", + 4: "name", + 5: "description", + 6: "draft_submitted", + 7: "base_info", + 11: "current_version", + 12: "latest_version", + 20: "builtin", + 21: "benchmark", + 22: "vendor", + 23: "builtin_visible_version", + 100: "tags", } func (p *Evaluator) IsSetEvaluatorID() bool { @@ -3115,6 +3141,14 @@ func (p *Evaluator) IsSetVendor() bool { return p.Vendor != nil } +func (p *Evaluator) IsSetBuiltinVisibleVersion() bool { + return p.BuiltinVisibleVersion != nil +} + +func (p *Evaluator) IsSetTags() bool { + return p.Tags != nil +} + func (p *Evaluator) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -3230,13 +3264,21 @@ func (p *Evaluator) Read(iprot thrift.TProtocol) (err error) { goto SkipFieldError } case 23: - if fieldTypeId == thrift.MAP { + if fieldTypeId == thrift.STRING { if err = p.ReadField23(iprot); err != nil { goto ReadFieldError } } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 100: + if fieldTypeId == thrift.MAP { + if err = p.ReadField100(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } default: if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError @@ -3394,35 +3436,64 @@ func (p *Evaluator) ReadField22(iprot thrift.TProtocol) error { return nil } func (p *Evaluator) ReadField23(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.BuiltinVisibleVersion = _field + return nil +} +func (p *Evaluator) ReadField100(iprot thrift.TProtocol) error { _, _, size, err := iprot.ReadMapBegin() if err != nil { return err } - _field := make(map[EvaluatorTagKey][]string, size) + _field := make(map[EvaluatorTagLangType]map[EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - var _key EvaluatorTagKey + var _key EvaluatorTagLangType if v, err := iprot.ReadString(); err != nil { return err } else { _key = v } - _, size, err := iprot.ReadListBegin() + _, _, size, err := iprot.ReadMapBegin() if err != nil { return err } - _val := make([]string, 0, size) + _val := make(map[EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - - var _elem string + var _key1 EvaluatorTagKey if v, err := iprot.ReadString(); err != nil { return err } else { - _elem = v + _key1 = v + } + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _val1 := make([]string, 0, size) + for i := 0; i < size; i++ { + + var _elem string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _elem = v + } + + _val1 = append(_val1, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err } - _val = append(_val, _elem) + _val[_key1] = _val1 } - if err := iprot.ReadListEnd(); err != nil { + if err := iprot.ReadMapEnd(); err != nil { return err } @@ -3493,6 +3564,10 @@ func (p *Evaluator) Write(oprot thrift.TProtocol) (err error) { fieldId = 23 goto WriteFieldError } + if err = p.writeField100(oprot); err != nil { + fieldId = 100 + goto WriteFieldError + } } if err = oprot.WriteFieldStop(); err != nil { goto WriteFieldStopError @@ -3728,39 +3803,70 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 22 end error: ", p), err) } func (p *Evaluator) writeField23(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("tags", thrift.MAP, 23); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(p.Tags)); err != nil { - return err - } - for k, v := range p.Tags { - if err := oprot.WriteString(k); err != nil { + if p.IsSetBuiltinVisibleVersion() { + if err = oprot.WriteFieldBegin("builtin_visible_version", thrift.STRING, 23); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.BuiltinVisibleVersion); err != nil { return err } - if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 23 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 23 end error: ", p), err) +} +func (p *Evaluator) writeField100(oprot thrift.TProtocol) (err error) { + if p.IsSetTags() { + if err = oprot.WriteFieldBegin("tags", thrift.MAP, 100); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteMapBegin(thrift.STRING, thrift.MAP, len(p.Tags)); err != nil { return err } - for _, v := range v { - if err := oprot.WriteString(v); err != nil { + for k, v := range p.Tags { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(v)); err != nil { + return err + } + for k, v := range v { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + return err + } + for _, v := range v { + if err := oprot.WriteString(v); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + } + if err := oprot.WriteMapEnd(); err != nil { return err } } - if err := oprot.WriteListEnd(); err != nil { + if err := oprot.WriteMapEnd(); err != nil { return err } - } - if err := oprot.WriteMapEnd(); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } } return nil WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 23 begin error: ", p), err) + return thrift.PrependError(fmt.Sprintf("%T write field 100 begin error: ", p), err) WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 23 end error: ", p), err) + return thrift.PrependError(fmt.Sprintf("%T write field 100 end error: ", p), err) } func (p *Evaluator) String() string { @@ -3813,7 +3919,10 @@ func (p *Evaluator) DeepEqual(ano *Evaluator) bool { if !p.Field22DeepEqual(ano.Vendor) { return false } - if !p.Field23DeepEqual(ano.Tags) { + if !p.Field23DeepEqual(ano.BuiltinVisibleVersion) { + return false + } + if !p.Field100DeepEqual(ano.Tags) { return false } return true @@ -3953,7 +4062,19 @@ func (p *Evaluator) Field22DeepEqual(src *string) bool { } return true } -func (p *Evaluator) Field23DeepEqual(src map[EvaluatorTagKey][]string) bool { +func (p *Evaluator) Field23DeepEqual(src *string) bool { + + if p.BuiltinVisibleVersion == src { + return true + } else if p.BuiltinVisibleVersion == nil || src == nil { + return false + } + if strings.Compare(*p.BuiltinVisibleVersion, *src) != 0 { + return false + } + return true +} +func (p *Evaluator) Field100DeepEqual(src map[EvaluatorTagLangType]map[EvaluatorTagKey][]string) bool { if len(p.Tags) != len(src) { return false @@ -3963,11 +4084,17 @@ func (p *Evaluator) Field23DeepEqual(src map[EvaluatorTagKey][]string) bool { if len(v) != len(_src) { return false } - for i, v := range v { - _src1 := _src[i] - if strings.Compare(v, _src1) != 0 { + for k, v := range v { + _src1 := _src[k] + if len(v) != len(_src1) { return false } + for i, v := range v { + _src2 := _src1[i] + if strings.Compare(v, _src2) != 0 { + return false + } + } } } return true @@ -3980,12 +4107,12 @@ type EvaluatorTemplate struct { Name *string `thrift:"name,4,optional" frugal:"4,optional,string" form:"name" json:"name,omitempty" query:"name"` Description *string `thrift:"description,5,optional" frugal:"5,optional,string" form:"description" json:"description,omitempty" query:"description"` // 热度 - Popularity *int64 `thrift:"popularity,6,optional" frugal:"6,optional,i64" json:"popularity" form:"popularity" query:"popularity"` - Benchmark *string `thrift:"benchmark,7,optional" frugal:"7,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` - Vendor *string `thrift:"vendor,8,optional" frugal:"8,optional,string" json:"vendor" form:"vendor" query:"vendor"` - Tags map[EvaluatorTagKey][]string `thrift:"tags,9" frugal:"9,default,map>" json:"tags" form:"tags" query:"tags"` - EvaluatorContent *EvaluatorContent `thrift:"evaluator_content,101,optional" frugal:"101,optional,EvaluatorContent" form:"evaluator_content" json:"evaluator_content,omitempty" query:"evaluator_content"` - BaseInfo *common.BaseInfo `thrift:"base_info,255,optional" frugal:"255,optional,common.BaseInfo" form:"base_info" json:"base_info,omitempty" query:"base_info"` + Popularity *int64 `thrift:"popularity,6,optional" frugal:"6,optional,i64" json:"popularity" form:"popularity" query:"popularity"` + Benchmark *string `thrift:"benchmark,7,optional" frugal:"7,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` + Vendor *string `thrift:"vendor,8,optional" frugal:"8,optional,string" json:"vendor" form:"vendor" query:"vendor"` + Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `thrift:"tags,9,optional" frugal:"9,optional,map>>" json:"tags" form:"tags" query:"tags"` + EvaluatorContent *EvaluatorContent `thrift:"evaluator_content,101,optional" frugal:"101,optional,EvaluatorContent" form:"evaluator_content" json:"evaluator_content,omitempty" query:"evaluator_content"` + BaseInfo *common.BaseInfo `thrift:"base_info,255,optional" frugal:"255,optional,common.BaseInfo" form:"base_info" json:"base_info,omitempty" query:"base_info"` } func NewEvaluatorTemplate() *EvaluatorTemplate { @@ -4091,11 +4218,16 @@ func (p *EvaluatorTemplate) GetVendor() (v string) { return *p.Vendor } -func (p *EvaluatorTemplate) GetTags() (v map[EvaluatorTagKey][]string) { - if p != nil { - return p.Tags +var EvaluatorTemplate_Tags_DEFAULT map[EvaluatorTagLangType]map[EvaluatorTagKey][]string + +func (p *EvaluatorTemplate) GetTags() (v map[EvaluatorTagLangType]map[EvaluatorTagKey][]string) { + if p == nil { + return } - return + if !p.IsSetTags() { + return EvaluatorTemplate_Tags_DEFAULT + } + return p.Tags } var EvaluatorTemplate_EvaluatorContent_DEFAULT *EvaluatorContent @@ -4145,7 +4277,7 @@ func (p *EvaluatorTemplate) SetBenchmark(val *string) { func (p *EvaluatorTemplate) SetVendor(val *string) { p.Vendor = val } -func (p *EvaluatorTemplate) SetTags(val map[EvaluatorTagKey][]string) { +func (p *EvaluatorTemplate) SetTags(val map[EvaluatorTagLangType]map[EvaluatorTagKey][]string) { p.Tags = val } func (p *EvaluatorTemplate) SetEvaluatorContent(val *EvaluatorContent) { @@ -4201,6 +4333,10 @@ func (p *EvaluatorTemplate) IsSetVendor() bool { return p.Vendor != nil } +func (p *EvaluatorTemplate) IsSetTags() bool { + return p.Tags != nil +} + func (p *EvaluatorTemplate) IsSetEvaluatorContent() bool { return p.EvaluatorContent != nil } @@ -4438,31 +4574,49 @@ func (p *EvaluatorTemplate) ReadField9(iprot thrift.TProtocol) error { if err != nil { return err } - _field := make(map[EvaluatorTagKey][]string, size) + _field := make(map[EvaluatorTagLangType]map[EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - var _key EvaluatorTagKey + var _key EvaluatorTagLangType if v, err := iprot.ReadString(); err != nil { return err } else { _key = v } - _, size, err := iprot.ReadListBegin() + _, _, size, err := iprot.ReadMapBegin() if err != nil { return err } - _val := make([]string, 0, size) + _val := make(map[EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - - var _elem string + var _key1 EvaluatorTagKey if v, err := iprot.ReadString(); err != nil { return err } else { - _elem = v + _key1 = v + } + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _val1 := make([]string, 0, size) + for i := 0; i < size; i++ { + + var _elem string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _elem = v + } + + _val1 = append(_val1, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err } - _val = append(_val, _elem) + _val[_key1] = _val1 } - if err := iprot.ReadListEnd(); err != nil { + if err := iprot.ReadMapEnd(); err != nil { return err } @@ -4704,33 +4858,46 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 8 end error: ", p), err) } func (p *EvaluatorTemplate) writeField9(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("tags", thrift.MAP, 9); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(p.Tags)); err != nil { - return err - } - for k, v := range p.Tags { - if err := oprot.WriteString(k); err != nil { - return err + if p.IsSetTags() { + if err = oprot.WriteFieldBegin("tags", thrift.MAP, 9); err != nil { + goto WriteFieldBeginError } - if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + if err := oprot.WriteMapBegin(thrift.STRING, thrift.MAP, len(p.Tags)); err != nil { return err } - for _, v := range v { - if err := oprot.WriteString(v); err != nil { + for k, v := range p.Tags { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(v)); err != nil { + return err + } + for k, v := range v { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + return err + } + for _, v := range v { + if err := oprot.WriteString(v); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + } + if err := oprot.WriteMapEnd(); err != nil { return err } } - if err := oprot.WriteListEnd(); err != nil { + if err := oprot.WriteMapEnd(); err != nil { return err } - } - if err := oprot.WriteMapEnd(); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } } return nil WriteFieldBeginError: @@ -4921,7 +5088,7 @@ func (p *EvaluatorTemplate) Field8DeepEqual(src *string) bool { } return true } -func (p *EvaluatorTemplate) Field9DeepEqual(src map[EvaluatorTagKey][]string) bool { +func (p *EvaluatorTemplate) Field9DeepEqual(src map[EvaluatorTagLangType]map[EvaluatorTagKey][]string) bool { if len(p.Tags) != len(src) { return false @@ -4931,11 +5098,17 @@ func (p *EvaluatorTemplate) Field9DeepEqual(src map[EvaluatorTagKey][]string) bo if len(v) != len(_src) { return false } - for i, v := range v { - _src1 := _src[i] - if strings.Compare(v, _src1) != 0 { + for k, v := range v { + _src1 := _src[k] + if len(v) != len(_src1) { return false } + for i, v := range v { + _src2 := _src1[i] + if strings.Compare(v, _src2) != 0 { + return false + } + } } } return true diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go index 956b47e41..f93c7e4fc 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go @@ -2078,7 +2078,7 @@ func (p *Evaluator) FastRead(buf []byte) (int, error) { } } case 23: - if fieldTypeId == thrift.MAP { + if fieldTypeId == thrift.STRING { l, err = p.FastReadField23(buf[offset:]) offset += l if err != nil { @@ -2091,6 +2091,20 @@ func (p *Evaluator) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 100: + if fieldTypeId == thrift.MAP { + l, err = p.FastReadField100(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 + } + } default: l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -2278,14 +2292,28 @@ func (p *Evaluator) FastReadField22(buf []byte) (int, error) { func (p *Evaluator) FastReadField23(buf []byte) (int, error) { offset := 0 + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.BuiltinVisibleVersion = _field + return offset, nil +} + +func (p *Evaluator) FastReadField100(buf []byte) (int, error) { + offset := 0 + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) offset += l if err != nil { return offset, err } - _field := make(map[EvaluatorTagKey][]string, size) + _field := make(map[EvaluatorTagLangType]map[EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - var _key EvaluatorTagKey + var _key EvaluatorTagLangType if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { return offset, err } else { @@ -2293,22 +2321,40 @@ func (p *Evaluator) FastReadField23(buf []byte) (int, error) { _key = v } - _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) offset += l if err != nil { return offset, err } - _val := make([]string, 0, size) + _val := make(map[EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - var _elem string + var _key1 EvaluatorTagKey if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { return offset, err } else { offset += l - _elem = v + _key1 = v } - _val = append(_val, _elem) + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _val1 := make([]string, 0, size) + for i := 0; i < size; i++ { + var _elem string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _elem = v + } + + _val1 = append(_val1, _elem) + } + + _val[_key1] = _val1 } _field[_key] = _val @@ -2337,6 +2383,7 @@ func (p *Evaluator) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset += p.fastWriteField21(buf[offset:], w) offset += p.fastWriteField22(buf[offset:], w) offset += p.fastWriteField23(buf[offset:], w) + offset += p.fastWriteField100(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) return offset @@ -2358,6 +2405,7 @@ func (p *Evaluator) BLength() int { l += p.field21Length() l += p.field22Length() l += p.field23Length() + l += p.field100Length() } l += thrift.Binary.FieldStopLength() return l @@ -2473,23 +2521,42 @@ func (p *Evaluator) fastWriteField22(buf []byte, w thrift.NocopyWriter) int { func (p *Evaluator) fastWriteField23(buf []byte, w thrift.NocopyWriter) int { offset := 0 - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 23) - mapBeginOffset := offset - offset += thrift.Binary.MapBeginLength() - var length int - for k, v := range p.Tags { - length++ - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) - listBeginOffset := offset - offset += thrift.Binary.ListBeginLength() + if p.IsSetBuiltinVisibleVersion() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 23) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.BuiltinVisibleVersion) + } + return offset +} + +func (p *Evaluator) fastWriteField100(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetTags() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 100) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() var length int - for _, v := range v { + for k, v := range p.Tags { length++ - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() + var length int + for k, v := range v { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range v { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) + } + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) } - thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.MAP, length) } - thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) return offset } @@ -2603,16 +2670,33 @@ func (p *Evaluator) field22Length() int { func (p *Evaluator) field23Length() int { l := 0 - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.MapBeginLength() - for k, v := range p.Tags { - _, _ = k, v + if p.IsSetBuiltinVisibleVersion() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.BuiltinVisibleVersion) + } + return l +} - l += thrift.Binary.StringLengthNocopy(k) - l += thrift.Binary.ListBeginLength() - for _, v := range v { - _ = v - l += thrift.Binary.StringLengthNocopy(v) +func (p *Evaluator) field100Length() int { + l := 0 + if p.IsSetTags() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.MapBeginLength() + for k, v := range p.Tags { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.MapBeginLength() + for k, v := range v { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.ListBeginLength() + for _, v := range v { + _ = v + l += thrift.Binary.StringLengthNocopy(v) + } + } } } return l @@ -2707,21 +2791,39 @@ func (p *Evaluator) DeepCopy(s interface{}) error { p.Vendor = &tmp } + if src.BuiltinVisibleVersion != nil { + var tmp string + if *src.BuiltinVisibleVersion != "" { + tmp = kutils.StringDeepCopy(*src.BuiltinVisibleVersion) + } + p.BuiltinVisibleVersion = &tmp + } + if src.Tags != nil { - p.Tags = make(map[EvaluatorTagKey][]string, len(src.Tags)) + p.Tags = make(map[EvaluatorTagLangType]map[EvaluatorTagKey][]string, len(src.Tags)) for key, val := range src.Tags { - var _key EvaluatorTagKey + var _key EvaluatorTagLangType _key = key - - var _val []string + var _val map[EvaluatorTagKey][]string if val != nil { - _val = make([]string, 0, len(val)) - for _, elem := range val { - var _elem string - if elem != "" { - _elem = kutils.StringDeepCopy(elem) + _val = make(map[EvaluatorTagKey][]string, len(val)) + for key1, val1 := range val { + var _key1 EvaluatorTagKey + _key1 = key1 + + var _val1 []string + if val1 != nil { + _val1 = make([]string, 0, len(val1)) + for _, elem := range val1 { + var _elem string + if elem != "" { + _elem = kutils.StringDeepCopy(elem) + } + _val1 = append(_val1, _elem) + } } - _val = append(_val, _elem) + + _val[_key1] = _val1 } } @@ -3043,9 +3145,9 @@ func (p *EvaluatorTemplate) FastReadField9(buf []byte) (int, error) { if err != nil { return offset, err } - _field := make(map[EvaluatorTagKey][]string, size) + _field := make(map[EvaluatorTagLangType]map[EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - var _key EvaluatorTagKey + var _key EvaluatorTagLangType if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { return offset, err } else { @@ -3053,22 +3155,40 @@ func (p *EvaluatorTemplate) FastReadField9(buf []byte) (int, error) { _key = v } - _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) offset += l if err != nil { return offset, err } - _val := make([]string, 0, size) + _val := make(map[EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - var _elem string + var _key1 EvaluatorTagKey if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { return offset, err } else { offset += l - _elem = v + _key1 = v } - _val = append(_val, _elem) + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _val1 := make([]string, 0, size) + for i := 0; i < size; i++ { + var _elem string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _elem = v + } + + _val1 = append(_val1, _elem) + } + + _val[_key1] = _val1 } _field[_key] = _val @@ -3217,23 +3337,33 @@ func (p *EvaluatorTemplate) fastWriteField8(buf []byte, w thrift.NocopyWriter) i func (p *EvaluatorTemplate) fastWriteField9(buf []byte, w thrift.NocopyWriter) int { offset := 0 - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 9) - mapBeginOffset := offset - offset += thrift.Binary.MapBeginLength() - var length int - for k, v := range p.Tags { - length++ - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) - listBeginOffset := offset - offset += thrift.Binary.ListBeginLength() + if p.IsSetTags() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 9) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() var length int - for _, v := range v { + for k, v := range p.Tags { length++ - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() + var length int + for k, v := range v { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range v { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) + } + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) } - thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.MAP, length) } - thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) return offset } @@ -3329,16 +3459,24 @@ func (p *EvaluatorTemplate) field8Length() int { func (p *EvaluatorTemplate) field9Length() int { l := 0 - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.MapBeginLength() - for k, v := range p.Tags { - _, _ = k, v + if p.IsSetTags() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.MapBeginLength() + for k, v := range p.Tags { + _, _ = k, v - l += thrift.Binary.StringLengthNocopy(k) - l += thrift.Binary.ListBeginLength() - for _, v := range v { - _ = v - l += thrift.Binary.StringLengthNocopy(v) + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.MapBeginLength() + for k, v := range v { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.ListBeginLength() + for _, v := range v { + _ = v + l += thrift.Binary.StringLengthNocopy(v) + } + } } } return l @@ -3421,20 +3559,30 @@ func (p *EvaluatorTemplate) DeepCopy(s interface{}) error { } if src.Tags != nil { - p.Tags = make(map[EvaluatorTagKey][]string, len(src.Tags)) + p.Tags = make(map[EvaluatorTagLangType]map[EvaluatorTagKey][]string, len(src.Tags)) for key, val := range src.Tags { - var _key EvaluatorTagKey + var _key EvaluatorTagLangType _key = key - - var _val []string + var _val map[EvaluatorTagKey][]string if val != nil { - _val = make([]string, 0, len(val)) - for _, elem := range val { - var _elem string - if elem != "" { - _elem = kutils.StringDeepCopy(elem) + _val = make(map[EvaluatorTagKey][]string, len(val)) + for key1, val1 := range val { + var _key1 EvaluatorTagKey + _key1 = key1 + + var _val1 []string + if val1 != nil { + _val1 = make([]string, 0, len(val1)) + for _, elem := range val1 { + var _elem string + if elem != "" { + _elem = kutils.StringDeepCopy(elem) + } + _val1 = append(_val1, _elem) + } } - _val = append(_val, _elem) + + _val[_key1] = _val1 } } diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go index 945031b95..37e041b6f 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go @@ -3952,10 +3952,11 @@ type UpdateEvaluatorRequest struct { // 描述 Description *string `thrift:"description,5,optional" frugal:"5,optional,string" json:"description" form:"description" ` // 是否预置评估器 - Builtin *bool `thrift:"builtin,11,optional" frugal:"11,optional,bool" json:"builtin" form:"builtin" ` - Benchmark *string `thrift:"benchmark,12,optional" frugal:"12,optional,string" json:"benchmark" form:"benchmark" ` - Vendor *string `thrift:"vendor,13,optional" frugal:"13,optional,string" json:"vendor" form:"vendor" ` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + Builtin *bool `thrift:"builtin,11,optional" frugal:"11,optional,bool" json:"builtin" form:"builtin" ` + Benchmark *string `thrift:"benchmark,12,optional" frugal:"12,optional,string" json:"benchmark" form:"benchmark" ` + Vendor *string `thrift:"vendor,13,optional" frugal:"13,optional,string" json:"vendor" form:"vendor" ` + BuiltinVisibleVersion *string `thrift:"builtin_visible_version,14,optional" frugal:"14,optional,string" json:"builtin_visible_version" form:"builtin_visible_version" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewUpdateEvaluatorRequest() *UpdateEvaluatorRequest { @@ -4046,6 +4047,18 @@ func (p *UpdateEvaluatorRequest) GetVendor() (v string) { return *p.Vendor } +var UpdateEvaluatorRequest_BuiltinVisibleVersion_DEFAULT string + +func (p *UpdateEvaluatorRequest) GetBuiltinVisibleVersion() (v string) { + if p == nil { + return + } + if !p.IsSetBuiltinVisibleVersion() { + return UpdateEvaluatorRequest_BuiltinVisibleVersion_DEFAULT + } + return *p.BuiltinVisibleVersion +} + var UpdateEvaluatorRequest_Base_DEFAULT *base.Base func (p *UpdateEvaluatorRequest) GetBase() (v *base.Base) { @@ -4081,6 +4094,9 @@ func (p *UpdateEvaluatorRequest) SetBenchmark(val *string) { func (p *UpdateEvaluatorRequest) SetVendor(val *string) { p.Vendor = val } +func (p *UpdateEvaluatorRequest) SetBuiltinVisibleVersion(val *string) { + p.BuiltinVisibleVersion = val +} func (p *UpdateEvaluatorRequest) SetBase(val *base.Base) { p.Base = val } @@ -4094,6 +4110,7 @@ var fieldIDToName_UpdateEvaluatorRequest = map[int16]string{ 11: "builtin", 12: "benchmark", 13: "vendor", + 14: "builtin_visible_version", 255: "Base", } @@ -4117,6 +4134,10 @@ func (p *UpdateEvaluatorRequest) IsSetVendor() bool { return p.Vendor != nil } +func (p *UpdateEvaluatorRequest) IsSetBuiltinVisibleVersion() bool { + return p.BuiltinVisibleVersion != nil +} + func (p *UpdateEvaluatorRequest) IsSetBase() bool { return p.Base != nil } @@ -4209,6 +4230,14 @@ func (p *UpdateEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 14: + if fieldTypeId == thrift.STRING { + if err = p.ReadField14(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } case 255: if fieldTypeId == thrift.STRUCT { if err = p.ReadField255(iprot); err != nil { @@ -4350,6 +4379,17 @@ func (p *UpdateEvaluatorRequest) ReadField13(iprot thrift.TProtocol) error { p.Vendor = _field return nil } +func (p *UpdateEvaluatorRequest) ReadField14(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.BuiltinVisibleVersion = _field + return nil +} func (p *UpdateEvaluatorRequest) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBase() if err := _field.Read(iprot); err != nil { @@ -4397,6 +4437,10 @@ func (p *UpdateEvaluatorRequest) Write(oprot thrift.TProtocol) (err error) { fieldId = 13 goto WriteFieldError } + if err = p.writeField14(oprot); err != nil { + fieldId = 14 + goto WriteFieldError + } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -4557,6 +4601,24 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 13 end error: ", p), err) } +func (p *UpdateEvaluatorRequest) writeField14(oprot thrift.TProtocol) (err error) { + if p.IsSetBuiltinVisibleVersion() { + if err = oprot.WriteFieldBegin("builtin_visible_version", thrift.STRING, 14); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.BuiltinVisibleVersion); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 14 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 14 end error: ", p), err) +} func (p *UpdateEvaluatorRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { @@ -4614,6 +4676,9 @@ func (p *UpdateEvaluatorRequest) DeepEqual(ano *UpdateEvaluatorRequest) bool { if !p.Field13DeepEqual(ano.Vendor) { return false } + if !p.Field14DeepEqual(ano.BuiltinVisibleVersion) { + return false + } if !p.Field255DeepEqual(ano.Base) { return false } @@ -4701,6 +4766,18 @@ func (p *UpdateEvaluatorRequest) Field13DeepEqual(src *string) bool { } return true } +func (p *UpdateEvaluatorRequest) Field14DeepEqual(src *string) bool { + + if p.BuiltinVisibleVersion == src { + return true + } else if p.BuiltinVisibleVersion == nil || src == nil { + return false + } + if strings.Compare(*p.BuiltinVisibleVersion, *src) != 0 { + return false + } + return true +} func (p *UpdateEvaluatorRequest) Field255DeepEqual(src *base.Base) bool { if !p.Base.DeepEqual(src) { @@ -17528,6 +17605,10 @@ func (p *ValidateEvaluatorResponse) Field255DeepEqual(src *base.BaseResp) bool { type ListTemplatesV2Request struct { // 筛选器选项 FilterOption *evaluator.EvaluatorFilterOption `thrift:"filter_option,1,optional" frugal:"1,optional,evaluator.EvaluatorFilterOption" json:"filter_option" form:"filter_option" ` + PageSize *int32 `thrift:"page_size,101,optional" frugal:"101,optional,i32" form:"page_size" json:"page_size,omitempty"` + PageNumber *int32 `thrift:"page_number,102,optional" frugal:"102,optional,i32" form:"page_number" json:"page_number,omitempty"` + OrderBys []*common.OrderBy `thrift:"order_bys,103,optional" frugal:"103,optional,list" form:"order_bys" json:"order_bys,omitempty"` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewListTemplatesV2Request() *ListTemplatesV2Request { @@ -17548,18 +17629,98 @@ func (p *ListTemplatesV2Request) GetFilterOption() (v *evaluator.EvaluatorFilter } return p.FilterOption } + +var ListTemplatesV2Request_PageSize_DEFAULT int32 + +func (p *ListTemplatesV2Request) GetPageSize() (v int32) { + if p == nil { + return + } + if !p.IsSetPageSize() { + return ListTemplatesV2Request_PageSize_DEFAULT + } + return *p.PageSize +} + +var ListTemplatesV2Request_PageNumber_DEFAULT int32 + +func (p *ListTemplatesV2Request) GetPageNumber() (v int32) { + if p == nil { + return + } + if !p.IsSetPageNumber() { + return ListTemplatesV2Request_PageNumber_DEFAULT + } + return *p.PageNumber +} + +var ListTemplatesV2Request_OrderBys_DEFAULT []*common.OrderBy + +func (p *ListTemplatesV2Request) GetOrderBys() (v []*common.OrderBy) { + if p == nil { + return + } + if !p.IsSetOrderBys() { + return ListTemplatesV2Request_OrderBys_DEFAULT + } + return p.OrderBys +} + +var ListTemplatesV2Request_Base_DEFAULT *base.Base + +func (p *ListTemplatesV2Request) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return ListTemplatesV2Request_Base_DEFAULT + } + return p.Base +} func (p *ListTemplatesV2Request) SetFilterOption(val *evaluator.EvaluatorFilterOption) { p.FilterOption = val } +func (p *ListTemplatesV2Request) SetPageSize(val *int32) { + p.PageSize = val +} +func (p *ListTemplatesV2Request) SetPageNumber(val *int32) { + p.PageNumber = val +} +func (p *ListTemplatesV2Request) SetOrderBys(val []*common.OrderBy) { + p.OrderBys = val +} +func (p *ListTemplatesV2Request) SetBase(val *base.Base) { + p.Base = val +} var fieldIDToName_ListTemplatesV2Request = map[int16]string{ - 1: "filter_option", + 1: "filter_option", + 101: "page_size", + 102: "page_number", + 103: "order_bys", + 255: "Base", } func (p *ListTemplatesV2Request) IsSetFilterOption() bool { return p.FilterOption != nil } +func (p *ListTemplatesV2Request) IsSetPageSize() bool { + return p.PageSize != nil +} + +func (p *ListTemplatesV2Request) IsSetPageNumber() bool { + return p.PageNumber != nil +} + +func (p *ListTemplatesV2Request) IsSetOrderBys() bool { + return p.OrderBys != nil +} + +func (p *ListTemplatesV2Request) IsSetBase() bool { + return p.Base != nil +} + func (p *ListTemplatesV2Request) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -17586,6 +17747,38 @@ func (p *ListTemplatesV2Request) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 101: + if fieldTypeId == thrift.I32 { + if err = p.ReadField101(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 102: + if fieldTypeId == thrift.I32 { + if err = p.ReadField102(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 103: + if fieldTypeId == thrift.LIST { + if err = p.ReadField103(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } default: if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError @@ -17623,6 +17816,59 @@ func (p *ListTemplatesV2Request) ReadField1(iprot thrift.TProtocol) error { p.FilterOption = _field return nil } +func (p *ListTemplatesV2Request) ReadField101(iprot thrift.TProtocol) error { + + var _field *int32 + if v, err := iprot.ReadI32(); err != nil { + return err + } else { + _field = &v + } + p.PageSize = _field + return nil +} +func (p *ListTemplatesV2Request) ReadField102(iprot thrift.TProtocol) error { + + var _field *int32 + if v, err := iprot.ReadI32(); err != nil { + return err + } else { + _field = &v + } + p.PageNumber = _field + return nil +} +func (p *ListTemplatesV2Request) ReadField103(iprot thrift.TProtocol) error { + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _field := make([]*common.OrderBy, 0, size) + values := make([]common.OrderBy, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + + if err := _elem.Read(iprot); err != nil { + return err + } + + _field = append(_field, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + p.OrderBys = _field + return nil +} +func (p *ListTemplatesV2Request) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBase() + if err := _field.Read(iprot); err != nil { + return err + } + p.Base = _field + return nil +} func (p *ListTemplatesV2Request) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 @@ -17634,6 +17880,22 @@ func (p *ListTemplatesV2Request) Write(oprot thrift.TProtocol) (err error) { fieldId = 1 goto WriteFieldError } + if err = p.writeField101(oprot); err != nil { + fieldId = 101 + goto WriteFieldError + } + if err = p.writeField102(oprot); err != nil { + fieldId = 102 + goto WriteFieldError + } + if err = p.writeField103(oprot); err != nil { + fieldId = 103 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } } if err = oprot.WriteFieldStop(); err != nil { goto WriteFieldStopError @@ -17670,37 +17932,174 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } - -func (p *ListTemplatesV2Request) String() string { - if p == nil { - return "" +func (p *ListTemplatesV2Request) writeField101(oprot thrift.TProtocol) (err error) { + if p.IsSetPageSize() { + if err = oprot.WriteFieldBegin("page_size", thrift.I32, 101); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI32(*p.PageSize); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } } - return fmt.Sprintf("ListTemplatesV2Request(%+v)", *p) - + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 101 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 101 end error: ", p), err) } - -func (p *ListTemplatesV2Request) DeepEqual(ano *ListTemplatesV2Request) bool { - if p == ano { - return true - } else if p == nil || ano == nil { - return false - } - if !p.Field1DeepEqual(ano.FilterOption) { - return false +func (p *ListTemplatesV2Request) writeField102(oprot thrift.TProtocol) (err error) { + if p.IsSetPageNumber() { + if err = oprot.WriteFieldBegin("page_number", thrift.I32, 102); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI32(*p.PageNumber); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } } - return true -} - -func (p *ListTemplatesV2Request) Field1DeepEqual(src *evaluator.EvaluatorFilterOption) bool { - + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 102 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 102 end error: ", p), err) +} +func (p *ListTemplatesV2Request) writeField103(oprot thrift.TProtocol) (err error) { + if p.IsSetOrderBys() { + if err = oprot.WriteFieldBegin("order_bys", thrift.LIST, 103); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteListBegin(thrift.STRUCT, len(p.OrderBys)); err != nil { + return err + } + for _, v := range p.OrderBys { + if err := v.Write(oprot); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 103 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 103 end error: ", p), err) +} +func (p *ListTemplatesV2Request) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBase() { + if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.Base.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *ListTemplatesV2Request) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("ListTemplatesV2Request(%+v)", *p) + +} + +func (p *ListTemplatesV2Request) DeepEqual(ano *ListTemplatesV2Request) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.FilterOption) { + return false + } + if !p.Field101DeepEqual(ano.PageSize) { + return false + } + if !p.Field102DeepEqual(ano.PageNumber) { + return false + } + if !p.Field103DeepEqual(ano.OrderBys) { + return false + } + if !p.Field255DeepEqual(ano.Base) { + return false + } + return true +} + +func (p *ListTemplatesV2Request) Field1DeepEqual(src *evaluator.EvaluatorFilterOption) bool { + if !p.FilterOption.DeepEqual(src) { return false } return true } +func (p *ListTemplatesV2Request) Field101DeepEqual(src *int32) bool { + + if p.PageSize == src { + return true + } else if p.PageSize == nil || src == nil { + return false + } + if *p.PageSize != *src { + return false + } + return true +} +func (p *ListTemplatesV2Request) Field102DeepEqual(src *int32) bool { + + if p.PageNumber == src { + return true + } else if p.PageNumber == nil || src == nil { + return false + } + if *p.PageNumber != *src { + return false + } + return true +} +func (p *ListTemplatesV2Request) Field103DeepEqual(src []*common.OrderBy) bool { + + if len(p.OrderBys) != len(src) { + return false + } + for i, v := range p.OrderBys { + _src := src[i] + if !v.DeepEqual(_src) { + return false + } + } + return true +} +func (p *ListTemplatesV2Request) Field255DeepEqual(src *base.Base) bool { + + if !p.Base.DeepEqual(src) { + return false + } + return true +} type ListTemplatesV2Response struct { EvaluatorTemplates []*evaluator.EvaluatorTemplate `thrift:"evaluator_templates,1,optional" frugal:"1,optional,list" form:"evaluator_templates" json:"evaluator_templates,omitempty"` + Total *int64 `thrift:"total,10,optional" frugal:"10,optional,i64" json:"total" form:"total" ` BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` } @@ -17723,6 +18122,18 @@ func (p *ListTemplatesV2Response) GetEvaluatorTemplates() (v []*evaluator.Evalua return p.EvaluatorTemplates } +var ListTemplatesV2Response_Total_DEFAULT int64 + +func (p *ListTemplatesV2Response) GetTotal() (v int64) { + if p == nil { + return + } + if !p.IsSetTotal() { + return ListTemplatesV2Response_Total_DEFAULT + } + return *p.Total +} + var ListTemplatesV2Response_BaseResp_DEFAULT *base.BaseResp func (p *ListTemplatesV2Response) GetBaseResp() (v *base.BaseResp) { @@ -17737,12 +18148,16 @@ func (p *ListTemplatesV2Response) GetBaseResp() (v *base.BaseResp) { func (p *ListTemplatesV2Response) SetEvaluatorTemplates(val []*evaluator.EvaluatorTemplate) { p.EvaluatorTemplates = val } +func (p *ListTemplatesV2Response) SetTotal(val *int64) { + p.Total = val +} func (p *ListTemplatesV2Response) SetBaseResp(val *base.BaseResp) { p.BaseResp = val } var fieldIDToName_ListTemplatesV2Response = map[int16]string{ 1: "evaluator_templates", + 10: "total", 255: "BaseResp", } @@ -17750,6 +18165,10 @@ func (p *ListTemplatesV2Response) IsSetEvaluatorTemplates() bool { return p.EvaluatorTemplates != nil } +func (p *ListTemplatesV2Response) IsSetTotal() bool { + return p.Total != nil +} + func (p *ListTemplatesV2Response) IsSetBaseResp() bool { return p.BaseResp != nil } @@ -17780,6 +18199,14 @@ func (p *ListTemplatesV2Response) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 10: + if fieldTypeId == thrift.I64 { + if err = p.ReadField10(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } case 255: if fieldTypeId == thrift.STRUCT { if err = p.ReadField255(iprot); err != nil { @@ -17840,6 +18267,17 @@ func (p *ListTemplatesV2Response) ReadField1(iprot thrift.TProtocol) error { p.EvaluatorTemplates = _field return nil } +func (p *ListTemplatesV2Response) ReadField10(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.Total = _field + return nil +} func (p *ListTemplatesV2Response) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBaseResp() if err := _field.Read(iprot); err != nil { @@ -17859,6 +18297,10 @@ func (p *ListTemplatesV2Response) Write(oprot thrift.TProtocol) (err error) { fieldId = 1 goto WriteFieldError } + if err = p.writeField10(oprot); err != nil { + fieldId = 10 + goto WriteFieldError + } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -17907,6 +18349,24 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } +func (p *ListTemplatesV2Response) writeField10(oprot thrift.TProtocol) (err error) { + if p.IsSetTotal() { + if err = oprot.WriteFieldBegin("total", thrift.I64, 10); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.Total); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 10 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 10 end error: ", p), err) +} func (p *ListTemplatesV2Response) writeField255(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { goto WriteFieldBeginError @@ -17941,6 +18401,9 @@ func (p *ListTemplatesV2Response) DeepEqual(ano *ListTemplatesV2Response) bool { if !p.Field1DeepEqual(ano.EvaluatorTemplates) { return false } + if !p.Field10DeepEqual(ano.Total) { + return false + } if !p.Field255DeepEqual(ano.BaseResp) { return false } @@ -17960,6 +18423,18 @@ func (p *ListTemplatesV2Response) Field1DeepEqual(src []*evaluator.EvaluatorTemp } return true } +func (p *ListTemplatesV2Response) Field10DeepEqual(src *int64) bool { + + if p.Total == src { + return true + } else if p.Total == nil || src == nil { + return false + } + if *p.Total != *src { + return false + } + return true +} func (p *ListTemplatesV2Response) Field255DeepEqual(src *base.BaseResp) bool { if !p.BaseResp.DeepEqual(src) { @@ -19657,11 +20132,10 @@ func (p *DebugBuiltinEvaluatorResponse) Field255DeepEqual(src *base.BaseResp) bo type UpdateBuiltinEvaluatorTagsRequest struct { EvaluatorID int64 `thrift:"evaluator_id,1,required" frugal:"1,required,i64" json:"evaluator_id" path:"evaluator_id,required" ` - Version string `thrift:"version,2,required" frugal:"2,required,string" form:"version,required" json:"version,required"` - WorkspaceID *int64 `thrift:"workspace_id,3,optional" frugal:"3,optional,i64" json:"workspace_id" form:"workspace_id" ` + WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" form:"workspace_id" ` // 评估器标签 - Tags map[evaluator.EvaluatorTagKey][]string `thrift:"tags,4,optional" frugal:"4,optional,map>" json:"tags" form:"tags" ` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + Tags map[evaluator.EvaluatorTagLangType]map[evaluator.EvaluatorTagKey][]string `thrift:"tags,3,optional" frugal:"3,optional,map>>" json:"tags" form:"tags" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewUpdateBuiltinEvaluatorTagsRequest() *UpdateBuiltinEvaluatorTagsRequest { @@ -19678,13 +20152,6 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) GetEvaluatorID() (v int64) { return } -func (p *UpdateBuiltinEvaluatorTagsRequest) GetVersion() (v string) { - if p != nil { - return p.Version - } - return -} - var UpdateBuiltinEvaluatorTagsRequest_WorkspaceID_DEFAULT int64 func (p *UpdateBuiltinEvaluatorTagsRequest) GetWorkspaceID() (v int64) { @@ -19697,9 +20164,9 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) GetWorkspaceID() (v int64) { return *p.WorkspaceID } -var UpdateBuiltinEvaluatorTagsRequest_Tags_DEFAULT map[evaluator.EvaluatorTagKey][]string +var UpdateBuiltinEvaluatorTagsRequest_Tags_DEFAULT map[evaluator.EvaluatorTagLangType]map[evaluator.EvaluatorTagKey][]string -func (p *UpdateBuiltinEvaluatorTagsRequest) GetTags() (v map[evaluator.EvaluatorTagKey][]string) { +func (p *UpdateBuiltinEvaluatorTagsRequest) GetTags() (v map[evaluator.EvaluatorTagLangType]map[evaluator.EvaluatorTagKey][]string) { if p == nil { return } @@ -19723,13 +20190,10 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) GetBase() (v *base.Base) { func (p *UpdateBuiltinEvaluatorTagsRequest) SetEvaluatorID(val int64) { p.EvaluatorID = val } -func (p *UpdateBuiltinEvaluatorTagsRequest) SetVersion(val string) { - p.Version = val -} func (p *UpdateBuiltinEvaluatorTagsRequest) SetWorkspaceID(val *int64) { p.WorkspaceID = val } -func (p *UpdateBuiltinEvaluatorTagsRequest) SetTags(val map[evaluator.EvaluatorTagKey][]string) { +func (p *UpdateBuiltinEvaluatorTagsRequest) SetTags(val map[evaluator.EvaluatorTagLangType]map[evaluator.EvaluatorTagKey][]string) { p.Tags = val } func (p *UpdateBuiltinEvaluatorTagsRequest) SetBase(val *base.Base) { @@ -19738,9 +20202,8 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) SetBase(val *base.Base) { var fieldIDToName_UpdateBuiltinEvaluatorTagsRequest = map[int16]string{ 1: "evaluator_id", - 2: "version", - 3: "workspace_id", - 4: "tags", + 2: "workspace_id", + 3: "tags", 255: "Base", } @@ -19760,7 +20223,6 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) Read(iprot thrift.TProtocol) (err er var fieldTypeId thrift.TType var fieldId int16 var issetEvaluatorID bool = false - var issetVersion bool = false if _, err = iprot.ReadStructBegin(); err != nil { goto ReadStructBeginError @@ -19786,25 +20248,16 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) Read(iprot thrift.TProtocol) (err er goto SkipFieldError } case 2: - if fieldTypeId == thrift.STRING { + if fieldTypeId == thrift.I64 { if err = p.ReadField2(iprot); err != nil { goto ReadFieldError } - issetVersion = true } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } case 3: - if fieldTypeId == thrift.I64 { - if err = p.ReadField3(iprot); err != nil { - goto ReadFieldError - } - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } - case 4: if fieldTypeId == thrift.MAP { - if err = p.ReadField4(iprot); err != nil { + if err = p.ReadField3(iprot); err != nil { goto ReadFieldError } } else if err = iprot.Skip(fieldTypeId); err != nil { @@ -19835,11 +20288,6 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) Read(iprot thrift.TProtocol) (err er fieldId = 1 goto RequiredFieldNotSetError } - - if !issetVersion { - fieldId = 2 - goto RequiredFieldNotSetError - } return nil ReadStructBeginError: return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) @@ -19871,17 +20319,6 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField1(iprot thrift.TProtocol) e } func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField2(iprot thrift.TProtocol) error { - var _field string - if v, err := iprot.ReadString(); err != nil { - return err - } else { - _field = v - } - p.Version = _field - return nil -} -func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField3(iprot thrift.TProtocol) error { - var _field *int64 if v, err := iprot.ReadI64(); err != nil { return err @@ -19891,36 +20328,54 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField3(iprot thrift.TProtocol) e p.WorkspaceID = _field return nil } -func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField4(iprot thrift.TProtocol) error { +func (p *UpdateBuiltinEvaluatorTagsRequest) ReadField3(iprot thrift.TProtocol) error { _, _, size, err := iprot.ReadMapBegin() if err != nil { return err } - _field := make(map[evaluator.EvaluatorTagKey][]string, size) + _field := make(map[evaluator.EvaluatorTagLangType]map[evaluator.EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - var _key evaluator.EvaluatorTagKey + var _key evaluator.EvaluatorTagLangType if v, err := iprot.ReadString(); err != nil { return err } else { _key = v } - _, size, err := iprot.ReadListBegin() + _, _, size, err := iprot.ReadMapBegin() if err != nil { return err } - _val := make([]string, 0, size) + _val := make(map[evaluator.EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - - var _elem string + var _key1 evaluator.EvaluatorTagKey if v, err := iprot.ReadString(); err != nil { return err } else { - _elem = v + _key1 = v + } + _, size, err := iprot.ReadListBegin() + if err != nil { + return err } + _val1 := make([]string, 0, size) + for i := 0; i < size; i++ { - _val = append(_val, _elem) + var _elem string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _elem = v + } + + _val1 = append(_val1, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + + _val[_key1] = _val1 } - if err := iprot.ReadListEnd(); err != nil { + if err := iprot.ReadMapEnd(); err != nil { return err } @@ -19959,10 +20414,6 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) Write(oprot thrift.TProtocol) (err e fieldId = 3 goto WriteFieldError } - if err = p.writeField4(oprot); err != nil { - fieldId = 4 - goto WriteFieldError - } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -20002,24 +20453,8 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } func (p *UpdateBuiltinEvaluatorTagsRequest) writeField2(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("version", thrift.STRING, 2); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteString(p.Version); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) -} -func (p *UpdateBuiltinEvaluatorTagsRequest) writeField3(oprot thrift.TProtocol) (err error) { if p.IsSetWorkspaceID() { - if err = oprot.WriteFieldBegin("workspace_id", thrift.I64, 3); err != nil { + if err = oprot.WriteFieldBegin("workspace_id", thrift.I64, 2); err != nil { goto WriteFieldBeginError } if err := oprot.WriteI64(*p.WorkspaceID); err != nil { @@ -20031,31 +20466,42 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) writeField3(oprot thrift.TProtocol) } return nil WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) } -func (p *UpdateBuiltinEvaluatorTagsRequest) writeField4(oprot thrift.TProtocol) (err error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) writeField3(oprot thrift.TProtocol) (err error) { if p.IsSetTags() { - if err = oprot.WriteFieldBegin("tags", thrift.MAP, 4); err != nil { + if err = oprot.WriteFieldBegin("tags", thrift.MAP, 3); err != nil { goto WriteFieldBeginError } - if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(p.Tags)); err != nil { + if err := oprot.WriteMapBegin(thrift.STRING, thrift.MAP, len(p.Tags)); err != nil { return err } for k, v := range p.Tags { if err := oprot.WriteString(k); err != nil { return err } - if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + if err := oprot.WriteMapBegin(thrift.STRING, thrift.LIST, len(v)); err != nil { return err } - for _, v := range v { - if err := oprot.WriteString(v); err != nil { + for k, v := range v { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteListBegin(thrift.STRING, len(v)); err != nil { + return err + } + for _, v := range v { + if err := oprot.WriteString(v); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { return err } } - if err := oprot.WriteListEnd(); err != nil { + if err := oprot.WriteMapEnd(); err != nil { return err } } @@ -20068,9 +20514,9 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) writeField4(oprot thrift.TProtocol) } return nil WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 4 begin error: ", p), err) + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) } func (p *UpdateBuiltinEvaluatorTagsRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { @@ -20108,13 +20554,10 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) DeepEqual(ano *UpdateBuiltinEvaluato if !p.Field1DeepEqual(ano.EvaluatorID) { return false } - if !p.Field2DeepEqual(ano.Version) { - return false - } - if !p.Field3DeepEqual(ano.WorkspaceID) { + if !p.Field2DeepEqual(ano.WorkspaceID) { return false } - if !p.Field4DeepEqual(ano.Tags) { + if !p.Field3DeepEqual(ano.Tags) { return false } if !p.Field255DeepEqual(ano.Base) { @@ -20130,14 +20573,7 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) Field1DeepEqual(src int64) bool { } return true } -func (p *UpdateBuiltinEvaluatorTagsRequest) Field2DeepEqual(src string) bool { - - if strings.Compare(p.Version, src) != 0 { - return false - } - return true -} -func (p *UpdateBuiltinEvaluatorTagsRequest) Field3DeepEqual(src *int64) bool { +func (p *UpdateBuiltinEvaluatorTagsRequest) Field2DeepEqual(src *int64) bool { if p.WorkspaceID == src { return true @@ -20149,7 +20585,7 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) Field3DeepEqual(src *int64) bool { } return true } -func (p *UpdateBuiltinEvaluatorTagsRequest) Field4DeepEqual(src map[evaluator.EvaluatorTagKey][]string) bool { +func (p *UpdateBuiltinEvaluatorTagsRequest) Field3DeepEqual(src map[evaluator.EvaluatorTagLangType]map[evaluator.EvaluatorTagKey][]string) bool { if len(p.Tags) != len(src) { return false @@ -20159,11 +20595,17 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) Field4DeepEqual(src map[evaluator.Ev if len(v) != len(_src) { return false } - for i, v := range v { - _src1 := _src[i] - if strings.Compare(v, _src1) != 0 { + for k, v := range v { + _src1 := _src[k] + if len(v) != len(_src1) { return false } + for i, v := range v { + _src2 := _src1[i] + if strings.Compare(v, _src2) != 0 { + return false + } + } } } return true diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go index dac35cbf3..0a8773cd4 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go @@ -539,6 +539,21 @@ func (p *ListTemplatesV2Request) IsValid() error { return fmt.Errorf("field FilterOption not valid, %w", err) } } + if p.PageSize != nil { + if *p.PageSize <= int32(0) { + return fmt.Errorf("field PageSize gt rule failed, current value: %v", *p.PageSize) + } + } + if p.PageNumber != nil { + if *p.PageNumber <= int32(0) { + return fmt.Errorf("field PageNumber gt rule failed, current value: %v", *p.PageNumber) + } + } + if p.Base != nil { + if err := p.Base.IsValid(); err != nil { + return fmt.Errorf("field Base not valid, %w", err) + } + } return nil } func (p *ListTemplatesV2Response) IsValid() error { diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go index fba702aac..22be1040d 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go @@ -3016,6 +3016,20 @@ func (p *UpdateEvaluatorRequest) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 14: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField14(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 255: if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField255(buf[offset:]) @@ -3177,6 +3191,20 @@ func (p *UpdateEvaluatorRequest) FastReadField13(buf []byte) (int, error) { return offset, nil } +func (p *UpdateEvaluatorRequest) FastReadField14(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.BuiltinVisibleVersion = _field + return offset, nil +} + func (p *UpdateEvaluatorRequest) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBase() @@ -3204,6 +3232,7 @@ func (p *UpdateEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWrit offset += p.fastWriteField5(buf[offset:], w) offset += p.fastWriteField12(buf[offset:], w) offset += p.fastWriteField13(buf[offset:], w) + offset += p.fastWriteField14(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -3221,6 +3250,7 @@ func (p *UpdateEvaluatorRequest) BLength() int { l += p.field11Length() l += p.field12Length() l += p.field13Length() + l += p.field14Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -3293,6 +3323,15 @@ func (p *UpdateEvaluatorRequest) fastWriteField13(buf []byte, w thrift.NocopyWri return offset } +func (p *UpdateEvaluatorRequest) fastWriteField14(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBuiltinVisibleVersion() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 14) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.BuiltinVisibleVersion) + } + return offset +} + func (p *UpdateEvaluatorRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBase() { @@ -3368,6 +3407,15 @@ func (p *UpdateEvaluatorRequest) field13Length() int { return l } +func (p *UpdateEvaluatorRequest) field14Length() int { + l := 0 + if p.IsSetBuiltinVisibleVersion() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.BuiltinVisibleVersion) + } + return l +} + func (p *UpdateEvaluatorRequest) field255Length() int { l := 0 if p.IsSetBase() { @@ -3426,6 +3474,14 @@ func (p *UpdateEvaluatorRequest) DeepCopy(s interface{}) error { p.Vendor = &tmp } + if src.BuiltinVisibleVersion != nil { + var tmp string + if *src.BuiltinVisibleVersion != "" { + tmp = kutils.StringDeepCopy(*src.BuiltinVisibleVersion) + } + p.BuiltinVisibleVersion = &tmp + } + var _base *base.Base if src.Base != nil { _base = &base.Base{} @@ -12794,6 +12850,62 @@ func (p *ListTemplatesV2Request) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 101: + if fieldTypeId == thrift.I32 { + l, err = p.FastReadField101(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 102: + if fieldTypeId == thrift.I32 { + l, err = p.FastReadField102(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 103: + if fieldTypeId == thrift.LIST { + l, err = p.FastReadField103(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 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } default: l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -12824,6 +12936,71 @@ func (p *ListTemplatesV2Request) FastReadField1(buf []byte) (int, error) { return offset, nil } +func (p *ListTemplatesV2Request) FastReadField101(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.PageSize = _field + return offset, nil +} + +func (p *ListTemplatesV2Request) FastReadField102(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.PageNumber = _field + return offset, nil +} + +func (p *ListTemplatesV2Request) FastReadField103(buf []byte) (int, error) { + offset := 0 + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make([]*common.OrderBy, 0, size) + values := make([]common.OrderBy, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + if l, err := _elem.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + + _field = append(_field, _elem) + } + p.OrderBys = _field + return offset, nil +} + +func (p *ListTemplatesV2Request) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + func (p *ListTemplatesV2Request) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } @@ -12831,7 +13008,11 @@ func (p *ListTemplatesV2Request) FastWrite(buf []byte) int { func (p *ListTemplatesV2Request) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { + offset += p.fastWriteField101(buf[offset:], w) + offset += p.fastWriteField102(buf[offset:], w) offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField103(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) return offset @@ -12841,6 +13022,10 @@ func (p *ListTemplatesV2Request) BLength() int { l := 0 if p != nil { l += p.field1Length() + l += p.field101Length() + l += p.field102Length() + l += p.field103Length() + l += p.field255Length() } l += thrift.Binary.FieldStopLength() return l @@ -12855,6 +13040,49 @@ func (p *ListTemplatesV2Request) fastWriteField1(buf []byte, w thrift.NocopyWrit return offset } +func (p *ListTemplatesV2Request) fastWriteField101(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetPageSize() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I32, 101) + offset += thrift.Binary.WriteI32(buf[offset:], *p.PageSize) + } + return offset +} + +func (p *ListTemplatesV2Request) fastWriteField102(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetPageNumber() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I32, 102) + offset += thrift.Binary.WriteI32(buf[offset:], *p.PageNumber) + } + return offset +} + +func (p *ListTemplatesV2Request) fastWriteField103(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetOrderBys() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.LIST, 103) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range p.OrderBys { + length++ + offset += v.FastWriteNocopy(buf[offset:], w) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRUCT, length) + } + return offset +} + +func (p *ListTemplatesV2Request) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBase() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.Base.FastWriteNocopy(buf[offset:], w) + } + return offset +} + func (p *ListTemplatesV2Request) field1Length() int { l := 0 if p.IsSetFilterOption() { @@ -12864,6 +13092,46 @@ func (p *ListTemplatesV2Request) field1Length() int { return l } +func (p *ListTemplatesV2Request) field101Length() int { + l := 0 + if p.IsSetPageSize() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I32Length() + } + return l +} + +func (p *ListTemplatesV2Request) field102Length() int { + l := 0 + if p.IsSetPageNumber() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I32Length() + } + return l +} + +func (p *ListTemplatesV2Request) field103Length() int { + l := 0 + if p.IsSetOrderBys() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.ListBeginLength() + for _, v := range p.OrderBys { + _ = v + l += v.BLength() + } + } + return l +} + +func (p *ListTemplatesV2Request) field255Length() int { + l := 0 + if p.IsSetBase() { + l += thrift.Binary.FieldBeginLength() + l += p.Base.BLength() + } + return l +} + func (p *ListTemplatesV2Request) DeepCopy(s interface{}) error { src, ok := s.(*ListTemplatesV2Request) if !ok { @@ -12879,6 +13147,40 @@ func (p *ListTemplatesV2Request) DeepCopy(s interface{}) error { } p.FilterOption = _filterOption + if src.PageSize != nil { + tmp := *src.PageSize + p.PageSize = &tmp + } + + if src.PageNumber != nil { + tmp := *src.PageNumber + p.PageNumber = &tmp + } + + if src.OrderBys != nil { + p.OrderBys = make([]*common.OrderBy, 0, len(src.OrderBys)) + for _, elem := range src.OrderBys { + var _elem *common.OrderBy + if elem != nil { + _elem = &common.OrderBy{} + if err := _elem.DeepCopy(elem); err != nil { + return err + } + } + + p.OrderBys = append(p.OrderBys, _elem) + } + } + + var _base *base.Base + if src.Base != nil { + _base = &base.Base{} + if err := _base.DeepCopy(src.Base); err != nil { + return err + } + } + p.Base = _base + return nil } @@ -12913,6 +13215,20 @@ func (p *ListTemplatesV2Response) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 10: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField10(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 255: if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField255(buf[offset:]) @@ -12970,6 +13286,20 @@ func (p *ListTemplatesV2Response) FastReadField1(buf []byte) (int, error) { return offset, nil } +func (p *ListTemplatesV2Response) FastReadField10(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Total = _field + return offset, nil +} + func (p *ListTemplatesV2Response) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBaseResp() @@ -12989,6 +13319,7 @@ func (p *ListTemplatesV2Response) FastWrite(buf []byte) int { func (p *ListTemplatesV2Response) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { + offset += p.fastWriteField10(buf[offset:], w) offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } @@ -13000,6 +13331,7 @@ func (p *ListTemplatesV2Response) BLength() int { l := 0 if p != nil { l += p.field1Length() + l += p.field10Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -13022,6 +13354,15 @@ func (p *ListTemplatesV2Response) fastWriteField1(buf []byte, w thrift.NocopyWri return offset } +func (p *ListTemplatesV2Response) fastWriteField10(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetTotal() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 10) + offset += thrift.Binary.WriteI64(buf[offset:], *p.Total) + } + return offset +} + func (p *ListTemplatesV2Response) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) @@ -13042,6 +13383,15 @@ func (p *ListTemplatesV2Response) field1Length() int { return l } +func (p *ListTemplatesV2Response) field10Length() int { + l := 0 + if p.IsSetTotal() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + func (p *ListTemplatesV2Response) field255Length() int { l := 0 l += thrift.Binary.FieldBeginLength() @@ -13070,6 +13420,11 @@ func (p *ListTemplatesV2Response) DeepCopy(s interface{}) error { } } + if src.Total != nil { + tmp := *src.Total + p.Total = &tmp + } + var _baseResp *base.BaseResp if src.BaseResp != nil { _baseResp = &base.BaseResp{} @@ -14291,7 +14646,6 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) FastRead(buf []byte) (int, error) { var fieldTypeId thrift.TType var fieldId int16 var issetEvaluatorID bool = false - var issetVersion bool = false for { fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) offset += l @@ -14318,13 +14672,12 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) FastRead(buf []byte) (int, error) { } } case 2: - if fieldTypeId == thrift.STRING { + if fieldTypeId == thrift.I64 { l, err = p.FastReadField2(buf[offset:]) offset += l if err != nil { goto ReadFieldError } - issetVersion = true } else { l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -14333,22 +14686,8 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) FastRead(buf []byte) (int, error) { } } case 3: - if fieldTypeId == thrift.I64 { - l, err = p.FastReadField3(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 4: if fieldTypeId == thrift.MAP { - l, err = p.FastReadField4(buf[offset:]) + l, err = p.FastReadField3(buf[offset:]) offset += l if err != nil { goto ReadFieldError @@ -14387,11 +14726,6 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) FastRead(buf []byte) (int, error) { fieldId = 1 goto RequiredFieldNotSetError } - - if !issetVersion { - fieldId = 2 - goto RequiredFieldNotSetError - } return offset, nil ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) @@ -14420,20 +14754,6 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField1(buf []byte) (int, err func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField2(buf []byte) (int, error) { offset := 0 - var _field string - if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _field = v - } - p.Version = _field - return offset, nil -} - -func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField3(buf []byte) (int, error) { - offset := 0 - var _field *int64 if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { return offset, err @@ -14445,7 +14765,7 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField3(buf []byte) (int, err return offset, nil } -func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField4(buf []byte) (int, error) { +func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField3(buf []byte) (int, error) { offset := 0 _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) @@ -14453,9 +14773,9 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField4(buf []byte) (int, err if err != nil { return offset, err } - _field := make(map[evaluator.EvaluatorTagKey][]string, size) + _field := make(map[evaluator.EvaluatorTagLangType]map[evaluator.EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - var _key evaluator.EvaluatorTagKey + var _key evaluator.EvaluatorTagLangType if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { return offset, err } else { @@ -14463,22 +14783,40 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) FastReadField4(buf []byte) (int, err _key = v } - _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) offset += l if err != nil { return offset, err } - _val := make([]string, 0, size) + _val := make(map[evaluator.EvaluatorTagKey][]string, size) for i := 0; i < size; i++ { - var _elem string + var _key1 evaluator.EvaluatorTagKey if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { return offset, err } else { offset += l - _elem = v + _key1 = v } - _val = append(_val, _elem) + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _val1 := make([]string, 0, size) + for i := 0; i < size; i++ { + var _elem string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _elem = v + } + + _val1 = append(_val1, _elem) + } + + _val[_key1] = _val1 } _field[_key] = _val @@ -14507,9 +14845,8 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) FastWriteNocopy(buf []byte, w thrift offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) - offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) - offset += p.fastWriteField4(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -14522,7 +14859,6 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) BLength() int { l += p.field1Length() l += p.field2Length() l += p.field3Length() - l += p.field4Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -14537,41 +14873,42 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) fastWriteField1(buf []byte, w thrift } func (p *UpdateBuiltinEvaluatorTagsRequest) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 2) - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, p.Version) - return offset -} - -func (p *UpdateBuiltinEvaluatorTagsRequest) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetWorkspaceID() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 3) + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 2) offset += thrift.Binary.WriteI64(buf[offset:], *p.WorkspaceID) } return offset } -func (p *UpdateBuiltinEvaluatorTagsRequest) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateBuiltinEvaluatorTagsRequest) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetTags() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 4) + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 3) mapBeginOffset := offset offset += thrift.Binary.MapBeginLength() var length int for k, v := range p.Tags { length++ offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) - listBeginOffset := offset - offset += thrift.Binary.ListBeginLength() + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() var length int - for _, v := range v { + for k, v := range v { length++ - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range v { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) } - thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRING, length) + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) } - thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.LIST, length) + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.MAP, length) } return offset } @@ -14593,13 +14930,6 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) field1Length() int { } func (p *UpdateBuiltinEvaluatorTagsRequest) field2Length() int { - l := 0 - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.StringLengthNocopy(p.Version) - return l -} - -func (p *UpdateBuiltinEvaluatorTagsRequest) field3Length() int { l := 0 if p.IsSetWorkspaceID() { l += thrift.Binary.FieldBeginLength() @@ -14608,7 +14938,7 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) field3Length() int { return l } -func (p *UpdateBuiltinEvaluatorTagsRequest) field4Length() int { +func (p *UpdateBuiltinEvaluatorTagsRequest) field3Length() int { l := 0 if p.IsSetTags() { l += thrift.Binary.FieldBeginLength() @@ -14617,10 +14947,16 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) field4Length() int { _, _ = k, v l += thrift.Binary.StringLengthNocopy(k) - l += thrift.Binary.ListBeginLength() - for _, v := range v { - _ = v - l += thrift.Binary.StringLengthNocopy(v) + l += thrift.Binary.MapBeginLength() + for k, v := range v { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.ListBeginLength() + for _, v := range v { + _ = v + l += thrift.Binary.StringLengthNocopy(v) + } } } } @@ -14644,30 +14980,36 @@ func (p *UpdateBuiltinEvaluatorTagsRequest) DeepCopy(s interface{}) error { p.EvaluatorID = src.EvaluatorID - if src.Version != "" { - p.Version = kutils.StringDeepCopy(src.Version) - } - if src.WorkspaceID != nil { tmp := *src.WorkspaceID p.WorkspaceID = &tmp } if src.Tags != nil { - p.Tags = make(map[evaluator.EvaluatorTagKey][]string, len(src.Tags)) + p.Tags = make(map[evaluator.EvaluatorTagLangType]map[evaluator.EvaluatorTagKey][]string, len(src.Tags)) for key, val := range src.Tags { - var _key evaluator.EvaluatorTagKey + var _key evaluator.EvaluatorTagLangType _key = key - - var _val []string + var _val map[evaluator.EvaluatorTagKey][]string if val != nil { - _val = make([]string, 0, len(val)) - for _, elem := range val { - var _elem string - if elem != "" { - _elem = kutils.StringDeepCopy(elem) + _val = make(map[evaluator.EvaluatorTagKey][]string, len(val)) + for key1, val1 := range val { + var _key1 evaluator.EvaluatorTagKey + _key1 = key1 + + var _val1 []string + if val1 != nil { + _val1 = make([]string, 0, len(val1)) + for _, elem := range val1 { + var _elem string + if elem != "" { + _elem = kutils.StringDeepCopy(elem) + } + _val1 = append(_val1, _elem) + } } - _val = append(_val, _elem) + + _val[_key1] = _val1 } } diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go index c9f82104d..2d3227216 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go @@ -18,7 +18,7 @@ import ( func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.Evaluator { // 从DTO转换为DO - evaluatorDO := &evaluatordo.Evaluator{ + evaluatorDO := &evaluatordo.Evaluator{ ID: evaluatorDTO.GetEvaluatorID(), SpaceID: evaluatorDTO.GetWorkspaceID(), Name: evaluatorDTO.GetName(), @@ -26,10 +26,11 @@ func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.E DraftSubmitted: evaluatorDTO.GetDraftSubmitted(), EvaluatorType: evaluatordo.EvaluatorType(evaluatorDTO.GetEvaluatorType()), LatestVersion: evaluatorDTO.GetLatestVersion(), - Builtin: evaluatorDTO.GetBuiltin(), + Builtin: evaluatorDTO.GetBuiltin(), + BuiltinVisibleVersion: evaluatorDTO.GetBuiltinVisibleVersion(), PromptEvaluatorVersion: nil, BaseInfo: commonconvertor.ConvertBaseInfoDTO2DO(evaluatorDTO.GetBaseInfo()), - Tags: ConvertEvaluatorTagsDTO2DO(evaluatorDTO.GetTags()), + Tags: ConvertEvaluatorLangTagsDTO2DO(evaluatorDTO.GetTags()), } if evaluatorDTO.CurrentVersion != nil { switch evaluatorDTO.GetEvaluatorType() { @@ -56,16 +57,17 @@ func ConvertEvaluatorDO2DTO(do *evaluatordo.Evaluator) *evaluatordto.Evaluator { return nil } dto := &evaluatordto.Evaluator{ - EvaluatorID: gptr.Of(do.ID), - WorkspaceID: gptr.Of(do.SpaceID), - Name: gptr.Of(do.Name), - Description: gptr.Of(do.Description), - DraftSubmitted: gptr.Of(do.DraftSubmitted), - EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType(do.EvaluatorType)), - LatestVersion: gptr.Of(do.LatestVersion), - Builtin: gptr.Of(do.Builtin), - BaseInfo: commonconvertor.ConvertBaseInfoDO2DTO(do.BaseInfo), - Tags: ConvertEvaluatorTagsDO2DTO(do.Tags), + EvaluatorID: gptr.Of(do.ID), + WorkspaceID: gptr.Of(do.SpaceID), + Name: gptr.Of(do.Name), + Description: gptr.Of(do.Description), + DraftSubmitted: gptr.Of(do.DraftSubmitted), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType(do.EvaluatorType)), + LatestVersion: gptr.Of(do.LatestVersion), + BuiltinVisibleVersion: gptr.Of(do.BuiltinVisibleVersion), + Builtin: gptr.Of(do.Builtin), + BaseInfo: commonconvertor.ConvertBaseInfoDO2DTO(do.BaseInfo), + Tags: ConvertEvaluatorLangTagsDO2DTO(do.Tags), } switch do.EvaluatorType { @@ -312,32 +314,44 @@ func ConvertPromptEvaluatorVersionDO2DTO(do *evaluatordo.PromptEvaluatorVersion) return dto } -// ConvertEvaluatorTagsDTO2DO 将DTO的Tags转换为DO的Tags -func ConvertEvaluatorTagsDTO2DO(dtoTags map[evaluatordto.EvaluatorTagKey][]string) map[evaluatordo.EvaluatorTagKey][]string { - if dtoTags == nil { +// ConvertEvaluatorLangTagsDTO2DO 将DTO的多语言Tags转换为DO的多语言Tags +func ConvertEvaluatorLangTagsDTO2DO(dto map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string) map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string { + if dto == nil { return nil } - - doTags := make(map[evaluatordo.EvaluatorTagKey][]string) - for dtoKey, values := range dtoTags { - doKey := ConvertEvaluatorTagKeyDTO2DO(dtoKey) - doTags[doKey] = values + result := make(map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string, len(dto)) + for lang, tagMap := range dto { + doLang := evaluatordo.EvaluatorTagLangType(lang) + if tagMap == nil { + continue + } + inner := make(map[evaluatordo.EvaluatorTagKey][]string, len(tagMap)) + for k, vals := range tagMap { + inner[ConvertEvaluatorTagKeyDTO2DO(k)] = vals + } + result[doLang] = inner } - return doTags + return result } -// ConvertEvaluatorTagsDO2DTO 将DO的Tags转换为DTO的Tags -func ConvertEvaluatorTagsDO2DTO(doTags map[evaluatordo.EvaluatorTagKey][]string) map[evaluatordto.EvaluatorTagKey][]string { - if doTags == nil { +// ConvertEvaluatorLangTagsDO2DTO 将DO的多语言Tags转换为DTO的多语言Tags +func ConvertEvaluatorLangTagsDO2DTO(do map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string) map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string { + if do == nil { return nil } - - dtoTags := make(map[evaluatordto.EvaluatorTagKey][]string) - for doKey, values := range doTags { - dtoKey := ConvertEvaluatorTagKeyDO2DTO(doKey) - dtoTags[dtoKey] = values + result := make(map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string, len(do)) + for lang, tagMap := range do { + dtoLang := evaluatordto.EvaluatorTagLangType(lang) + if tagMap == nil { + continue + } + inner := make(map[evaluatordto.EvaluatorTagKey][]string, len(tagMap)) + for k, vals := range tagMap { + inner[ConvertEvaluatorTagKeyDO2DTO(k)] = vals + } + result[dtoLang] = inner } - return dtoTags + return result } // ConvertEvaluatorTagKeyDO2DTO 将DO的EvaluatorTagKey转换为DTO的EvaluatorTagKey diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go index fba5f13d4..9a913dcd3 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go @@ -29,13 +29,17 @@ func ConvertEvaluatorTemplateDTO2DO(dto *evaluatordto.EvaluatorTemplate) *evalua Vendor: dto.GetVendor(), InputSchemas: make([]*evaluatordo.ArgsSchema, 0), OutputSchemas: make([]*evaluatordo.ArgsSchema, 0), - Tags: make(map[evaluatordo.EvaluatorTagKey][]string), + Tags: make(map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string), } // 处理标签 if len(dto.GetTags()) > 0 { - for key, values := range dto.GetTags() { - do.Tags[evaluatordo.EvaluatorTagKey(key)] = values + for lang, kv := range dto.GetTags() { + inner := make(map[evaluatordo.EvaluatorTagKey][]string, len(kv)) + for key, values := range kv { + inner[evaluatordo.EvaluatorTagKey(key)] = values + } + do.Tags[evaluatordo.EvaluatorTagLangType(lang)] = inner } } @@ -94,13 +98,17 @@ func ConvertEvaluatorTemplateDO2DTO(do *evaluatordo.EvaluatorTemplate) *evaluato Popularity: gptr.Of(do.Popularity), Benchmark: gptr.Of(do.Benchmark), Vendor: gptr.Of(do.Vendor), - Tags: make(map[evaluatordto.EvaluatorTagKey][]string), + Tags: make(map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string), } // 处理标签 if len(do.Tags) > 0 { - for key, values := range do.Tags { - dto.Tags[evaluatordto.EvaluatorTagKey(key)] = values + for lang, kv := range do.Tags { + inner := make(map[evaluatordto.EvaluatorTagKey][]string, len(kv)) + for key, values := range kv { + inner[evaluatordto.EvaluatorTagKey(key)] = values + } + dto.Tags[evaluatordto.EvaluatorTagLangType(lang)] = inner } } diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index da67dab48..49d0cf578 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -161,18 +161,10 @@ func buildSrvListEvaluatorRequest(request *evaluatorservice.ListEvaluatorsReques func buildSrvListBuiltinEvaluatorRequest(request *evaluatorservice.ListEvaluatorsRequest) *entity.ListBuiltinEvaluatorRequest { srvReq := &entity.ListBuiltinEvaluatorRequest{ - SpaceID: request.WorkspaceID, - SearchName: request.GetSearchName(), - CreatorIDs: request.GetCreatorIds(), PageSize: request.GetPageSize(), PageNum: request.GetPageNumber(), WithVersion: request.GetWithVersion(), } - evaluatorType := make([]entity.EvaluatorType, 0, len(request.GetEvaluatorType())) - for _, et := range request.GetEvaluatorType() { - evaluatorType = append(evaluatorType, entity.EvaluatorType(et)) - } - srvReq.EvaluatorType = evaluatorType // 转换FilterOption if request.GetFilterOption() != nil { @@ -355,51 +347,48 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluator(ctx context.Context, request *eva } } // 机审 - auditTexts := make([]string, 0) - auditTexts = append(auditTexts, request.GetName()) - auditTexts = append(auditTexts, request.GetDescription()) + if err := e.auditEvaluatorModify(ctx, evaluatorDO.ID, []string{request.GetName(), request.GetDescription()}); err != nil { + return nil, err + } + userIDInContext := session.UserIDInCtxOrEmpty(ctx) + // 组装请求 + req := &entity.UpdateEvaluatorMetaRequest{ + ID: request.GetEvaluatorID(), + SpaceID: request.GetWorkspaceID(), + Name: request.Name, + Description: request.Description, + Builtin: request.Builtin, + Benchmark: request.Benchmark, + Vendor: request.Vendor, + BuiltinVisibleVersion: request.BuiltinVisibleVersion, // 后续 Service/Repo/DAO 层补充更新逻辑 + UpdatedBy: userIDInContext, + } + + if err = e.evaluatorService.UpdateEvaluatorMeta(ctx, req); err != nil { + return nil, err + } + return &evaluatorservice.UpdateEvaluatorResponse{}, nil +} + +// auditEvaluatorModify 抽取的机审逻辑：传入要审计的文本列表 +func (e *EvaluatorHandlerImpl) auditEvaluatorModify(ctx context.Context, objectID int64, texts []string) error { data := map[string]string{ - "texts": strings.Join(auditTexts, ","), + "texts": strings.Join(texts, ","), } record, err := e.auditClient.Audit(ctx, audit.AuditParam{ - ObjectID: evaluatorDO.ID, + ObjectID: objectID, AuditData: data, ReqID: encoding.Encode(ctx, data), AuditType: audit.AuditType_CozeLoopEvaluatorModify, }) if err != nil { logs.CtxError(ctx, "audit: failed to audit, err=%v", err) // 审核服务不可用，默认通过 + return nil } if record.AuditStatus == audit.AuditStatus_Rejected { - return nil, errorx.NewByCode(errno.RiskContentDetectedCode) - } - userIDInContext := session.UserIDInCtxOrEmpty(ctx) - // 组装请求 - req := &entity.UpdateEvaluatorMetaRequest{ - ID: request.GetEvaluatorID(), - SpaceID: request.GetWorkspaceID(), - UpdatedBy: userIDInContext, - } - if request.Name != nil { - req.Name = request.Name - } - if request.Description != nil { - req.Description = request.Description - } - if request.Builtin != nil { - req.Builtin = request.Builtin - } - if request.Benchmark != nil { - req.Benchmark = request.Benchmark - } - if request.Vendor != nil { - req.Vendor = request.Vendor - } - - if err = e.evaluatorService.UpdateEvaluatorMeta(ctx, req); err != nil { - return nil, err + return errorx.NewByCode(errno.RiskContentDetectedCode) } - return &evaluatorservice.UpdateEvaluatorResponse{}, nil + return nil } func validateUpdateEvaluatorRequest(ctx context.Context, request *evaluatorservice.UpdateEvaluatorRequest) error { @@ -564,14 +553,22 @@ func (e *EvaluatorHandlerImpl) GetEvaluatorVersion(ctx context.Context, request return &evaluatorservice.GetEvaluatorVersionResponse{}, nil } // 鉴权 - err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ - ObjectID: strconv.FormatInt(evaluatorDO.ID, 10), - SpaceID: evaluatorDO.SpaceID, - ActionObjects: []*rpc.ActionObject{{Action: gptr.Of(consts.Read), EntityType: gptr.Of(rpc.AuthEntityType_Evaluator)}}, - }) - if err != nil { - return nil, err + if request.GetBuiltin() { + err = e.authBuiltinManagement(ctx, evaluatorDO.SpaceID, spaceTypeBuiltin) + if err != nil { + return nil, err + } + } else { + err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(evaluatorDO.ID, 10), + SpaceID: evaluatorDO.SpaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of(consts.Read), EntityType: gptr.Of(rpc.AuthEntityType_Evaluator)}}, + }) + if err != nil { + return nil, err + } } + dto := evaluatorconvertor.ConvertEvaluatorDO2DTO(evaluatorDO) e.userInfoService.PackUserInfo(ctx, userinfo.BatchConvertDTO2UserInfoCarrier([]*evaluatordto.Evaluator{dto})) evaluatorVersionDTO := dto.CurrentVersion @@ -1346,6 +1343,14 @@ func (e *EvaluatorHandlerImpl) ListTemplatesV2(ctx context.Context, request *eva serviceReq.FilterOption = evaluatorconvertor.ConvertEvaluatorFilterOptionDTO2DO(request.GetFilterOption()) } + // 覆盖分页参数（若请求携带） + if ps := request.GetPageSize(); ps > 0 { + serviceReq.PageSize = ps + } + if pn := request.GetPageNumber(); pn > 0 { + serviceReq.PageNum = pn + } + // 调用service层 serviceResp, err := e.evaluatorTemplateService.ListEvaluatorTemplate(ctx, serviceReq) if err != nil { @@ -1360,6 +1365,7 @@ func (e *EvaluatorHandlerImpl) ListTemplatesV2(ctx context.Context, request *eva return &evaluatorservice.ListTemplatesV2Response{ EvaluatorTemplates: templates, + Total: gptr.Of(serviceResp.TotalCount), }, nil } @@ -1454,7 +1460,7 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluatorTemplate(ctx context.Context, requ // 构建service层请求 serviceReq := &entity.UpdateEvaluatorTemplateRequest{ - ID: templateDO.ID, + ID: request.EvaluatorTemplateID, Name: gptr.Of(templateDO.Name), Description: gptr.Of(templateDO.Description), Benchmark: gptr.Of(templateDO.Benchmark), @@ -1556,24 +1562,31 @@ func (e *EvaluatorHandlerImpl) UpdateBuiltinEvaluatorTags(ctx context.Context, r return nil, err } - // 2) 调用 service，按 evaluatorID + version 更新标签 - ev, err := e.evaluatorService.UpdateBuiltinEvaluatorTags(ctx, request.GetEvaluatorID(), request.GetVersion(), evaluatorconvertor.ConvertEvaluatorTagsDTO2DO(request.GetTags())) + // 2) 调用 service，按 evaluatorID 更新标签（不再使用 version 参数） + err = e.evaluatorService.UpdateBuiltinEvaluatorTags(ctx, request.GetEvaluatorID(), evaluatorconvertor.ConvertEvaluatorLangTagsDTO2DO(request.GetTags())) if err != nil { return nil, err } // 3) 组装更新后的标签并返回 Evaluator（最终标签集合等于请求中的标签集合） - if ev != nil { - ev.Tags = evaluatorconvertor.ConvertEvaluatorTagsDTO2DO(request.GetTags()) - } + evaluatorDO.Tags = evaluatorconvertor.ConvertEvaluatorLangTagsDTO2DO(request.GetTags()) return &evaluatorservice.UpdateBuiltinEvaluatorTagsResponse{ - Evaluator: evaluatorconvertor.ConvertEvaluatorDO2DTO(ev), + Evaluator: evaluatorconvertor.ConvertEvaluatorDO2DTO(evaluatorDO), }, nil } func (e *EvaluatorHandlerImpl) ListEvaluatorTags(ctx context.Context, request *evaluatorservice.ListEvaluatorTagsRequest) (resp *evaluatorservice.ListEvaluatorTagsResponse, err error) { // 直接从配置获取可用的标签配置 tags := e.configer.GetEvaluatorTagConf(ctx) + // 对每个 tagKey 下的列表按字母顺序排序 + if len(tags) > 0 { + for k, vs := range tags { + if len(vs) > 1 { + sort.Strings(vs) + tags[k] = vs + } + } + } return &evaluatorservice.ListEvaluatorTagsResponse{ Tags: tags, }, nil diff --git a/backend/modules/evaluation/domain/entity/evaluator.go b/backend/modules/evaluation/domain/entity/evaluator.go index 3511f2234..e3d7d5f89 100644 --- a/backend/modules/evaluation/domain/entity/evaluator.go +++ b/backend/modules/evaluation/domain/entity/evaluator.go @@ -13,10 +13,11 @@ type Evaluator struct { LatestVersion string BaseInfo *BaseInfo - Builtin bool - Benchmark string - Vendor string - Tags map[EvaluatorTagKey][]string `json:"tags"` + Builtin bool + Benchmark string + Vendor string + BuiltinVisibleVersion string + Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `json:"tags"` PromptEvaluatorVersion *PromptEvaluatorVersion CodeEvaluatorVersion *CodeEvaluatorVersion @@ -43,7 +44,9 @@ type UpdateEvaluatorMetaRequest struct { Builtin *bool Benchmark *string Vendor *string - UpdatedBy string + // BuiltinVisibleVersion 预置评估器的对外可见版本（后续在 Service/Repo/DAO 层补充更新逻辑） + BuiltinVisibleVersion *string + UpdatedBy string } // GetEvaluatorVersionID 获取评估器版本ID diff --git a/backend/modules/evaluation/domain/entity/evaluator_tag.go b/backend/modules/evaluation/domain/entity/evaluator_tag.go index b3c126a03..ef5c9401e 100644 --- a/backend/modules/evaluation/domain/entity/evaluator_tag.go +++ b/backend/modules/evaluation/domain/entity/evaluator_tag.go @@ -1,5 +1,12 @@ package entity +type EvaluatorTagLangType string + +const ( + EvaluatorTagLangType_Zh EvaluatorTagLangType = "zh-CN" // 中文 + EvaluatorTagLangType_En EvaluatorTagLangType = "en-US" // 英文 +) + // EvaluatorTagKey Evaluator筛选字段 type EvaluatorTagKey string @@ -10,7 +17,6 @@ const ( EvaluatorTagKey_BusinessScenario EvaluatorTagKey = "BusinessScenario" // 业务场景 (安全风控/AI Coding等) EvaluatorTagKey_BoxType EvaluatorTagKey = "BoxType" // 黑白盒类型 EvaluatorTagKey_Name EvaluatorTagKey = "Name" // 评估器名称 - EvaluatorTagKey_Visible EvaluatorTagKey = "Visible" // 是否发布 ) type EvaluatorTagKeyType int32 diff --git a/backend/modules/evaluation/domain/entity/evaluator_template.go b/backend/modules/evaluation/domain/entity/evaluator_template.go index c93dfbd0d..ea99b1cc1 100644 --- a/backend/modules/evaluation/domain/entity/evaluator_template.go +++ b/backend/modules/evaluation/domain/entity/evaluator_template.go @@ -7,14 +7,14 @@ type EvaluatorTemplate struct { Description string EvaluatorType EvaluatorType - Benchmark string - Vendor string + Benchmark string + Vendor string Popularity int64 - InputSchemas []*ArgsSchema `json:"input_schemas"` - OutputSchemas []*ArgsSchema `json:"output_schemas"` - ReceiveChatHistory *bool `json:"receive_chat_history"` - Tags map[EvaluatorTagKey][]string `json:"tags"` + InputSchemas []*ArgsSchema `json:"input_schemas"` + OutputSchemas []*ArgsSchema `json:"output_schemas"` + ReceiveChatHistory *bool `json:"receive_chat_history"` + Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `json:"tags"` PromptEvaluatorContent *PromptEvaluatorContent CodeEvaluatorContent *CodeEvaluatorContent diff --git a/backend/modules/evaluation/domain/entity/param.go b/backend/modules/evaluation/domain/entity/param.go index 5b15d0c74..1f74007b2 100644 --- a/backend/modules/evaluation/domain/entity/param.go +++ b/backend/modules/evaluation/domain/entity/param.go @@ -133,26 +133,22 @@ type ExecuteEvalTargetParam struct { } type ListEvaluatorRequest struct { - SpaceID int64 `json:"space_id"` - SearchName string `json:"search_name,omitempty"` - CreatorIDs []int64 `json:"creator_ids,omitempty"` - EvaluatorType []EvaluatorType `json:"evaluator_type,omitempty"` - FilterOption *EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 - PageSize int32 `json:"page_size,omitempty"` - PageNum int32 `json:"page_num,omitempty"` - OrderBys []*OrderBy `json:"order_bys,omitempty"` - WithVersion bool `json:"with_version,omitempty"` + SpaceID int64 `json:"space_id"` + SearchName string `json:"search_name,omitempty"` + CreatorIDs []int64 `json:"creator_ids,omitempty"` + EvaluatorType []EvaluatorType `json:"evaluator_type,omitempty"` + FilterOption *EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 + PageSize int32 `json:"page_size,omitempty"` + PageNum int32 `json:"page_num,omitempty"` + OrderBys []*OrderBy `json:"order_bys,omitempty"` + WithVersion bool `json:"with_version,omitempty"` } type ListBuiltinEvaluatorRequest struct { - SpaceID int64 `json:"space_id"` - SearchName string `json:"search_name,omitempty"` - CreatorIDs []int64 `json:"creator_ids,omitempty"` - EvaluatorType []EvaluatorType `json:"evaluator_type,omitempty"` - FilterOption *EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 - PageSize int32 `json:"page_size,omitempty"` - PageNum int32 `json:"page_num,omitempty"` - WithVersion bool `json:"with_version,omitempty"` + FilterOption *EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 + PageSize int32 `json:"page_size,omitempty"` + PageNum int32 `json:"page_num,omitempty"` + WithVersion bool `json:"with_version,omitempty"` } type ListEvaluatorVersionRequest struct { @@ -320,20 +316,20 @@ type DebugTargetParam struct { // CreateEvaluatorTemplateRequest 创建评估器模板请求 type CreateEvaluatorTemplateRequest struct { - SpaceID int64 `json:"space_id" validate:"required,gt=0"` // 空间ID - Name string `json:"name" validate:"required,min=1,max=100"` // 模板名称 - Description string `json:"description" validate:"max=500"` // 模板描述 - EvaluatorType EvaluatorType `json:"evaluator_type" validate:"required"` // 评估器类型 - Benchmark string `json:"benchmark,omitempty" validate:"max=100"` // 基准 - Vendor string `json:"vendor,omitempty" validate:"max=100"` // 供应商 - InputSchemas []*ArgsSchema `json:"input_schemas,omitempty"` // 输入模式 - OutputSchemas []*ArgsSchema `json:"output_schemas,omitempty"` // 输出模式 - ReceiveChatHistory *bool `json:"receive_chat_history,omitempty"` // 是否接收聊天历史 - Tags map[EvaluatorTagKey][]string `json:"tags,omitempty"` // 标签 + SpaceID int64 `json:"space_id" validate:"required,gt=0"` // 空间ID + Name string `json:"name" validate:"required,min=1,max=100"` // 模板名称 + Description string `json:"description" validate:"max=500"` // 模板描述 + EvaluatorType EvaluatorType `json:"evaluator_type" validate:"required"` // 评估器类型 + Benchmark string `json:"benchmark,omitempty" validate:"max=100"` // 基准 + Vendor string `json:"vendor,omitempty" validate:"max=100"` // 供应商 + InputSchemas []*ArgsSchema `json:"input_schemas,omitempty"` // 输入模式 + OutputSchemas []*ArgsSchema `json:"output_schemas,omitempty"` // 输出模式 + ReceiveChatHistory *bool `json:"receive_chat_history,omitempty"` // 是否接收聊天历史 + Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `json:"tags,omitempty"` // 标签 // 评估器内容 - PromptEvaluatorContent *PromptEvaluatorContent `json:"prompt_evaluator_content,omitempty"` // Prompt评估器内容 - CodeEvaluatorContent *CodeEvaluatorContent `json:"code_evaluator_content,omitempty"` // Code评估器内容 + PromptEvaluatorContent *PromptEvaluatorContent `json:"prompt_evaluator_content,omitempty"` // Prompt评估器内容 + CodeEvaluatorContent *CodeEvaluatorContent `json:"code_evaluator_content,omitempty"` // Code评估器内容 } // CreateEvaluatorTemplateResponse 创建评估器模板响应 @@ -343,19 +339,19 @@ type CreateEvaluatorTemplateResponse struct { // UpdateEvaluatorTemplateRequest 更新评估器模板请求 type UpdateEvaluatorTemplateRequest struct { - ID int64 `json:"id" validate:"required,gt=0"` // 模板ID - Name *string `json:"name,omitempty" validate:"omitempty,min=1,max=100"` // 模板名称 - Description *string `json:"description,omitempty" validate:"omitempty,max=500"` // 模板描述 - Benchmark *string `json:"benchmark,omitempty" validate:"omitempty,max=100"` // 基准 - Vendor *string `json:"vendor,omitempty" validate:"omitempty,max=100"` // 供应商 - InputSchemas []*ArgsSchema `json:"input_schemas,omitempty"` // 输入模式 - OutputSchemas []*ArgsSchema `json:"output_schemas,omitempty"` // 输出模式 - ReceiveChatHistory *bool `json:"receive_chat_history,omitempty"` // 是否接收聊天历史 - Tags map[EvaluatorTagKey][]string `json:"tags,omitempty"` // 标签 + ID int64 `json:"id" validate:"required,gt=0"` // 模板ID + Name *string `json:"name,omitempty" validate:"omitempty,min=1,max=100"` // 模板名称 + Description *string `json:"description,omitempty" validate:"omitempty,max=500"` // 模板描述 + Benchmark *string `json:"benchmark,omitempty" validate:"omitempty,max=100"` // 基准 + Vendor *string `json:"vendor,omitempty" validate:"omitempty,max=100"` // 供应商 + InputSchemas []*ArgsSchema `json:"input_schemas,omitempty"` // 输入模式 + OutputSchemas []*ArgsSchema `json:"output_schemas,omitempty"` // 输出模式 + ReceiveChatHistory *bool `json:"receive_chat_history,omitempty"` // 是否接收聊天历史 + Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `json:"tags,omitempty"` // 标签 // 评估器内容 - PromptEvaluatorContent *PromptEvaluatorContent `json:"prompt_evaluator_content,omitempty"` // Prompt评估器内容 - CodeEvaluatorContent *CodeEvaluatorContent `json:"code_evaluator_content,omitempty"` // Code评估器内容 + PromptEvaluatorContent *PromptEvaluatorContent `json:"prompt_evaluator_content,omitempty"` // Prompt评估器内容 + CodeEvaluatorContent *CodeEvaluatorContent `json:"code_evaluator_content,omitempty"` // Code评估器内容 } // UpdateEvaluatorTemplateResponse 更新评估器模板响应 @@ -365,7 +361,7 @@ type UpdateEvaluatorTemplateResponse struct { // DeleteEvaluatorTemplateRequest 删除评估器模板请求 type DeleteEvaluatorTemplateRequest struct { - ID int64 `json:"id" validate:"required,gt=0"` // 模板ID + ID int64 `json:"id" validate:"required,gt=0"` // 模板ID } // DeleteEvaluatorTemplateResponse 删除评估器模板响应 @@ -375,8 +371,8 @@ type DeleteEvaluatorTemplateResponse struct { // GetEvaluatorTemplateRequest 获取评估器模板请求 type GetEvaluatorTemplateRequest struct { - ID int64 `json:"id" validate:"required,gt=0"` // 模板ID - IncludeDeleted bool `json:"include_deleted,omitempty"` // 是否包含已删除记录 + ID int64 `json:"id" validate:"required,gt=0"` // 模板ID + IncludeDeleted bool `json:"include_deleted,omitempty"` // 是否包含已删除记录 } // GetEvaluatorTemplateResponse 获取评估器模板响应 @@ -386,18 +382,18 @@ type GetEvaluatorTemplateResponse struct { // ListEvaluatorTemplateRequest 查询评估器模板列表请求 type ListEvaluatorTemplateRequest struct { - SpaceID int64 `json:"space_id" validate:"required,gt=0"` // 空间ID - FilterOption *EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 - PageSize int32 `json:"page_size" validate:"required,min=1,max=100"` // 分页大小 - PageNum int32 `json:"page_num" validate:"required,min=1"` // 页码 - IncludeDeleted bool `json:"include_deleted,omitempty"` // 是否包含已删除记录 + SpaceID int64 `json:"space_id" validate:"required,gt=0"` // 空间ID + FilterOption *EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 + PageSize int32 `json:"page_size" validate:"required,min=1,max=100"` // 分页大小 + PageNum int32 `json:"page_num" validate:"required,min=1"` // 页码 + IncludeDeleted bool `json:"include_deleted,omitempty"` // 是否包含已删除记录 } // ListEvaluatorTemplateResponse 查询评估器模板列表响应 type ListEvaluatorTemplateResponse struct { - TotalCount int64 `json:"total_count"` // 总数量 - Templates []*EvaluatorTemplate `json:"templates"` // 模板列表 - PageSize int32 `json:"page_size"` // 分页大小 - PageNum int32 `json:"page_num"` // 页码 - TotalPages int32 `json:"total_pages"` // 总页数 + TotalCount int64 `json:"total_count"` // 总数量 + Templates []*EvaluatorTemplate `json:"templates"` // 模板列表 + PageSize int32 `json:"page_size"` // 分页大小 + PageNum int32 `json:"page_num"` // 页码 + TotalPages int32 `json:"total_pages"` // 总页数 } diff --git a/backend/modules/evaluation/domain/repo/evaluator.go b/backend/modules/evaluation/domain/repo/evaluator.go index 33564f75d..5eb8977e6 100644 --- a/backend/modules/evaluation/domain/repo/evaluator.go +++ b/backend/modules/evaluation/domain/repo/evaluator.go @@ -20,8 +20,8 @@ type IEvaluatorRepo interface { UpdateEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error UpdateEvaluatorMeta(ctx context.Context, req *entity.UpdateEvaluatorMetaRequest) error - // UpdateEvaluatorVersionTags 根据版本ID全量更新标签：不存在的新增，不在传入列表中的删除 - UpdateEvaluatorVersionTags(ctx context.Context, versionID int64, tags map[entity.EvaluatorTagKey][]string) error + // UpdateEvaluatorTags 根据评估器ID全量更新标签（多语言）：不存在的新增，不在传入列表中的删除 + UpdateEvaluatorTags(ctx context.Context, evaluatorID int64, tags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string) error BatchGetEvaluatorMetaByID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) BatchGetEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) @@ -33,10 +33,13 @@ type IEvaluatorRepo interface { CheckNameExist(ctx context.Context, spaceID, evaluatorID int64, name string) (bool, error) CheckVersionExist(ctx context.Context, evaluatorID int64, version string) (bool, error) + // BatchGetEvaluatorVersionsByEvaluatorIDAndVersions 批量根据 (evaluator_id, version) 获取版本 + BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx context.Context, pairs [][2]interface{}) ([]*entity.Evaluator, error) + // ListBuiltinEvaluator 根据筛选条件查询内置评估器列表，支持tag筛选和分页 ListBuiltinEvaluator(ctx context.Context, req *ListBuiltinEvaluatorRequest) (*ListBuiltinEvaluatorResponse, error) // BatchGetBuiltinEvaluatorByVersionID 批量根据版本ID获取内置评估器，包含tag信息 - BatchGetBuiltinEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) + BatchGetBuiltinEvaluatorByVersionID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) } type ListEvaluatorRequest struct { @@ -70,7 +73,6 @@ type ListEvaluatorVersionResponse struct { // ListBuiltinEvaluatorRequest 查询内置评估器的请求参数 type ListBuiltinEvaluatorRequest struct { - SpaceID int64 `json:"space_id"` FilterOption *entity.EvaluatorFilterOption `json:"filter_option,omitempty"` // 标签筛选条件 PageSize int32 `json:"page_size"` // 分页大小 PageNum int32 `json:"page_num"` // 页码 diff --git a/backend/modules/evaluation/domain/service/evaluator.go b/backend/modules/evaluation/domain/service/evaluator.go index 549a71bd1..3c2a3be88 100644 --- a/backend/modules/evaluation/domain/service/evaluator.go +++ b/backend/modules/evaluation/domain/service/evaluator.go @@ -23,8 +23,8 @@ type EvaluatorService interface { CreateEvaluator(ctx context.Context, evaluator *entity.Evaluator, cid string) (int64, error) // UpdateEvaluatorMeta 修改评估器元信息（支持 builtin/benchmark/vendor 可选更新） UpdateEvaluatorMeta(ctx context.Context, req *entity.UpdateEvaluatorMetaRequest) error - // UpdateBuiltinEvaluatorTags 更新内置评估器版本的标签（按 evaluator_id + version 定位版本） - UpdateBuiltinEvaluatorTags(ctx context.Context, evaluatorID int64, version string, tags map[entity.EvaluatorTagKey][]string) (*entity.Evaluator, error) + // UpdateBuiltinEvaluatorTags 更新内置评估器的标签（按 evaluator_id 全量对齐） + UpdateBuiltinEvaluatorTags(ctx context.Context, evaluatorID int64, tags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string) error // UpdateEvaluatorDraft 修改 evaluator_version draft UpdateEvaluatorDraft(ctx context.Context, versionDO *entity.Evaluator) error // DeleteEvaluator 删除 evaluator_version diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index 570ce39af..be249811e 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -6,6 +6,7 @@ package service import ( "context" "fmt" + "strconv" "sync" "time" @@ -242,32 +243,9 @@ func (e *EvaluatorServiceImpl) UpdateEvaluatorMeta(ctx context.Context, req *ent return e.evaluatorRepo.UpdateEvaluatorMeta(ctx, req) } -// UpdateBuiltinEvaluatorTags 根据 evaluatorID + version 更新该版本的标签 -func (e *EvaluatorServiceImpl) UpdateBuiltinEvaluatorTags(ctx context.Context, evaluatorID int64, version string, tags map[entity.EvaluatorTagKey][]string) (*entity.Evaluator, error) { - // 查出该 evaluator 的指定版本，拿到版本ID - listReq := &repo.ListEvaluatorVersionRequest{ - EvaluatorID: evaluatorID, - QueryVersions: []string{version}, - PageSize: 1, - PageNum: 1, - OrderBy: []*entity.OrderBy{}, - } - result, err := e.evaluatorRepo.ListEvaluatorVersion(ctx, listReq) - if err != nil { - return nil, err - } - if len(result.Versions) == 0 { - return nil, errorx.NewByCode(errno.EvaluatorVersionNotFoundCode) - } - ev := result.Versions[0] - versionID := ev.GetEvaluatorVersionID() - - // 调用 repo 更新该版本的标签 - if err := e.evaluatorRepo.UpdateEvaluatorVersionTags(ctx, versionID, tags); err != nil { - return nil, err - } - // 回填最新标签到返回对象（可选：这里仅返回版本，不做额外查询） - return ev, nil +// UpdateBuiltinEvaluatorTags 根据 evaluatorID 全量对齐标签（多语言） +func (e *EvaluatorServiceImpl) UpdateBuiltinEvaluatorTags(ctx context.Context, evaluatorID int64, tags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string) error { + return e.evaluatorRepo.UpdateEvaluatorTags(ctx, evaluatorID, tags) } // 校验UpdateEvaluator参数合法性 @@ -352,7 +330,7 @@ func (e *EvaluatorServiceImpl) GetEvaluatorVersion(ctx context.Context, spaceID var evaluatorDOList []*entity.Evaluator var err error if builtin { - evaluatorDOList, err = e.evaluatorRepo.BatchGetBuiltinEvaluatorByVersionID(ctx, spaceID, []int64{evaluatorVersionID}, includeDeleted) + evaluatorDOList, err = e.evaluatorRepo.BatchGetBuiltinEvaluatorByVersionID(ctx, []int64{evaluatorVersionID}, includeDeleted) } else { evaluatorDOList, err = e.evaluatorRepo.BatchGetEvaluatorByVersionID(ctx, spaceID, []int64{evaluatorVersionID}, includeDeleted) } @@ -546,7 +524,6 @@ func (e *EvaluatorServiceImpl) injectUserInfo(ctx context.Context, evaluatorDO * func (e *EvaluatorServiceImpl) ListBuiltinEvaluator(ctx context.Context, request *entity.ListBuiltinEvaluatorRequest) ([]*entity.Evaluator, int64, error) { // 构建ListBuiltinEvaluator请求 repoReq := &repo.ListBuiltinEvaluatorRequest{ - SpaceID: request.SpaceID, FilterOption: request.FilterOption, // 直接使用传入的FilterOption PageSize: request.PageSize, PageNum: request.PageNum, @@ -559,44 +536,35 @@ func (e *EvaluatorServiceImpl) ListBuiltinEvaluator(ctx context.Context, request return nil, 0, err } - // 如果不需要版本信息，直接返回 - if !request.WithVersion { - return result.Evaluators, result.TotalCount, nil - } - - // 如果需要版本信息，获取版本数据 - evaluatorID2DO := make(map[int64]*entity.Evaluator, len(result.Evaluators)) - for _, evaluator := range result.Evaluators { - evaluatorID2DO[evaluator.ID] = evaluator - } - - // 批量获取版本信息 - evaluatorIDs := make([]int64, 0, len(result.Evaluators)) - for _, evaluator := range result.Evaluators { - evaluatorIDs = append(evaluatorIDs, evaluator.ID) - } - evaluatorVersions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDs(ctx, evaluatorIDs, false) - if err != nil { - return nil, 0, err - } - - // 组装版本信息 - for _, evaluatorVersion := range evaluatorVersions { - evaluatorDO, ok := evaluatorID2DO[evaluatorVersion.GetEvaluatorID()] - if !ok { + // 通过 evaluator_id + BuiltinVisibleVersion 批量查询版本并回填 + pairs := make([][2]interface{}, 0, len(result.Evaluators)) + for _, ev := range result.Evaluators { + if ev == nil || ev.BuiltinVisibleVersion == "" { continue } - // 设置 Evaluator.ID 为评估器ID（不是评估器版本ID） - evaluatorVersion.ID = evaluatorDO.ID - evaluatorVersion.SpaceID = evaluatorDO.SpaceID - evaluatorVersion.Description = evaluatorDO.Description - evaluatorVersion.BaseInfo = evaluatorDO.BaseInfo - evaluatorVersion.Name = evaluatorDO.Name - evaluatorVersion.EvaluatorType = evaluatorDO.EvaluatorType - evaluatorVersion.Description = evaluatorDO.Description - evaluatorVersion.DraftSubmitted = evaluatorDO.DraftSubmitted - evaluatorVersion.LatestVersion = evaluatorDO.LatestVersion + pairs = append(pairs, [2]interface{}{ev.ID, ev.BuiltinVisibleVersion}) } - - return evaluatorVersions, int64(len(evaluatorVersions)), nil + if len(pairs) > 0 { + versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) + if err != nil { + return nil, 0, err + } + // 建立 (evaluatorID, version) -> DO 映射 + verMap := make(map[string]*entity.Evaluator, len(versions)) + for _, ver := range versions { + key := strconv.FormatInt(ver.GetEvaluatorID(), 10) + "#" + ver.GetVersion() + verMap[key] = ver + } + // 回填 + for _, ev := range result.Evaluators { + if ev == nil || ev.BuiltinVisibleVersion == "" { + continue + } + key := strconv.FormatInt(ev.ID, 10) + "#" + ev.BuiltinVisibleVersion + if v, ok := verMap[key]; ok { + ev.SetEvaluatorVersion(v) + } + } + } + return result.Evaluators, result.TotalCount, nil } diff --git a/backend/modules/evaluation/domain/service/evaluator_template_impl.go b/backend/modules/evaluation/domain/service/evaluator_template_impl.go index 4d54d9f0e..b378cf423 100644 --- a/backend/modules/evaluation/domain/service/evaluator_template_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_template_impl.go @@ -41,16 +41,16 @@ func (s *EvaluatorTemplateServiceImpl) CreateEvaluatorTemplate(ctx context.Conte // 构建模板实体 template := &entity.EvaluatorTemplate{ - SpaceID: req.SpaceID, - Name: req.Name, - Description: req.Description, - EvaluatorType: req.EvaluatorType, - Benchmark: req.Benchmark, - Vendor: req.Vendor, - InputSchemas: req.InputSchemas, - OutputSchemas: req.OutputSchemas, - ReceiveChatHistory: req.ReceiveChatHistory, - Tags: req.Tags, + SpaceID: req.SpaceID, + Name: req.Name, + Description: req.Description, + EvaluatorType: req.EvaluatorType, + Benchmark: req.Benchmark, + Vendor: req.Vendor, + InputSchemas: req.InputSchemas, + OutputSchemas: req.OutputSchemas, + ReceiveChatHistory: req.ReceiveChatHistory, + Tags: req.Tags, PromptEvaluatorContent: req.PromptEvaluatorContent, CodeEvaluatorContent: req.CodeEvaluatorContent, } @@ -311,9 +311,6 @@ func (s *EvaluatorTemplateServiceImpl) validateGetRequest(req *entity.GetEvaluat // validateListRequest 验证列表请求 func (s *EvaluatorTemplateServiceImpl) validateListRequest(req *entity.ListEvaluatorTemplateRequest) error { - if req.SpaceID <= 0 { - return errors.New("空间ID必须大于0") - } if req.PageSize <= 0 || req.PageSize > 100 { return errors.New("分页大小必须在1-100之间") } diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 9ecd17450..41542e27c 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -22,6 +22,7 @@ import ( "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + "github.com/coze-dev/coze-loop/backend/pkg/contexts" ) // EvaluatorRepoImpl 实现 EvaluatorRepo 接口 @@ -35,6 +36,23 @@ type EvaluatorRepoImpl struct { lwt platestwrite.ILatestWriteTracker } +// BatchGetEvaluatorVersionsByEvaluatorIDAndVersions 批量根据 (evaluator_id, version) 获取版本 +func (r *EvaluatorRepoImpl) BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx context.Context, pairs [][2]interface{}) ([]*entity.Evaluator, error) { + pos, err := r.evaluatorVersionDao.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) + if err != nil { + return nil, err + } + result := make([]*entity.Evaluator, 0, len(pos)) + for _, po := range pos { + do, err := convertor.ConvertEvaluatorVersionPO2DO(po) + if err != nil { + return nil, err + } + result = append(result, do) + } + return result, nil +} + func NewEvaluatorRepo(idgen idgen.IIDGenerator, provider db.Provider, evaluatorDao mysql.EvaluatorDAO, evaluatorVersionDao mysql.EvaluatorVersionDAO, tagDAO mysql.EvaluatorTagDAO, lwt platestwrite.ILatestWriteTracker, evaluatorTemplateDAO mysql.EvaluatorTemplateDAO) repo.IEvaluatorRepo { singletonEvaluatorRepo := &EvaluatorRepoImpl{ evaluatorDao: evaluatorDao, @@ -66,13 +84,15 @@ func (r *EvaluatorRepoImpl) SubmitEvaluatorVersion(ctx context.Context, evaluato } // 提交版本成功后，根据模板ID为模板热度 +1（若可解析） r.incrTemplatePopularityByEvaluator(ctx, evaluator, opt) - // 如果是预置评估器，且携带了标签，则为本次提交的版本ID创建tags + // 如果是预置评估器，且携带了标签，则为本次提交的版本ID创建多语言tags if evaluator.Builtin && len(evaluator.Tags) > 0 { userID := session.UserIDInCtxOrEmpty(ctx) - // 统计需要创建的总标签数 + // 统计需要创建的总标签数（按语言聚合） total := 0 - for _, tagValues := range evaluator.Tags { - total += len(tagValues) + for _, langMap := range evaluator.Tags { + for _, tagValues := range langMap { + total += len(tagValues) + } } if total > 0 { // 生成所需的ID @@ -82,18 +102,21 @@ func (r *EvaluatorRepoImpl) SubmitEvaluatorVersion(ctx context.Context, evaluato } idx := 0 evaluatorTags := make([]*model.EvaluatorTag, 0, total) - for tagKey, tagValues := range evaluator.Tags { - for _, tagValue := range tagValues { - evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ - ID: ids[idx], - SourceID: evaluatorVersionPO.ID, - TagType: int32(entity.EvaluatorTagKeyType_Evaluator), - TagKey: string(tagKey), - TagValue: tagValue, - CreatedBy: userID, - UpdatedBy: userID, - }) - idx++ + for lang, langMap := range evaluator.Tags { + for tagKey, tagValues := range langMap { + for _, tagValue := range tagValues { + evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ + ID: ids[idx], + SourceID: evaluatorVersionPO.ID, + TagType: int32(entity.EvaluatorTagKeyType_Evaluator), + TagKey: string(tagKey), + TagValue: tagValue, + LangType: string(lang), + CreatedBy: userID, + UpdatedBy: userID, + }) + idx++ + } } } if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags, opt); err != nil { @@ -244,7 +267,7 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorDraftByEvaluatorID(ctx context.Cont // 批量查询所有tags var allTags []*model.EvaluatorTag if len(builtinVersionIDs) > 0 { - allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, builtinVersionIDs, int32(entity.EvaluatorTagKeyType_Evaluator), opts...) + allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, builtinVersionIDs, int32(entity.EvaluatorTagKeyType_Evaluator), contexts.CtxLocale(ctx), opts...) if err != nil { allTags = []*model.EvaluatorTag{} } @@ -380,8 +403,6 @@ func (r *EvaluatorRepoImpl) CreateEvaluator(ctx context.Context, do *entity.Eval return evaluatorID, nil } -// CreateBuiltinEvaluator 已移除：统一在 CreateEvaluator 中处理 builtin 逻辑 - // BatchGetEvaluatorDraft 批量根据ID 获取 Evaluator func (r *EvaluatorRepoImpl) BatchGetEvaluatorDraft(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { if len(ids) == 0 { @@ -429,6 +450,9 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorMeta(ctx context.Context, req *entity if req.Vendor != nil { po.Vendor = req.Vendor } + if req.BuiltinVisibleVersion != nil { + po.BuiltinVisibleVersion = gptr.Indirect(req.BuiltinVisibleVersion) + } if req.Builtin != nil { // 将 bool 转为 1/2 存入 if *req.Builtin { @@ -440,87 +464,89 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorMeta(ctx context.Context, req *entity return r.evaluatorDao.UpdateEvaluatorMeta(ctx, po) } -// UpdateEvaluatorVersionTags 根据版本ID全量更新标签：不存在的新增，不在传入列表中的删除 -func (r *EvaluatorRepoImpl) UpdateEvaluatorVersionTags(ctx context.Context, versionID int64, tags map[entity.EvaluatorTagKey][]string) error { +// UpdateEvaluatorTags 根据评估器ID全量更新标签：不存在的新增，不在传入列表中的删除 +func (r *EvaluatorRepoImpl) UpdateEvaluatorTags(ctx context.Context, evaluatorID int64, tags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string) error { return r.dbProvider.Transaction(ctx, func(tx *gorm.DB) error { opt := db.WithTransaction(tx) - // 查询当前已有标签 - existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{versionID}, int32(entity.EvaluatorTagKeyType_Evaluator), opt) - if err != nil { - return err - } - // 构建现有集合 - existing := make(map[string]map[string]bool) - for _, t := range existingTags { - if _, ok := existing[t.TagKey]; !ok { - existing[t.TagKey] = make(map[string]bool) - } - existing[t.TagKey][t.TagValue] = true - } - // 目标集 - target := make(map[string]map[string]bool) - for k, vs := range tags { - kstr := string(k) - if _, ok := target[kstr]; !ok { - target[kstr] = make(map[string]bool) - } - for _, v := range vs { - target[kstr][v] = true + // 针对每种语言分别做全量对齐 + userID := session.UserIDInCtxOrEmpty(ctx) + for lang, tagMap := range tags { + // 查询该语言下已有标签 + existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{evaluatorID}, int32(entity.EvaluatorTagKeyType_Evaluator), string(lang), opt) + if err != nil { + return err } - } - // 计算需要删除 - del := make(map[string][]string) - for k, vals := range existing { - for v := range vals { - if !target[k][v] { - del[k] = append(del[k], v) + existing := make(map[string]map[string]bool) + for _, t := range existingTags { + if _, ok := existing[t.TagKey]; !ok { + existing[t.TagKey] = make(map[string]bool) } + existing[t.TagKey][t.TagValue] = true } - } - if len(del) > 0 { - if err := r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, versionID, int32(entity.EvaluatorTagKeyType_Evaluator), del, opt); err != nil { - return err - } - } - // 计算需要新增 - add := make(map[string][]string) - for k, vals := range target { - for v := range vals { - if !existing[k][v] { - add[k] = append(add[k], v) + target := make(map[string]map[string]bool) + for k, vs := range tagMap { + kstr := string(k) + if _, ok := target[kstr]; !ok { + target[kstr] = make(map[string]bool) + } + for _, v := range vs { + target[kstr][v] = true } } - } - if len(add) > 0 { - userID := session.UserIDInCtxOrEmpty(ctx) - // 统计需要新增的标签数量 - total := 0 - for _, vals := range add { - total += len(vals) + // 需要删除的 + del := make(map[string][]string) + for k, vals := range existing { + for v := range vals { + if !target[k][v] { + del[k] = append(del[k], v) + } + } } - if total > 0 { - ids, err := r.idgen.GenMultiIDs(ctx, total) - if err != nil { + if len(del) > 0 { + if err := r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, evaluatorID, int32(entity.EvaluatorTagKeyType_Evaluator), string(lang), del, opt); err != nil { return err } - idx := 0 - evaluatorTags := make([]*model.EvaluatorTag, 0, total) - for k, vals := range add { - for _, v := range vals { - evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ - ID: ids[idx], - SourceID: versionID, - TagType: int32(entity.EvaluatorTagKeyType_Evaluator), - TagKey: k, - TagValue: v, - CreatedBy: userID, - UpdatedBy: userID, - }) - idx++ + } + // 需要新增的 + add := make(map[string][]string) + for k, vals := range target { + for v := range vals { + if !existing[k][v] { + add[k] = append(add[k], v) } } - if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags, opt); err != nil { - return err + } + if len(add) > 0 { + // 统计需要新增的标签数量 + total := 0 + for _, vals := range add { + total += len(vals) + } + if total > 0 { + ids, err := r.idgen.GenMultiIDs(ctx, total) + if err != nil { + return err + } + idx := 0 + evaluatorTags := make([]*model.EvaluatorTag, 0, total) + for k, vals := range add { + for _, v := range vals { + evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ + ID: ids[idx], + SourceID: evaluatorID, + TagType: int32(entity.EvaluatorTagKeyType_Evaluator), + TagKey: k, + TagValue: v, + LangType: string(lang), + CreatedBy: userID, + UpdatedBy: userID, + }) + idx++ + } + } + if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags, opt); err != nil { + return err + } } } } @@ -609,7 +635,7 @@ func (r *EvaluatorRepoImpl) ListBuiltinEvaluator(ctx context.Context, req *repo. // 如果有有效的筛选条件，进行标签查询 if hasValidFilters { // 使用EvaluatorTagDAO查询符合条件的evaluator IDs（不分页） - filteredIDs, _, err := r.tagDAO.GetSourceIDsByFilterConditions(ctx, int32(entity.EvaluatorTagKeyType_Evaluator), req.FilterOption, 0, 0) + filteredIDs, _, err := r.tagDAO.GetSourceIDsByFilterConditions(ctx, int32(entity.EvaluatorTagKeyType_Evaluator), req.FilterOption, req.PageSize, req.PageNum, contexts.CtxLocale(ctx)) if err != nil { return nil, err } @@ -626,69 +652,50 @@ func (r *EvaluatorRepoImpl) ListBuiltinEvaluator(ctx context.Context, req *repo. } } - // 构建DAO层查询请求 - daoReq := &mysql.ListEvaluatorRequest{ - SpaceID: req.SpaceID, - SearchName: "", // 内置评估器不需要名称搜索 - CreatorIDs: []int64{}, // 内置评估器不需要创建者过滤 - EvaluatorType: []int32{}, // 可以根据需要添加类型过滤 - IDs: evaluatorIDs, // 使用筛选后的IDs - PageSize: req.PageSize, - PageNum: req.PageNum, - OrderBy: []*mysql.OrderBy{}, // 可以根据需要添加排序 + // 构建DAO层查询请求（专用内置接口，默认按 name 排序） + daoReq := &mysql.ListBuiltinEvaluatorRequest{ + IDs: evaluatorIDs, + PageSize: req.PageSize, + PageNum: req.PageNum, + OrderBy: []*mysql.OrderBy{{Field: "name", ByDesc: false}}, } // 调用DAO层查询 - daoResp, err := r.evaluatorDao.ListEvaluator(ctx, daoReq) + daoResp, err := r.evaluatorDao.ListBuiltinEvaluator(ctx, daoReq) if err != nil { return nil, err } - // 批量查询所有evaluator的tags + // 直接以 evaluatorID 为 source_id 批量查标签 var allTags []*model.EvaluatorTag if len(daoResp.Evaluators) > 0 { - // 收集所有evaluator的ID - evaluatorIDs := make([]int64, 0, len(daoResp.Evaluators)) - for _, evaluatorPO := range daoResp.Evaluators { - evaluatorIDs = append(evaluatorIDs, evaluatorPO.ID) + ids := make([]int64, 0, len(daoResp.Evaluators)) + for _, po := range daoResp.Evaluators { + ids = append(ids, po.ID) } - - // 批量查询所有tags - allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, evaluatorIDs, int32(entity.EvaluatorTagKeyType_Evaluator)) - if err != nil { - // 如果批量查询tags失败，记录错误但继续处理 - // 这里可以根据业务需求决定是否返回错误 + var tagErr error + allTags, tagErr = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, ids, int32(entity.EvaluatorTagKeyType_Evaluator), contexts.CtxLocale(ctx)) + if tagErr != nil { allTags = []*model.EvaluatorTag{} } } - - // 将tags按sourceID分组 tagsBySourceID := make(map[int64][]*model.EvaluatorTag) for _, tag := range allTags { tagsBySourceID[tag.SourceID] = append(tagsBySourceID[tag.SourceID], tag) } - - // 转换响应格式 evaluators := make([]*entity.Evaluator, 0, len(daoResp.Evaluators)) for _, evaluatorPO := range daoResp.Evaluators { evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorPO) - - // 设置tags信息（使用提取出来的公共逻辑） r.setEvaluatorTags(evaluatorDO, evaluatorPO.ID, tagsBySourceID) - evaluators = append(evaluators, evaluatorDO) } - - return &repo.ListBuiltinEvaluatorResponse{ - TotalCount: daoResp.TotalCount, - Evaluators: evaluators, - }, nil + return &repo.ListBuiltinEvaluatorResponse{TotalCount: daoResp.TotalCount, Evaluators: evaluators}, nil } // BatchGetBuiltinEvaluatorByVersionID 批量根据版本ID获取内置评估器，包含tag信息 -func (r *EvaluatorRepoImpl) BatchGetBuiltinEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { +func (r *EvaluatorRepoImpl) BatchGetBuiltinEvaluatorByVersionID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { // 先获取evaluator版本信息 - evaluatorVersionPOS, err := r.evaluatorVersionDao.BatchGetEvaluatorVersionByID(ctx, spaceID, ids, includeDeleted) + evaluatorVersionPOS, err := r.evaluatorVersionDao.BatchGetEvaluatorVersionByID(ctx, nil, ids, includeDeleted) if err != nil { return nil, err } @@ -707,16 +714,16 @@ func (r *EvaluatorRepoImpl) BatchGetBuiltinEvaluatorByVersionID(ctx context.Cont evaluatorMap[evaluatorPO.ID] = evaluatorPO } - // 收集所有 evaluator_version 的ID用于查询tags（以版本ID为source_id） - versionIDs := make([]int64, 0, len(evaluatorVersionPOS)) + // 收集所有 evaluator 的ID用于查询tags（以evaluator ID为source_id） + evaluatorIDs := make([]int64, 0, len(evaluatorVersionPOS)) for _, ev := range evaluatorVersionPOS { - versionIDs = append(versionIDs, ev.ID) + evaluatorIDs = append(evaluatorIDs, ev.EvaluatorID) } // 批量查询所有tags（以版本ID为source_id） var allTags []*model.EvaluatorTag - if len(versionIDs) > 0 { - allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, versionIDs, int32(entity.EvaluatorTagKeyType_Evaluator)) + if len(evaluatorIDs) > 0 { + allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, evaluatorIDs, int32(entity.EvaluatorTagKeyType_Evaluator), contexts.CtxLocale(ctx)) if err != nil { // 如果批量查询tags失败，记录错误但继续处理 allTags = []*model.EvaluatorTag{} @@ -766,7 +773,7 @@ func (r *EvaluatorRepoImpl) BatchGetBuiltinEvaluatorByVersionID(ctx context.Cont } // 设置tags信息（以版本ID为source_id） - r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.ID, tagsBySourceID) + r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.EvaluatorID, tagsBySourceID) evaluatorDOList = append(evaluatorDOList, evaluatorDO) } @@ -777,6 +784,7 @@ func (r *EvaluatorRepoImpl) BatchGetBuiltinEvaluatorByVersionID(ctx context.Cont // setEvaluatorTags 设置评估器的tag信息 func (r *EvaluatorRepoImpl) setEvaluatorTags(evaluatorDO *entity.Evaluator, evaluatorID int64, tagsBySourceID map[int64][]*model.EvaluatorTag) { if tags, exists := tagsBySourceID[evaluatorID]; exists && len(tags) > 0 { + // 这里的 tags 已按语言过滤，因此直接构建单语言映射，并放入 DO 的多语言结构中 tagMap := make(map[entity.EvaluatorTagKey][]string) for _, tag := range tags { tagKey := entity.EvaluatorTagKey(tag.TagKey) @@ -785,6 +793,11 @@ func (r *EvaluatorRepoImpl) setEvaluatorTags(evaluatorDO *entity.Evaluator, eval } tagMap[tagKey] = append(tagMap[tagKey], tag.TagValue) } - evaluatorDO.Tags = tagMap + if evaluatorDO.Tags == nil { + evaluatorDO.Tags = make(map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string) + } + // 使用 tag 的语言（同一批 tags 语言相同） + lang := entity.EvaluatorTagLangType(tags[0].LangType) + evaluatorDO.Tags[lang] = tagMap } } diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index 0d92a6bf2..caa37e2b0 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -1587,7 +1587,7 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { // 设置获取现有tags的期望 mockTagDAO.EXPECT(). - BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{100}, int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any()). + BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{100}, int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any(), gomock.Any()). Return([]*model.EvaluatorTag{ { ID: 1, @@ -1605,7 +1605,7 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { // 设置删除不需要的tags的期望 mockTagDAO.EXPECT(). - DeleteEvaluatorTagsByConditions(gomock.Any(), int64(100), int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any(), gomock.Any()). + DeleteEvaluatorTagsByConditions(gomock.Any(), int64(100), int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any(), gomock.Any(), gomock.Any()). Return(nil) // 设置新增tags的期望 diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go index a750d0b5d..913d4cecb 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go @@ -14,6 +14,7 @@ import ( "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + "github.com/coze-dev/coze-loop/backend/pkg/contexts" ) // EvaluatorTemplateRepoImpl 实现 EvaluatorTemplateRepo 接口 @@ -55,7 +56,7 @@ func (r *EvaluatorTemplateRepoImpl) ListEvaluatorTemplate(ctx context.Context, r // 如果有有效的筛选条件，进行标签查询 if hasValidFilters { // 使用EvaluatorTagDAO查询符合条件的template IDs（不分页） - filteredIDs, _, err := r.tagDAO.GetSourceIDsByFilterConditions(ctx, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), req.FilterOption, 0, 0) + filteredIDs, _, err := r.tagDAO.GetSourceIDsByFilterConditions(ctx, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), req.FilterOption, 0, 0, contexts.CtxLocale(ctx)) if err != nil { return nil, err } @@ -88,12 +89,28 @@ func (r *EvaluatorTemplateRepoImpl) ListEvaluatorTemplate(ctx context.Context, r // 转换响应格式 templates := make([]*entity.EvaluatorTemplate, 0, len(daoResp.Templates)) + ids := make([]int64, 0, len(daoResp.Templates)) for _, templatePO := range daoResp.Templates { templateDO, err := convertor.ConvertEvaluatorTemplatePO2DOWithBaseInfo(templatePO) if err != nil { return nil, err } templates = append(templates, templateDO) + ids = append(ids, templatePO.ID) + } + + // 批量查询并填充标签（以模板ID为source_id） + if len(ids) > 0 { + allTags, tagErr := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, ids, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), contexts.CtxLocale(ctx)) + if tagErr == nil && len(allTags) > 0 { + tagsBySourceID := make(map[int64][]*model.EvaluatorTag) + for _, tag := range allTags { + tagsBySourceID[tag.SourceID] = append(tagsBySourceID[tag.SourceID], tag) + } + for _, tpl := range templates { + r.setTemplateTags(tpl, tpl.ID, tagsBySourceID) + } + } } return &repo.ListEvaluatorTemplateResponse{ @@ -114,6 +131,13 @@ func (r *EvaluatorTemplateRepoImpl) CreateEvaluatorTemplate(ctx context.Context, return nil, err } + // 生成并填充主键ID（使用 idgen），避免依赖数据库自增 + ids, err := r.idgen.GenMultiIDs(ctx, 1) + if err != nil { + return nil, err + } + templatePO.ID = ids[0] + // 调用DAO层创建 createdPO, err := r.templateDAO.CreateEvaluatorTemplate(ctx, templatePO) if err != nil { @@ -121,12 +145,14 @@ func (r *EvaluatorTemplateRepoImpl) CreateEvaluatorTemplate(ctx context.Context, } // 若携带了标签，则为模板创建tags（以模板ID作为 source_id） - if template != nil && len(template.Tags) > 0 { + if len(template.Tags) > 0 { userID := session.UserIDInCtxOrEmpty(ctx) - // 统计总标签数 + // 统计总标签数（所有语言） total := 0 - for _, vals := range template.Tags { - total += len(vals) + for _, langMap := range template.Tags { + for _, vals := range langMap { + total += len(vals) + } } if total > 0 { ids, err := r.idgen.GenMultiIDs(ctx, total) @@ -135,18 +161,21 @@ func (r *EvaluatorTemplateRepoImpl) CreateEvaluatorTemplate(ctx context.Context, } idx := 0 evaluatorTags := make([]*model.EvaluatorTag, 0, total) - for tagKey, tagValues := range template.Tags { - for _, tagValue := range tagValues { - evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ - ID: ids[idx], - SourceID: createdPO.ID, - TagType: int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), - TagKey: string(tagKey), - TagValue: tagValue, - CreatedBy: userID, - UpdatedBy: userID, - }) - idx++ + for lang, langMap := range template.Tags { + for tagKey, tagValues := range langMap { + for _, tagValue := range tagValues { + evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ + ID: ids[idx], + SourceID: createdPO.ID, + TagType: int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), + TagKey: string(tagKey), + TagValue: tagValue, + LangType: string(lang), + CreatedBy: userID, + UpdatedBy: userID, + }) + idx++ + } } } if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags); err != nil { @@ -184,82 +213,81 @@ func (r *EvaluatorTemplateRepoImpl) UpdateEvaluatorTemplate(ctx context.Context, // 标签全量对齐：新增补充、删除不在集合内的，保持未变化的不动 if template != nil { - // 查询当前已有标签 - existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{template.ID}, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate)) - if err != nil { - return nil, err - } - // 构建现有集合 - existing := make(map[string]map[string]bool) - for _, t := range existingTags { - if _, ok := existing[t.TagKey]; !ok { - existing[t.TagKey] = make(map[string]bool) - } - existing[t.TagKey][t.TagValue] = true - } - // 目标集 - target := make(map[string]map[string]bool) - for k, vs := range template.Tags { - kstr := string(k) - if _, ok := target[kstr]; !ok { - target[kstr] = make(map[string]bool) - } - for _, v := range vs { - target[kstr][v] = true + // 针对每种语言分别全量对齐 + userID := session.UserIDInCtxOrEmpty(ctx) + for lang, tagMap := range template.Tags { + existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{template.ID}, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), string(lang)) + if err != nil { + return nil, err } - } - // 计算需要删除 - del := make(map[string][]string) - for k, vals := range existing { - for v := range vals { - if !target[k][v] { - del[k] = append(del[k], v) + existing := make(map[string]map[string]bool) + for _, t := range existingTags { + if _, ok := existing[t.TagKey]; !ok { + existing[t.TagKey] = make(map[string]bool) } + existing[t.TagKey][t.TagValue] = true } - } - if len(del) > 0 { - if err := r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, template.ID, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), del); err != nil { - return nil, err - } - } - // 计算需要新增 - add := make(map[string][]string) - for k, vals := range target { - for v := range vals { - if !existing[k][v] { - add[k] = append(add[k], v) + target := make(map[string]map[string]bool) + for k, vs := range tagMap { + kstr := string(k) + if _, ok := target[kstr]; !ok { + target[kstr] = make(map[string]bool) + } + for _, v := range vs { + target[kstr][v] = true } } - } - if len(add) > 0 { - userID := session.UserIDInCtxOrEmpty(ctx) - total := 0 - for _, vs := range add { - total += len(vs) + del := make(map[string][]string) + for k, vals := range existing { + for v := range vals { + if !target[k][v] { + del[k] = append(del[k], v) + } + } } - if total > 0 { - ids, err := r.idgen.GenMultiIDs(ctx, total) - if err != nil { + if len(del) > 0 { + if err := r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, template.ID, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), string(lang), del); err != nil { return nil, err } - idx := 0 - evaluatorTags := make([]*model.EvaluatorTag, 0, total) - for k, vs := range add { - for _, v := range vs { - evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ - ID: ids[idx], - SourceID: template.ID, - TagType: int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), - TagKey: k, - TagValue: v, - CreatedBy: userID, - UpdatedBy: userID, - }) - idx++ + } + add := make(map[string][]string) + for k, vals := range target { + for v := range vals { + if !existing[k][v] { + add[k] = append(add[k], v) } } - if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags); err != nil { - return nil, err + } + if len(add) > 0 { + total := 0 + for _, vs := range add { + total += len(vs) + } + if total > 0 { + ids, err := r.idgen.GenMultiIDs(ctx, total) + if err != nil { + return nil, err + } + idx := 0 + evaluatorTags := make([]*model.EvaluatorTag, 0, total) + for k, vs := range add { + for _, v := range vs { + evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ + ID: ids[idx], + SourceID: template.ID, + TagType: int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), + TagKey: k, + TagValue: v, + LangType: string(lang), + CreatedBy: userID, + UpdatedBy: userID, + }) + idx++ + } + } + if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags); err != nil { + return nil, err + } } } } @@ -304,3 +332,22 @@ func (r *EvaluatorTemplateRepoImpl) GetEvaluatorTemplate(ctx context.Context, id func (r *EvaluatorTemplateRepoImpl) IncrPopularityByID(ctx context.Context, id int64) error { return r.templateDAO.IncrPopularityByID(ctx, id) } + +// setTemplateTags 将查询到的标签填充到模板DO（当前按单语言过滤后回填到对应语言key下） +func (r *EvaluatorTemplateRepoImpl) setTemplateTags(tpl *entity.EvaluatorTemplate, templateID int64, tagsBySourceID map[int64][]*model.EvaluatorTag) { + if tags, exists := tagsBySourceID[templateID]; exists && len(tags) > 0 { + tagMap := make(map[entity.EvaluatorTagKey][]string) + for _, t := range tags { + key := entity.EvaluatorTagKey(t.TagKey) + if tagMap[key] == nil { + tagMap[key] = make([]string, 0) + } + tagMap[key] = append(tagMap[key], t.TagValue) + } + if tpl.Tags == nil { + tpl.Tags = make(map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string) + } + lang := entity.EvaluatorTagLangType(tags[0].LangType) + tpl.Tags[lang] = tagMap + } +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go index 7c0155a4b..3917e4b1b 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go @@ -25,8 +25,8 @@ type MockEvaluatorTagDAO struct { mock.Mock } -func (m *MockEvaluatorTagDAO) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, opts ...db.Option) ([]int64, int64, error) { - args := m.Called(ctx, tagType, filterOption, pageSize, pageNum, opts) +func (m *MockEvaluatorTagDAO) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, langType string, opts ...db.Option) ([]int64, int64, error) { + args := m.Called(ctx, tagType, filterOption, pageSize, pageNum, langType, opts) return args.Get(0).([]int64), args.Get(1).(int64), args.Error(2) } @@ -35,13 +35,13 @@ func (m *MockEvaluatorTagDAO) BatchCreateEvaluatorTags(ctx context.Context, eval return args.Error(0) } -func (m *MockEvaluatorTagDAO) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, tags map[string][]string, opts ...db.Option) error { - args := m.Called(ctx, sourceID, tagType, tags, opts) +func (m *MockEvaluatorTagDAO) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, langType string, tags map[string][]string, opts ...db.Option) error { + args := m.Called(ctx, sourceID, tagType, langType, tags, opts) return args.Error(0) } -func (m *MockEvaluatorTagDAO) BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, opts ...db.Option) ([]*model.EvaluatorTag, error) { - args := m.Called(ctx, sourceIDs, tagType, opts) +func (m *MockEvaluatorTagDAO) BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, langType string, opts ...db.Option) ([]*model.EvaluatorTag, error) { + args := m.Called(ctx, sourceIDs, tagType, langType, opts) return args.Get(0).([]*model.EvaluatorTag), args.Error(1) } @@ -393,7 +393,7 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { } if hasValidFilters { - mockTagDAO.On("GetSourceIDsByFilterConditions", mock.Anything, int32(2), tt.request.FilterOption, int32(0), int32(0), mock.Anything).Return(tt.mockTagIDs, int64(len(tt.mockTagIDs)), tt.mockTagError) + mockTagDAO.On("GetSourceIDsByFilterConditions", mock.Anything, int32(2), tt.request.FilterOption, int32(0), int32(0), mock.Anything, mock.Anything).Return(tt.mockTagIDs, int64(len(tt.mockTagIDs)), tt.mockTagError) } // 设置templateDAO的期望 diff --git a/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go b/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go index 4e8867642..e7a73ac27 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go @@ -20,22 +20,22 @@ import ( func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { tests := []struct { - name string - request *repo.ListBuiltinEvaluatorRequest - mockDaoResult *mysql.ListEvaluatorResponse - mockDaoError error - mockTagResult []*model.EvaluatorTag - mockTagError error - expectedError bool - expectedCount int64 + name string + request *repo.ListBuiltinEvaluatorRequest + mockDaoResult *mysql.ListEvaluatorResponse + mockDaoError error + mockTagResult []*model.EvaluatorTag + mockTagError error + expectedError bool + expectedCount int64 }{ { name: "successful query without filters", request: &repo.ListBuiltinEvaluatorRequest{ SpaceID: 123, - FilterOption: nil, - PageSize: 10, - PageNum: 1, + FilterOption: nil, + PageSize: 10, + PageNum: 1, IncludeDeleted: false, }, mockDaoResult: &mysql.ListEvaluatorResponse{ @@ -58,9 +58,9 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { name: "successful query with tags", request: &repo.ListBuiltinEvaluatorRequest{ SpaceID: 123, - FilterOption: nil, - PageSize: 10, - PageNum: 1, + FilterOption: nil, + PageSize: 10, + PageNum: 1, IncludeDeleted: false, }, mockDaoResult: &mysql.ListEvaluatorResponse{ @@ -93,7 +93,7 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { // 设置evaluatorDao的期望 if tt.mockDaoResult != nil { - mockEvaluatorDao.EXPECT().ListEvaluator(gomock.Any(), gomock.Any()).Return(tt.mockDaoResult, tt.mockDaoError) + mockEvaluatorDao.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Any()).Return(tt.mockDaoResult, tt.mockDaoError) } // 设置tagDAO的期望 - 使用批量查询 @@ -108,6 +108,7 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { gomock.Any(), evaluatorIDs, int32(entity.EvaluatorTagKeyType_Evaluator), + gomock.Any(), ).Return(tt.mockTagResult, tt.mockTagError).AnyTimes() } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go index 220a9ba5a..c76f8c4e5 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go @@ -21,22 +21,23 @@ func ConvertEvaluatorDO2PO(do *evaluatordo.Evaluator) *model.Evaluator { if do == nil { return nil } - // builtin: do.Builtin=true -> 1, false -> 2 - builtinVal := int32(2) - if do.Builtin { - builtinVal = 1 - } - po := &model.Evaluator{ - ID: do.ID, - SpaceID: do.SpaceID, - Name: ptr.Of(do.Name), - Description: ptr.Of(do.Description), - DraftSubmitted: ptr.Of(do.DraftSubmitted), - EvaluatorType: int32(do.EvaluatorType), - LatestVersion: do.LatestVersion, - Builtin: builtinVal, - Benchmark: ptr.Of(do.Benchmark), - Vendor: ptr.Of(do.Vendor), + // builtin: do.Builtin=true -> 1, false -> 2 + builtinVal := int32(2) + if do.Builtin { + builtinVal = 1 + } + po := &model.Evaluator{ + ID: do.ID, + SpaceID: do.SpaceID, + Name: ptr.Of(do.Name), + Description: ptr.Of(do.Description), + DraftSubmitted: ptr.Of(do.DraftSubmitted), + EvaluatorType: int32(do.EvaluatorType), + LatestVersion: do.LatestVersion, + BuiltinVisibleVersion: do.BuiltinVisibleVersion, + Builtin: builtinVal, + Benchmark: ptr.Of(do.Benchmark), + Vendor: ptr.Of(do.Vendor), } if do.BaseInfo != nil { if do.BaseInfo.CreatedBy != nil { @@ -60,17 +61,18 @@ func ConvertEvaluatorPO2DO(po *model.Evaluator) *evaluatordo.Evaluator { if po == nil { return nil } - do := &evaluatordo.Evaluator{ - ID: po.ID, - SpaceID: po.SpaceID, - Name: gptr.Indirect(po.Name), - Description: gptr.Indirect(po.Description), - DraftSubmitted: gptr.Indirect(po.DraftSubmitted), - EvaluatorType: evaluatordo.EvaluatorType(po.EvaluatorType), - LatestVersion: po.LatestVersion, - Builtin: po.Builtin == 1, - Benchmark: gptr.Indirect(po.Benchmark), - Vendor: gptr.Indirect(po.Vendor), + do := &evaluatordo.Evaluator{ + ID: po.ID, + SpaceID: po.SpaceID, + Name: gptr.Indirect(po.Name), + Description: gptr.Indirect(po.Description), + DraftSubmitted: gptr.Indirect(po.DraftSubmitted), + EvaluatorType: evaluatordo.EvaluatorType(po.EvaluatorType), + LatestVersion: po.LatestVersion, + BuiltinVisibleVersion: po.BuiltinVisibleVersion, + Builtin: po.Builtin == 1, + Benchmark: gptr.Indirect(po.Benchmark), + Vendor: gptr.Indirect(po.Vendor), } do.BaseInfo = &evaluatordo.BaseInfo{ CreatedBy: &evaluatordo.UserInfo{ diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go index cd8fd5230..06dda84ad 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go @@ -111,7 +111,7 @@ func ConvertEvaluatorTemplatePO2DO(po *model.EvaluatorTemplate) (*evaluatordo.Ev Popularity: po.Popularity, Benchmark: gptr.Indirect(po.Benchmark), Vendor: gptr.Indirect(po.Vendor), - Tags: make(map[evaluatordo.EvaluatorTagKey][]string), + Tags: make(map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string), } // 反序列化InputSchema diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go index b00228830..cc76c934b 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go @@ -29,6 +29,8 @@ type EvaluatorDAO interface { UpdateEvaluatorDraftSubmitted(ctx context.Context, evaluatorID int64, draftSubmitted bool, userID string, opts ...db.Option) error BatchDeleteEvaluator(ctx context.Context, ids []int64, userID string, opts ...db.Option) error ListEvaluator(ctx context.Context, req *ListEvaluatorRequest, opts ...db.Option) (*ListEvaluatorResponse, error) + // ListBuiltinEvaluator 专用于内置评估器查询，支持 ids、分页与排序（按 name 排序） + ListBuiltinEvaluator(ctx context.Context, req *ListBuiltinEvaluatorRequest, opts ...db.Option) (*ListEvaluatorResponse, error) CheckNameExist(ctx context.Context, spaceID, evaluatorID int64, name string, opts ...db.Option) (bool, error) UpdateEvaluatorLatestVersion(ctx context.Context, evaluatorID int64, version, userID string, opts ...db.Option) error } @@ -131,6 +133,9 @@ func (dao *EvaluatorDAOImpl) UpdateEvaluatorMeta(ctx context.Context, po *model. if po.Builtin != 0 { updateMap["builtin"] = po.Builtin } + if po.BuiltinVisibleVersion != "" { + updateMap["builtin_visible_version"] = po.BuiltinVisibleVersion + } return dbsession.WithContext(ctx).Model(&model.Evaluator{}). Where("id = ?", po.ID). // 添加ID筛选条件 Where("deleted_at IS NULL"). // 添加软删除筛选条件 @@ -195,12 +200,20 @@ type ListEvaluatorRequest struct { SearchName string CreatorIDs []int64 EvaluatorType []int32 - IDs []int64 // 新增：支持按ID查询 PageSize int32 PageNum int32 OrderBy []*OrderBy } +// ListBuiltinEvaluatorRequest 专用于内置评估器查询 +type ListBuiltinEvaluatorRequest struct { + SpaceID int64 + IDs []int64 + PageSize int32 + PageNum int32 + OrderBy []*OrderBy +} + type ListEvaluatorResponse struct { TotalCount int64 Evaluators []*model.Evaluator @@ -212,11 +225,6 @@ func (dao *EvaluatorDAOImpl) ListEvaluator(ctx context.Context, req *ListEvaluat query := dbsession.WithContext(ctx).Model(&model.Evaluator{}).Where("space_id = ?", req.SpaceID) - // 添加ID过滤（支持按ID查询） - if len(req.IDs) > 0 { - query = query.Where("id IN (?)", req.IDs) - } - // 添加名称模糊搜索 if len(req.SearchName) > 0 { query = query.Where("name LIKE ?", "%"+req.SearchName+"%") @@ -268,6 +276,50 @@ func (dao *EvaluatorDAOImpl) ListEvaluator(ctx context.Context, req *ListEvaluat }, nil } +// ListBuiltinEvaluator 查询内置评估器，支持 ids、分页与排序（按 name 排序） +func (dao *EvaluatorDAOImpl) ListBuiltinEvaluator(ctx context.Context, req *ListBuiltinEvaluatorRequest, opts ...db.Option) (*ListEvaluatorResponse, error) { + // 启用 GORM 调试日志，输出 SQL 以便排查 + dbsession := dao.provider.NewSession(ctx, opts...).Debug() + query := dbsession.WithContext(ctx).Model(&model.Evaluator{}). + Where("builtin = ?", 1). + Where("builtin_visible_version != ?", ""). + Where("deleted_at IS NULL") + + if len(req.IDs) > 0 { + query = query.Where("id IN (?)", req.IDs) + } + + // 排序：如果未指定则默认按 name 升序；若指定则仅遵循支持字段 + if len(req.OrderBy) > 0 { + for _, orderBy := range req.OrderBy { + if getOrderBy(orderBy) != "" { + query = query.Order(getOrderBy(orderBy)) + } + } + } else { + query = query.Order("name asc") + } + + // 先查总数 + var total int64 + countQuery := query.Session(&gorm.Session{}) + if err := countQuery.Count(&total).Error; err != nil { + return nil, err + } + + // 分页 + if req.PageSize != 0 && req.PageNum != 0 { + offset := (req.PageNum - 1) * req.PageSize + query = query.Limit(int(req.PageSize)).Offset(int(offset)) + } + + poList := make([]*model.Evaluator, 0) + if err := query.Find(&poList).Error; err != nil { + return nil, err + } + return &ListEvaluatorResponse{Evaluators: poList, TotalCount: total}, nil +} + func (dao *EvaluatorDAOImpl) UpdateEvaluatorLatestVersion(ctx context.Context, evaluatorID int64, version, userID string, opts ...db.Option) error { // 通过opts获取当前的db session实例 dbsession := dao.provider.NewSession(ctx, opts...) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index af327275b..11b452c4e 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -22,13 +22,13 @@ import ( //go:generate mockgen -destination mocks/evaluator_tag_mock.go -package=mocks . EvaluatorTagDAO type EvaluatorTagDAO interface { // BatchGetTagsBySourceIDsAndType 批量根据source_ids和tag_type筛选tag_key和tag_value - BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, opts ...db.Option) ([]*model.EvaluatorTag, error) + BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, langType string, opts ...db.Option) ([]*model.EvaluatorTag, error) // GetSourceIDsByFilterConditions 根据筛选条件查询source_id列表，支持复杂的AND/OR逻辑和分页 - GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, opts ...db.Option) ([]int64, int64, error) + GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, langType string, opts ...db.Option) ([]int64, int64, error) // BatchCreateEvaluatorTags 批量创建评估器标签 BatchCreateEvaluatorTags(ctx context.Context, evaluatorTags []*model.EvaluatorTag, opts ...db.Option) error // DeleteEvaluatorTagsByConditions 根据sourceID、tagType、tags条件删除标签 - DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, tags map[string][]string, opts ...db.Option) error + DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, langType string, tags map[string][]string, opts ...db.Option) error } var ( @@ -51,7 +51,7 @@ func NewEvaluatorTagDAO(p db.Provider) EvaluatorTagDAO { } // BatchGetTagsBySourceIDsAndType 批量根据source_ids和tag_type筛选tag_key和tag_value -func (dao *EvaluatorTagDAOImpl) BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, opts ...db.Option) ([]*model.EvaluatorTag, error) { +func (dao *EvaluatorTagDAOImpl) BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, langType string, opts ...db.Option) ([]*model.EvaluatorTag, error) { if len(sourceIDs) == 0 { return []*model.EvaluatorTag{}, nil } @@ -59,8 +59,12 @@ func (dao *EvaluatorTagDAOImpl) BatchGetTagsBySourceIDsAndType(ctx context.Conte dbsession := dao.provider.NewSession(ctx, opts...) var tags []*model.EvaluatorTag - err := dbsession.WithContext(ctx). - Where("source_id IN (?) AND tag_type = ?", sourceIDs, tagType). + query := dbsession.WithContext(ctx). + Where("source_id IN (?) AND tag_type = ?", sourceIDs, tagType) + if langType != "" { + query = query.Where("lang_type = ?", langType) + } + err := query. Find(&tags).Error if err != nil { return nil, err @@ -80,12 +84,15 @@ func (dao *EvaluatorTagDAOImpl) BatchCreateEvaluatorTags(ctx context.Context, ev } // DeleteEvaluatorTagsByConditions 根据sourceID、tagType、tags条件删除标签 -func (dao *EvaluatorTagDAOImpl) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, tags map[string][]string, opts ...db.Option) error { +func (dao *EvaluatorTagDAOImpl) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, langType string, tags map[string][]string, opts ...db.Option) error { dbsession := dao.provider.NewSession(ctx, opts...) // 基础查询条件 query := dbsession.WithContext(ctx). Where("source_id = ? AND tag_type = ?", sourceID, tagType) + if langType != "" { + query = query.Where("lang_type = ?", langType) + } // 如果有指定tags条件，则添加额外的删除条件 if len(tags) > 0 { @@ -113,7 +120,7 @@ func (dao *EvaluatorTagDAOImpl) DeleteEvaluatorTagsByConditions(ctx context.Cont } // GetSourceIDsByFilterConditions 根据筛选条件查询source_id列表，支持复杂的AND/OR逻辑和分页 -func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, opts ...db.Option) ([]int64, int64, error) { +func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, langType string, opts ...db.Option) ([]int64, int64, error) { if filterOption == nil { return []int64{}, 0, nil } @@ -124,6 +131,9 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte query := dbsession.WithContext(ctx).Table("evaluator_tag"). Select("source_id"). Where("tag_type = ?", tagType) + if langType != "" { + query = query.Where("lang_type = ?", langType) + } // 处理搜索关键词 if filterOption.SearchKeyword != nil && *filterOption.SearchKeyword != "" { diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go index 82e52ce8b..dcbc4d282 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go @@ -41,18 +41,18 @@ func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { description string }{ { - name: "nil filter option", - tagType: 1, + name: "nil filter option", + tagType: 1, filterOption: nil, - expectedErr: false, - description: "当筛选选项为nil时，应该返回空列表", + expectedErr: false, + description: "当筛选选项为nil时，应该返回空列表", }, { - name: "empty filter option", - tagType: 1, + name: "empty filter option", + tagType: 1, filterOption: &entity.EvaluatorFilterOption{}, - expectedErr: false, - description: "当筛选选项为空时，应该返回空列表", + expectedErr: false, + description: "当筛选选项为空时，应该返回空列表", }, { name: "search keyword only", @@ -247,7 +247,8 @@ func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { // 执行测试 ctx := context.Background() - result, err := dao.GetSourceIDsByFilterConditions(ctx, tt.tagType, tt.filterOption) + result, total, err := dao.GetSourceIDsByFilterConditions(ctx, tt.tagType, tt.filterOption, 0, 0, "") + _ = total // 验证结果 if tt.expectedErr { @@ -273,11 +274,11 @@ func TestBuildSingleCondition(t *testing.T) { dao := &EvaluatorTagDAOImpl{} tests := []struct { - name string - condition *entity.EvaluatorFilterCondition - expectedSQL string + name string + condition *entity.EvaluatorFilterCondition + expectedSQL string expectedArgs []interface{} - expectedErr bool + expectedErr bool }{ { name: "equal condition", @@ -286,9 +287,9 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_Equal, "LLM", ), - expectedSQL: "tag_key = ? AND tag_value = ?", + expectedSQL: "tag_key = ? AND tag_value = ?", expectedArgs: []interface{}{"Category", "LLM"}, - expectedErr: false, + expectedErr: false, }, { name: "not equal condition", @@ -297,9 +298,9 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_NotEqual, "Code", ), - expectedSQL: "tag_key = ? AND tag_value != ?", + expectedSQL: "tag_key = ? AND tag_value != ?", expectedArgs: []interface{}{"Category", "Code"}, - expectedErr: false, + expectedErr: false, }, { name: "in condition", @@ -308,9 +309,9 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_In, "Text,Image,Video", ), - expectedSQL: "tag_key = ? AND tag_value IN (?,?,?)", + expectedSQL: "tag_key = ? AND tag_value IN (?,?,?)", expectedArgs: []interface{}{"TargetType", "Text", "Image", "Video"}, - expectedErr: false, + expectedErr: false, }, { name: "like condition", @@ -319,9 +320,9 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_Like, "Quality", ), - expectedSQL: "tag_key = ? AND tag_value LIKE ?", + expectedSQL: "tag_key = ? AND tag_value LIKE ?", expectedArgs: []interface{}{"Name", "%Quality%"}, - expectedErr: false, + expectedErr: false, }, { name: "is null condition", @@ -330,9 +331,9 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_IsNull, "", ), - expectedSQL: "tag_key = ? AND tag_value IS NULL", + expectedSQL: "tag_key = ? AND tag_value IS NULL", expectedArgs: []interface{}{"Objective"}, - expectedErr: false, + expectedErr: false, }, { name: "is not null condition", @@ -341,9 +342,9 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_IsNotNull, "", ), - expectedSQL: "tag_key = ? AND tag_value IS NOT NULL", + expectedSQL: "tag_key = ? AND tag_value IS NOT NULL", expectedArgs: []interface{}{"Objective"}, - expectedErr: false, + expectedErr: false, }, { name: "empty in condition", @@ -352,9 +353,9 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_In, "", ), - expectedSQL: "tag_key = ? AND tag_value IN (?)", + expectedSQL: "tag_key = ? AND tag_value IN (?)", expectedArgs: []interface{}{"TargetType", ""}, - expectedErr: false, + expectedErr: false, }, } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_version.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_version.go index 84a9016c3..1aecd7af1 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_version.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_version.go @@ -6,6 +6,7 @@ package mysql import ( "context" "errors" + "strings" "sync" "time" @@ -31,6 +32,8 @@ type EvaluatorVersionDAO interface { BatchGetEvaluatorDraftByEvaluatorID(ctx context.Context, evaluatorIDs []int64, includeDeleted bool, opts ...db.Option) ([]*model.EvaluatorVersion, error) BatchGetEvaluatorVersionsByEvaluatorIDs(ctx context.Context, evaluatorIDs []int64, includeDeleted bool, opts ...db.Option) ([]*model.EvaluatorVersion, error) CheckVersionExist(ctx context.Context, evaluatorID int64, version string, opts ...db.Option) (bool, error) + // BatchGetEvaluatorVersionsByEvaluatorIDAndVersions 批量根据 (evaluator_id, version) 查询版本 + BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx context.Context, pairs [][2]interface{}, opts ...db.Option) ([]*model.EvaluatorVersion, error) } // ListEvaluatorVersionRequest 定义查询 EvaluatorVersion 的请求结构体 @@ -77,7 +80,8 @@ func NewEvaluatorVersionDAO(p db.Provider) EvaluatorVersionDAO { var SupportedOrderBys = map[string]string{ "updated_at": "updated_at", "created_at": "created_at", - "heat": "heat", + "priority": "priority", + "name": "name", } var ( @@ -98,6 +102,34 @@ func getOrderBy(orderBy *OrderBy) string { return "" } +// GetEvaluatorVersionByEvaluatorIDAndVersion 根据评估器ID与版本号查询版本 +// (单个查询方法已移除，统一使用批量接口) + +// BatchGetEvaluatorVersionsByEvaluatorIDAndVersions 批量根据 (evaluator_id, version) 查询版本 +func (dao *EvaluatorVersionDAOImpl) BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx context.Context, pairs [][2]interface{}, opts ...db.Option) ([]*model.EvaluatorVersion, error) { + if len(pairs) == 0 { + return []*model.EvaluatorVersion{}, nil + } + dbsession := dao.provider.NewSession(ctx, opts...) + query := dbsession.WithContext(ctx).Model(&model.EvaluatorVersion{}) + // 构建 OR 条件 (evaluator_id=? AND version=?) OR ... + var conds []string + var args []interface{} + for _, p := range pairs { + conds = append(conds, "(evaluator_id = ? AND version = ?)") + args = append(args, p[0], p[1]) + } + where := "(" + strings.Join(conds, " OR ") + ") AND deleted_at IS NULL" + var list []*model.EvaluatorVersion + if err := query.Where(where, args...).Find(&list).Error; err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return []*model.EvaluatorVersion{}, nil + } + return nil, err + } + return list, nil +} + // CreateEvaluatorVersion 创建 EvaluatorVersion 记录 func (dao *EvaluatorVersionDAOImpl) CreateEvaluatorVersion(ctx context.Context, version *model.EvaluatorVersion, opts ...db.Option) error { // 通过opts获取当前的db session实例 diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go index 6ef559bd1..9adee5164 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go @@ -14,21 +14,22 @@ const TableNameEvaluator = "evaluator" // Evaluator NDB_SHARE_TABLE;评估器信息 type Evaluator struct { - ID int64 `gorm:"column:id;type:bigint(20) unsigned;primaryKey;comment:idgen id" json:"id"` // idgen id - SpaceID int64 `gorm:"column:space_id;type:bigint(20) unsigned;not null;index:idx_space_id_evaluator_type,priority:1;index:idx_space_id_created_by,priority:1;index:idx_space_id_created_at,priority:1;index:idx_space_id_updated_at,priority:1;index:idx_space_id_name,priority:1;comment:空间id" json:"space_id"` // 空间id - EvaluatorType int32 `gorm:"column:evaluator_type;type:int(11) unsigned;not null;index:idx_space_id_evaluator_type,priority:2;comment:评估器类型" json:"evaluator_type"` // 评估器类型 - Name *string `gorm:"column:name;type:varchar(255);index:idx_space_id_name,priority:2;comment:名称" json:"name"` // 名称 - Description *string `gorm:"column:description;type:varchar(500);comment:描述" json:"description"` // 描述 - DraftSubmitted *bool `gorm:"column:draft_submitted;type:tinyint(1);comment:草稿是否已提交" json:"draft_submitted"` // 草稿是否已提交 - CreatedBy string `gorm:"column:created_by;type:varchar(128);not null;index:idx_space_id_created_by,priority:2;default:0;comment:创建人" json:"created_by"` // 创建人 - UpdatedBy string `gorm:"column:updated_by;type:varchar(128);not null;default:0;comment:更新人" json:"updated_by"` // 更新人 - CreatedAt time.Time `gorm:"column:created_at;type:timestamp;not null;index:idx_space_id_created_at,priority:2;default:CURRENT_TIMESTAMP;comment:创建时间" json:"created_at"` // 创建时间 - UpdatedAt time.Time `gorm:"column:updated_at;type:timestamp;not null;index:idx_space_id_updated_at,priority:2;default:CURRENT_TIMESTAMP;comment:更新时间" json:"updated_at"` // 更新时间 - DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"` // 删除时间 - LatestVersion string `gorm:"column:latest_version;type:varchar(128);not null;comment:最新版本号" json:"latest_version"` // 最新版本号 - Benchmark *string `gorm:"column:benchmark;type:varchar(255);comment:benchmark" json:"benchmark"` // benchmark - Vendor *string `gorm:"column:vendor;type:varchar(255);comment:vendor" json:"vendor"` // vendor - Builtin int32 `gorm:"column:builtin;type:int(11) unsigned;not null;default:2;comment:是否预置，1:是；2:否" json:"builtin"` // 是否预置，1:是；2:否 + ID int64 `gorm:"column:id;type:bigint(20) unsigned;primaryKey;comment:idgen id" json:"id"` // idgen id + SpaceID int64 `gorm:"column:space_id;type:bigint(20) unsigned;not null;index:idx_space_id_evaluator_type,priority:1;index:idx_space_id_created_by,priority:1;index:idx_space_id_created_at,priority:1;index:idx_space_id_updated_at,priority:1;index:idx_space_id_name,priority:1;comment:空间id" json:"space_id"` // 空间id + EvaluatorType int32 `gorm:"column:evaluator_type;type:int(11) unsigned;not null;index:idx_space_id_evaluator_type,priority:2;comment:评估器类型" json:"evaluator_type"` // 评估器类型 + Name *string `gorm:"column:name;type:varchar(255);index:idx_space_id_name,priority:2;comment:名称" json:"name"` // 名称 + Description *string `gorm:"column:description;type:varchar(500);comment:描述" json:"description"` // 描述 + DraftSubmitted *bool `gorm:"column:draft_submitted;type:tinyint(1);comment:草稿是否已提交" json:"draft_submitted"` // 草稿是否已提交 + CreatedBy string `gorm:"column:created_by;type:varchar(128);not null;index:idx_space_id_created_by,priority:2;default:0;comment:创建人" json:"created_by"` // 创建人 + UpdatedBy string `gorm:"column:updated_by;type:varchar(128);not null;default:0;comment:更新人" json:"updated_by"` // 更新人 + CreatedAt time.Time `gorm:"column:created_at;type:timestamp;not null;index:idx_space_id_created_at,priority:2;default:CURRENT_TIMESTAMP;comment:创建时间" json:"created_at"` // 创建时间 + UpdatedAt time.Time `gorm:"column:updated_at;type:timestamp;not null;index:idx_space_id_updated_at,priority:2;default:CURRENT_TIMESTAMP;comment:更新时间" json:"updated_at"` // 更新时间 + DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"` // 删除时间 + LatestVersion string `gorm:"column:latest_version;type:varchar(128);not null;comment:最新版本号" json:"latest_version"` // 最新版本号 + Benchmark *string `gorm:"column:benchmark;type:varchar(255);comment:benchmark" json:"benchmark"` // benchmark + Vendor *string `gorm:"column:vendor;type:varchar(255);comment:vendor" json:"vendor"` // vendor + Builtin int32 `gorm:"column:builtin;type:int(11) unsigned;not null;default:2;comment:是否预置，1:是；2:否" json:"builtin"` // 是否预置，1:是；2:否 + BuiltinVisibleVersion string `gorm:"column:builtin_visible_version;type:varchar(128) character set utf8mb4;not null;comment:预置评估器最新可见版本号" json:"builtin_visible_version"` // 预置评估器最新可见版本号 } // TableName Evaluator's table name diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_tag.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_tag.gen.go index cf6462c7d..1331d997f 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_tag.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_tag.gen.go @@ -19,6 +19,7 @@ type EvaluatorTag struct { TagType int32 `gorm:"column:tag_type;type:int(11) unsigned;not null;index:idx_tag_type_tag_key_tag_value,priority:1;comment:tag类型，1:评估器；2:模板" json:"tag_type"` // tag类型，1:评估器；2:模板 TagKey string `gorm:"column:tag_key;type:varchar(128) character set utf8mb4;not null;index:idx_tag_type_tag_key_tag_value,priority:2;default:0;comment:tag键" json:"tag_key"` // tag键 TagValue string `gorm:"column:tag_value;type:varchar(128) character set utf8mb4;not null;index:idx_tag_type_tag_key_tag_value,priority:3;default:0;comment:tag值" json:"tag_value"` // tag值 + LangType string `gorm:"column:lang_type;type:varchar(128) character set utf8mb4;not null;default:zh;comment:语言类型" json:"lang_type"` // 语言类型 CreatedBy string `gorm:"column:created_by;type:varchar(128) character set utf8mb4;not null;default:0;comment:创建人" json:"created_by"` // 创建人 UpdatedBy string `gorm:"column:updated_by;type:varchar(128) character set utf8mb4;not null;default:0;comment:更新人" json:"updated_by"` // 更新人 CreatedAt time.Time `gorm:"column:created_at;type:timestamp;not null;default:CURRENT_TIMESTAMP;comment:创建时间" json:"created_at"` // 创建时间 diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go index 1dc3dbb2e..98cd91c63 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go @@ -42,6 +42,7 @@ func newEvaluator(db *gorm.DB, opts ...gen.DOOption) evaluator { _evaluator.Benchmark = field.NewString(tableName, "benchmark") _evaluator.Vendor = field.NewString(tableName, "vendor") _evaluator.Builtin = field.NewInt32(tableName, "builtin") + _evaluator.BuiltinVisibleVersion = field.NewString(tableName, "builtin_visible_version") _evaluator.fillFieldMap() @@ -52,22 +53,23 @@ func newEvaluator(db *gorm.DB, opts ...gen.DOOption) evaluator { type evaluator struct { evaluatorDo evaluatorDo - ALL field.Asterisk - ID field.Int64 // idgen id - SpaceID field.Int64 // 空间id - EvaluatorType field.Int32 // 评估器类型 - Name field.String // 名称 - Description field.String // 描述 - DraftSubmitted field.Bool // 草稿是否已提交 - CreatedBy field.String // 创建人 - UpdatedBy field.String // 更新人 - CreatedAt field.Time // 创建时间 - UpdatedAt field.Time // 更新时间 - DeletedAt field.Field // 删除时间 - LatestVersion field.String // 最新版本号 - Benchmark field.String // benchmark - Vendor field.String // vendor - Builtin field.Int32 // 是否预置，1:是；2:否 + ALL field.Asterisk + ID field.Int64 // idgen id + SpaceID field.Int64 // 空间id + EvaluatorType field.Int32 // 评估器类型 + Name field.String // 名称 + Description field.String // 描述 + DraftSubmitted field.Bool // 草稿是否已提交 + CreatedBy field.String // 创建人 + UpdatedBy field.String // 更新人 + CreatedAt field.Time // 创建时间 + UpdatedAt field.Time // 更新时间 + DeletedAt field.Field // 删除时间 + LatestVersion field.String // 最新版本号 + Benchmark field.String // benchmark + Vendor field.String // vendor + Builtin field.Int32 // 是否预置，1:是；2:否 + BuiltinVisibleVersion field.String // 预置评估器最新可见版本号 fieldMap map[string]field.Expr } @@ -99,6 +101,7 @@ func (e *evaluator) updateTableName(table string) *evaluator { e.Benchmark = field.NewString(table, "benchmark") e.Vendor = field.NewString(table, "vendor") e.Builtin = field.NewInt32(table, "builtin") + e.BuiltinVisibleVersion = field.NewString(table, "builtin_visible_version") e.fillFieldMap() @@ -125,7 +128,7 @@ func (e *evaluator) GetFieldByName(fieldName string) (field.OrderExpr, bool) { } func (e *evaluator) fillFieldMap() { - e.fieldMap = make(map[string]field.Expr, 15) + e.fieldMap = make(map[string]field.Expr, 16) e.fieldMap["id"] = e.ID e.fieldMap["space_id"] = e.SpaceID e.fieldMap["evaluator_type"] = e.EvaluatorType @@ -141,6 +144,7 @@ func (e *evaluator) fillFieldMap() { e.fieldMap["benchmark"] = e.Benchmark e.fieldMap["vendor"] = e.Vendor e.fieldMap["builtin"] = e.Builtin + e.fieldMap["builtin_visible_version"] = e.BuiltinVisibleVersion } func (e evaluator) clone(db *gorm.DB) evaluator { diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_tag.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_tag.gen.go index 9045f3b7b..fdf1afe55 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_tag.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_tag.gen.go @@ -32,6 +32,7 @@ func newEvaluatorTag(db *gorm.DB, opts ...gen.DOOption) evaluatorTag { _evaluatorTag.TagType = field.NewInt32(tableName, "tag_type") _evaluatorTag.TagKey = field.NewString(tableName, "tag_key") _evaluatorTag.TagValue = field.NewString(tableName, "tag_value") + _evaluatorTag.LangType = field.NewString(tableName, "lang_type") _evaluatorTag.CreatedBy = field.NewString(tableName, "created_by") _evaluatorTag.UpdatedBy = field.NewString(tableName, "updated_by") _evaluatorTag.CreatedAt = field.NewTime(tableName, "created_at") @@ -53,6 +54,7 @@ type evaluatorTag struct { TagType field.Int32 // tag类型，1:评估器；2:模板 TagKey field.String // tag键 TagValue field.String // tag值 + LangType field.String // 语言类型 CreatedBy field.String // 创建人 UpdatedBy field.String // 更新人 CreatedAt field.Time // 创建时间 @@ -79,6 +81,7 @@ func (e *evaluatorTag) updateTableName(table string) *evaluatorTag { e.TagType = field.NewInt32(table, "tag_type") e.TagKey = field.NewString(table, "tag_key") e.TagValue = field.NewString(table, "tag_value") + e.LangType = field.NewString(table, "lang_type") e.CreatedBy = field.NewString(table, "created_by") e.UpdatedBy = field.NewString(table, "updated_by") e.CreatedAt = field.NewTime(table, "created_at") @@ -112,12 +115,13 @@ func (e *evaluatorTag) GetFieldByName(fieldName string) (field.OrderExpr, bool) } func (e *evaluatorTag) fillFieldMap() { - e.fieldMap = make(map[string]field.Expr, 10) + e.fieldMap = make(map[string]field.Expr, 11) e.fieldMap["id"] = e.ID e.fieldMap["source_id"] = e.SourceID e.fieldMap["tag_type"] = e.TagType e.fieldMap["tag_key"] = e.TagKey e.fieldMap["tag_value"] = e.TagValue + e.fieldMap["lang_type"] = e.LangType e.fieldMap["created_by"] = e.CreatedBy e.fieldMap["updated_by"] = e.UpdatedBy e.fieldMap["created_at"] = e.CreatedAt diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go index 50db0136d..e194d1732 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go @@ -161,6 +161,26 @@ func (mr *MockEvaluatorDAOMockRecorder) ListEvaluator(ctx, req any, opts ...any) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluator", reflect.TypeOf((*MockEvaluatorDAO)(nil).ListEvaluator), varargs...) } +// ListBuiltinEvaluator mocks base method. +func (m *MockEvaluatorDAO) ListBuiltinEvaluator(ctx context.Context, req *mysql.ListBuiltinEvaluatorRequest, opts ...db.Option) (*mysql.ListEvaluatorResponse, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, req} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "ListBuiltinEvaluator", varargs...) + ret0, _ := ret[0].(*mysql.ListEvaluatorResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// ListBuiltinEvaluator indicates an expected call of ListBuiltinEvaluator. +func (mr *MockEvaluatorDAOMockRecorder) ListBuiltinEvaluator(ctx, req any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, req}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBuiltinEvaluator", reflect.TypeOf((*MockEvaluatorDAO)(nil).ListBuiltinEvaluator), varargs...) +} + // UpdateEvaluatorDraftSubmitted mocks base method. func (m *MockEvaluatorDAO) UpdateEvaluatorDraftSubmitted(ctx context.Context, evaluatorID int64, draftSubmitted bool, userID string, opts ...db.Option) error { m.ctrl.T.Helper() diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go index 931f29484..e9c306b59 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_tag_mock.go @@ -63,9 +63,9 @@ func (mr *MockEvaluatorTagDAOMockRecorder) BatchCreateEvaluatorTags(ctx, evaluat } // BatchGetTagsBySourceIDsAndType mocks base method. -func (m *MockEvaluatorTagDAO) BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, opts ...db.Option) ([]*model.EvaluatorTag, error) { +func (m *MockEvaluatorTagDAO) BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, langType string, opts ...db.Option) ([]*model.EvaluatorTag, error) { m.ctrl.T.Helper() - varargs := []any{ctx, sourceIDs, tagType} + varargs := []any{ctx, sourceIDs, tagType, langType} for _, a := range opts { varargs = append(varargs, a) } @@ -76,16 +76,16 @@ func (m *MockEvaluatorTagDAO) BatchGetTagsBySourceIDsAndType(ctx context.Context } // BatchGetTagsBySourceIDsAndType indicates an expected call of BatchGetTagsBySourceIDsAndType. -func (mr *MockEvaluatorTagDAOMockRecorder) BatchGetTagsBySourceIDsAndType(ctx, sourceIDs, tagType any, opts ...any) *gomock.Call { +func (mr *MockEvaluatorTagDAOMockRecorder) BatchGetTagsBySourceIDsAndType(ctx, sourceIDs, tagType, langType any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{ctx, sourceIDs, tagType}, opts...) + varargs := append([]any{ctx, sourceIDs, tagType, langType}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetTagsBySourceIDsAndType", reflect.TypeOf((*MockEvaluatorTagDAO)(nil).BatchGetTagsBySourceIDsAndType), varargs...) } // DeleteEvaluatorTagsByConditions mocks base method. -func (m *MockEvaluatorTagDAO) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, tags map[string][]string, opts ...db.Option) error { +func (m *MockEvaluatorTagDAO) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, langType string, tags map[string][]string, opts ...db.Option) error { m.ctrl.T.Helper() - varargs := []any{ctx, sourceID, tagType, tags} + varargs := []any{ctx, sourceID, tagType, langType, tags} for _, a := range opts { varargs = append(varargs, a) } @@ -95,16 +95,16 @@ func (m *MockEvaluatorTagDAO) DeleteEvaluatorTagsByConditions(ctx context.Contex } // DeleteEvaluatorTagsByConditions indicates an expected call of DeleteEvaluatorTagsByConditions. -func (mr *MockEvaluatorTagDAOMockRecorder) DeleteEvaluatorTagsByConditions(ctx, sourceID, tagType, tags any, opts ...any) *gomock.Call { +func (mr *MockEvaluatorTagDAOMockRecorder) DeleteEvaluatorTagsByConditions(ctx, sourceID, tagType, langType, tags any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{ctx, sourceID, tagType, tags}, opts...) + varargs := append([]any{ctx, sourceID, tagType, langType, tags}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteEvaluatorTagsByConditions", reflect.TypeOf((*MockEvaluatorTagDAO)(nil).DeleteEvaluatorTagsByConditions), varargs...) } // GetSourceIDsByFilterConditions mocks base method. -func (m *MockEvaluatorTagDAO) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, opts ...db.Option) ([]int64, int64, error) { +func (m *MockEvaluatorTagDAO) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, langType string, opts ...db.Option) ([]int64, int64, error) { m.ctrl.T.Helper() - varargs := []any{ctx, tagType, filterOption, pageSize, pageNum} + varargs := []any{ctx, tagType, filterOption, pageSize, pageNum, langType} for _, a := range opts { varargs = append(varargs, a) } @@ -116,8 +116,8 @@ func (m *MockEvaluatorTagDAO) GetSourceIDsByFilterConditions(ctx context.Context } // GetSourceIDsByFilterConditions indicates an expected call of GetSourceIDsByFilterConditions. -func (mr *MockEvaluatorTagDAOMockRecorder) GetSourceIDsByFilterConditions(ctx, tagType, filterOption, pageSize, pageNum any, opts ...any) *gomock.Call { +func (mr *MockEvaluatorTagDAOMockRecorder) GetSourceIDsByFilterConditions(ctx, tagType, filterOption, pageSize, pageNum, langType any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{ctx, tagType, filterOption, pageSize, pageNum}, opts...) + varargs := append([]any{ctx, tagType, filterOption, pageSize, pageNum, langType}, opts...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSourceIDsByFilterConditions", reflect.TypeOf((*MockEvaluatorTagDAO)(nil).GetSourceIDsByFilterConditions), varargs...) } diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift index 599ee886c..bf6ba993f 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift @@ -93,6 +93,7 @@ struct UpdateEvaluatorRequest { 11: optional bool builtin (api.body='builtin', go.tag = 'json:"builtin"') // 是否预置评估器 12: optional string benchmark (api.body='benchmark', go.tag = 'json:"benchmark"') 13: optional string vendor (api.body='vendor', go.tag = 'json:"vendor"') + 14: optional string builtin_visible_version (api.body='builtin_visible_version', go.tag = 'json:"builtin_visible_version"') 255: optional base.Base Base } @@ -363,11 +364,19 @@ struct ValidateEvaluatorResponse { struct ListTemplatesV2Request { 1: optional evaluator.EvaluatorFilterOption filter_option (api.body='filter_option', go.tag='json:"filter_option"') // 筛选器选项 + + 101: optional i32 page_size (api.body='page_size', vt.gt='0') + 102: optional i32 page_number (api.body='page_number', vt.gt='0') + 103: optional list order_bys (api.body='order_bys') + + 255: optional base.Base Base } struct ListTemplatesV2Response { 1: optional list evaluator_templates (api.body='evaluator_templates') + 10: optional i64 total (api.body='total', api.js_conv='true', go.tag='json:"total"') + 255: base.BaseResp BaseResp } @@ -412,9 +421,8 @@ struct DebugBuiltinEvaluatorResponse { struct UpdateBuiltinEvaluatorTagsRequest { 1: required i64 evaluator_id (api.path='evaluator_id', api.js_conv='true', go.tag='json:"evaluator_id"') - 2: required string version (api.body='version') - 3: optional i64 workspace_id (api.body='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') - 4: optional map> tags (api.body='tags', go.tag = 'json:"tags"') // 评估器标签 + 2: optional i64 workspace_id (api.body='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') + 3: optional map>> tags (api.body='tags', go.tag = 'json:"tags"') // 评估器标签 255: optional base.Base Base } diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index 4658c73a6..99a283286 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -35,6 +35,10 @@ enum EvaluatorRunStatus { // 运行状态, 异步下状态流转, 同步下只 Fail = 2 } +typedef string EvaluatorTagLangType(ts.enum="true") +const EvaluatorTagLangType EvaluatorTagLangType_Zh = "zh-CN" +const EvaluatorTagLangType EvaluatorTagLangType_En = "en-US" + // Evaluator筛选字段 typedef string EvaluatorTagKey(ts.enum="true") const EvaluatorTagKey EvaluatorTagKey_Category = "Category" // 类型筛选 (LLM/Code) @@ -43,7 +47,6 @@ const EvaluatorTagKey EvaluatorTagKey_Objective = "Objective" // 评估目 const EvaluatorTagKey EvaluatorTagKey_BusinessScenario = "BusinessScenario" // 业务场景 (安全风控/AI Coding等) const EvaluatorTagKey EvaluatorTagKey_BoxType = "BoxType" // 黑白盒类型 const EvaluatorTagKey EvaluatorTagKey_Name = "Name" // 评估器名称 -const EvaluatorTagKey EvaluatorTagKey_Visible = "Visible" // 可见性 struct Tool { 1: ToolType type (go.tag ='mapstructure:"type"') @@ -104,7 +107,9 @@ struct Evaluator { 20: optional bool builtin (go.tag = 'json:"builtin"') 21: optional string benchmark (go.tag = 'json:"benchmark"') 22: optional string vendor (go.tag = 'json:"vendor"') - 23: map> tags (go.tag = 'json:"tags"') + 23: optional string builtin_visible_version (go.tag = 'json:"builtin_visible_version"') + + 100: optional map>> tags (go.tag = 'json:"tags"') } struct EvaluatorTemplate { @@ -116,7 +121,7 @@ struct EvaluatorTemplate { 6: optional i64 popularity (go.tag = 'json:"popularity"') // 热度 7: optional string benchmark (go.tag = 'json:"benchmark"') 8: optional string vendor (go.tag = 'json:"vendor"') - 9: map> tags (go.tag = 'json:"tags"') + 9: optional map>> tags (go.tag = 'json:"tags"') 101: optional EvaluatorContent evaluator_content 255: optional common.BaseInfo base_info diff --git a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql index 72ab1d81f..b2b59da7b 100644 --- a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql +++ b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql @@ -15,6 +15,7 @@ CREATE TABLE IF NOT EXISTS `evaluator` `benchmark` varchar(255) DEFAULT NULL COMMENT 'benchmark', `vendor` varchar(255) DEFAULT NULL COMMENT 'vendor', `builtin` int unsigned NOT NULL DEFAULT '2' COMMENT '是否预置，1:是；2:否', + `builtin_visible_version` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '预置评估器最新可见版本号', PRIMARY KEY (`id`), KEY `idx_space_id_evaluator_type` (`space_id`, `evaluator_type`), KEY `idx_space_id_created_by` (`space_id`, `created_by`), diff --git a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_tag.sql b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_tag.sql index 17d8db067..3890012ae 100644 --- a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_tag.sql +++ b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_tag.sql @@ -4,6 +4,7 @@ CREATE TABLE `evaluator_tag` ( `tag_type` int unsigned NOT NULL COMMENT 'tag类型，1:评估器；2:模板', `tag_key` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT 'tag键', `tag_value` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT 'tag值', + `lang_type` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'zh' COMMENT '语言类型', `created_by` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '创建人', `updated_by` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '更新人', `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', From 6f6f9d5be08a470bc47153fb5767a376572765ba Mon Sep 17 00:00:00 2001 From: Jiayun Shen Date: Fri, 31 Oct 2025 11:09:08 +0800 Subject: [PATCH 06/42] Feat/sjy/evaluator ecosystem (#270) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: [Coda] merge evaluation updates (LogID: 20251025175940010091110134712B07F) Co-Authored-By: Coda * feat: add InvokeEvaluator SPI thrift and run code gen * feat: implement CustomRPCEvaluatorVersion DO entity * feat: minor update spi field name * 优化路由 * 优化名称 * 优化tag * feat: minor updates after merging * feat: add CustomRPCEvaluator DTO to EvaluatorContent DTO * 优化接口 * feat: add more custom evaluator error code * 增加日志 * 优化接口 * 优化list builtin接口 * fix repo * fix update meta * fix create Template * feat: add CustomRPC to ConvertEvaluatorDTO2DO * fix list Template * feat: add CustomRPC support to evaluator CRUDs * 增加tag多语言 * feat: minor improvements ValidateInput errorx --------- Co-authored-by: tpfz Co-authored-by: Coda --- backend/go.mod | 2 +- backend/go.sum | 1 - .../evaluation/domain/evaluator/evaluator.go | 575 ++- .../domain/evaluator/evaluator_validator.go | 8 + .../domain/evaluator/k-evaluator.go | 394 ++ .../loop/evaluation/evalspiservice/client.go | 6 + .../evalspiservice/evalspiservice.go | 36 + .../spi/coze.loop.evaluation.spi.go | 3273 +++++++++++++++-- .../spi/coze.loop.evaluation.spi_validator.go | 64 + .../spi/evaluationspiservice/client.go | 6 + .../evaluationspiservice.go | 36 + .../spi/k-coze.loop.evaluation.spi.go | 1779 +++++++++ .../lospi/local_evaluationspiservice.go | 23 + .../application/convertor/common/common.go | 22 + .../convertor/evaluator/evaluator.go | 74 + .../evaluation/domain/entity/evaluator.go | 69 +- .../entity/evaluator_version_custom_rpc.go | 128 + .../infra/repo/evaluator/evaluator_impl.go | 18 + .../evaluator/mysql/convertor/evaluator.go | 33 +- .../evaluation/pkg/errno/evaluation.go | 60 + backend/script/errorx/evaluation.yaml | 36 + .../coze.loop.evaluation.spi.thrift | 64 +- .../loop/evaluation/domain/evaluator.thrift | 15 +- 23 files changed, 6390 insertions(+), 332 deletions(-) create mode 100644 backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc.go diff --git a/backend/go.mod b/backend/go.mod index a8ccc2e13..c2bddffe9 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -128,7 +128,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sso v1.24.11 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.10 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.33.9 // indirect - github.com/aws/smithy-go v1.22.1 // indirect + github.com/aws/smithy-go v1.22.1 github.com/baidubce/bce-sdk-go v0.9.164 // indirect github.com/bluele/gcache v0.0.2 // indirect github.com/bufbuild/protocompile v0.8.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index 53bf8e523..ed089935d 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -473,7 +473,6 @@ github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAx github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= -github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go index d7fcd5bf4..9a75796d0 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go @@ -32,6 +32,8 @@ const ( EvaluatorTagKeyName = "Name" + AccessProtocolRPC = "rpc" + EvaluatorFilterLogicOpUnknown = "Unknown" EvaluatorFilterLogicOpAnd = "And" @@ -58,9 +60,9 @@ const ( type EvaluatorType int64 const ( - EvaluatorType_Prompt EvaluatorType = 1 - EvaluatorType_Code EvaluatorType = 2 - EvaluatorType_Builtin EvaluatorType = 3 + EvaluatorType_Prompt EvaluatorType = 1 + EvaluatorType_Code EvaluatorType = 2 + EvaluatorType_CustomRPC EvaluatorType = 3 ) func (p EvaluatorType) String() string { @@ -69,8 +71,8 @@ func (p EvaluatorType) String() string { return "Prompt" case EvaluatorType_Code: return "Code" - case EvaluatorType_Builtin: - return "Builtin" + case EvaluatorType_CustomRPC: + return "CustomRPC" } return "" } @@ -81,8 +83,8 @@ func EvaluatorTypeFromString(s string) (EvaluatorType, error) { return EvaluatorType_Prompt, nil case "Code": return EvaluatorType_Code, nil - case "Builtin": - return EvaluatorType_Builtin, nil + case "CustomRPC": + return EvaluatorType_CustomRPC, nil } return EvaluatorType(0), fmt.Errorf("not a valid EvaluatorType string") } @@ -289,6 +291,8 @@ type EvaluatorTagLangType = string // Evaluator筛选字段 type EvaluatorTagKey = string +type AccessProtocol = string + // 筛选逻辑操作符 type EvaluatorFilterLogicOp = string @@ -1852,6 +1856,490 @@ func (p *CodeEvaluator) Field4DeepEqual(src *string) bool { return true } +type CustomRPCEvaluator struct { + // 自定义评估器编码，例如：EvalBot的给“代码生成-代码正确”赋予CN:480的评估器ID + ProviderEvaluatorCode *string `thrift:"provider_evaluator_code,1,optional" frugal:"1,optional,string" form:"provider_evaluator_code" json:"provider_evaluator_code,omitempty" query:"provider_evaluator_code"` + // 本期是RPC，后续还可拓展HTTP + AccessProtocol AccessProtocol `thrift:"access_protocol,2,required" frugal:"2,required,string" form:"access_protocol,required" json:"access_protocol,required" query:"access_protocol,required"` + ServiceName *string `thrift:"service_name,3,optional" frugal:"3,optional,string" form:"service_name" json:"service_name,omitempty" query:"service_name"` + Cluster *string `thrift:"cluster,4,optional" frugal:"4,optional,string" form:"cluster" json:"cluster,omitempty" query:"cluster"` + // ms + Timeout *int64 `thrift:"timeout,10,optional" frugal:"10,optional,i64" form:"timeout" json:"timeout,omitempty" query:"timeout"` +} + +func NewCustomRPCEvaluator() *CustomRPCEvaluator { + return &CustomRPCEvaluator{} +} + +func (p *CustomRPCEvaluator) InitDefault() { +} + +var CustomRPCEvaluator_ProviderEvaluatorCode_DEFAULT string + +func (p *CustomRPCEvaluator) GetProviderEvaluatorCode() (v string) { + if p == nil { + return + } + if !p.IsSetProviderEvaluatorCode() { + return CustomRPCEvaluator_ProviderEvaluatorCode_DEFAULT + } + return *p.ProviderEvaluatorCode +} + +func (p *CustomRPCEvaluator) GetAccessProtocol() (v AccessProtocol) { + if p != nil { + return p.AccessProtocol + } + return +} + +var CustomRPCEvaluator_ServiceName_DEFAULT string + +func (p *CustomRPCEvaluator) GetServiceName() (v string) { + if p == nil { + return + } + if !p.IsSetServiceName() { + return CustomRPCEvaluator_ServiceName_DEFAULT + } + return *p.ServiceName +} + +var CustomRPCEvaluator_Cluster_DEFAULT string + +func (p *CustomRPCEvaluator) GetCluster() (v string) { + if p == nil { + return + } + if !p.IsSetCluster() { + return CustomRPCEvaluator_Cluster_DEFAULT + } + return *p.Cluster +} + +var CustomRPCEvaluator_Timeout_DEFAULT int64 + +func (p *CustomRPCEvaluator) GetTimeout() (v int64) { + if p == nil { + return + } + if !p.IsSetTimeout() { + return CustomRPCEvaluator_Timeout_DEFAULT + } + return *p.Timeout +} +func (p *CustomRPCEvaluator) SetProviderEvaluatorCode(val *string) { + p.ProviderEvaluatorCode = val +} +func (p *CustomRPCEvaluator) SetAccessProtocol(val AccessProtocol) { + p.AccessProtocol = val +} +func (p *CustomRPCEvaluator) SetServiceName(val *string) { + p.ServiceName = val +} +func (p *CustomRPCEvaluator) SetCluster(val *string) { + p.Cluster = val +} +func (p *CustomRPCEvaluator) SetTimeout(val *int64) { + p.Timeout = val +} + +var fieldIDToName_CustomRPCEvaluator = map[int16]string{ + 1: "provider_evaluator_code", + 2: "access_protocol", + 3: "service_name", + 4: "cluster", + 10: "timeout", +} + +func (p *CustomRPCEvaluator) IsSetProviderEvaluatorCode() bool { + return p.ProviderEvaluatorCode != nil +} + +func (p *CustomRPCEvaluator) IsSetServiceName() bool { + return p.ServiceName != nil +} + +func (p *CustomRPCEvaluator) IsSetCluster() bool { + return p.Cluster != nil +} + +func (p *CustomRPCEvaluator) IsSetTimeout() bool { + return p.Timeout != nil +} + +func (p *CustomRPCEvaluator) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + var issetAccessProtocol bool = false + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRING { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRING { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + issetAccessProtocol = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 3: + if fieldTypeId == thrift.STRING { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 4: + if fieldTypeId == thrift.STRING { + if err = p.ReadField4(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 10: + if fieldTypeId == thrift.I64 { + if err = p.ReadField10(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + if !issetAccessProtocol { + fieldId = 2 + goto RequiredFieldNotSetError + } + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_CustomRPCEvaluator[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +RequiredFieldNotSetError: + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_CustomRPCEvaluator[fieldId])) +} + +func (p *CustomRPCEvaluator) ReadField1(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.ProviderEvaluatorCode = _field + return nil +} +func (p *CustomRPCEvaluator) ReadField2(iprot thrift.TProtocol) error { + + var _field AccessProtocol + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = v + } + p.AccessProtocol = _field + return nil +} +func (p *CustomRPCEvaluator) ReadField3(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.ServiceName = _field + return nil +} +func (p *CustomRPCEvaluator) ReadField4(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Cluster = _field + return nil +} +func (p *CustomRPCEvaluator) ReadField10(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.Timeout = _field + return nil +} + +func (p *CustomRPCEvaluator) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("CustomRPCEvaluator"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } + if err = p.writeField4(oprot); err != nil { + fieldId = 4 + goto WriteFieldError + } + if err = p.writeField10(oprot); err != nil { + fieldId = 10 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *CustomRPCEvaluator) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetProviderEvaluatorCode() { + if err = oprot.WriteFieldBegin("provider_evaluator_code", thrift.STRING, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.ProviderEvaluatorCode); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *CustomRPCEvaluator) writeField2(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("access_protocol", thrift.STRING, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(p.AccessProtocol); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *CustomRPCEvaluator) writeField3(oprot thrift.TProtocol) (err error) { + if p.IsSetServiceName() { + if err = oprot.WriteFieldBegin("service_name", thrift.STRING, 3); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.ServiceName); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} +func (p *CustomRPCEvaluator) writeField4(oprot thrift.TProtocol) (err error) { + if p.IsSetCluster() { + if err = oprot.WriteFieldBegin("cluster", thrift.STRING, 4); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Cluster); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) +} +func (p *CustomRPCEvaluator) writeField10(oprot thrift.TProtocol) (err error) { + if p.IsSetTimeout() { + if err = oprot.WriteFieldBegin("timeout", thrift.I64, 10); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.Timeout); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 10 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 10 end error: ", p), err) +} + +func (p *CustomRPCEvaluator) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("CustomRPCEvaluator(%+v)", *p) + +} + +func (p *CustomRPCEvaluator) DeepEqual(ano *CustomRPCEvaluator) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.ProviderEvaluatorCode) { + return false + } + if !p.Field2DeepEqual(ano.AccessProtocol) { + return false + } + if !p.Field3DeepEqual(ano.ServiceName) { + return false + } + if !p.Field4DeepEqual(ano.Cluster) { + return false + } + if !p.Field10DeepEqual(ano.Timeout) { + return false + } + return true +} + +func (p *CustomRPCEvaluator) Field1DeepEqual(src *string) bool { + + if p.ProviderEvaluatorCode == src { + return true + } else if p.ProviderEvaluatorCode == nil || src == nil { + return false + } + if strings.Compare(*p.ProviderEvaluatorCode, *src) != 0 { + return false + } + return true +} +func (p *CustomRPCEvaluator) Field2DeepEqual(src AccessProtocol) bool { + + if strings.Compare(p.AccessProtocol, src) != 0 { + return false + } + return true +} +func (p *CustomRPCEvaluator) Field3DeepEqual(src *string) bool { + + if p.ServiceName == src { + return true + } else if p.ServiceName == nil || src == nil { + return false + } + if strings.Compare(*p.ServiceName, *src) != 0 { + return false + } + return true +} +func (p *CustomRPCEvaluator) Field4DeepEqual(src *string) bool { + + if p.Cluster == src { + return true + } else if p.Cluster == nil || src == nil { + return false + } + if strings.Compare(*p.Cluster, *src) != 0 { + return false + } + return true +} +func (p *CustomRPCEvaluator) Field10DeepEqual(src *int64) bool { + + if p.Timeout == src { + return true + } else if p.Timeout == nil || src == nil { + return false + } + if *p.Timeout != *src { + return false + } + return true +} + type EvaluatorVersion struct { // 版本id ID *int64 `thrift:"id,1,optional" frugal:"1,optional,i64" json:"id" form:"id" query:"id"` @@ -2331,8 +2819,9 @@ type EvaluatorContent struct { InputSchemas []*common.ArgsSchema `thrift:"input_schemas,2,optional" frugal:"2,optional,list" mapstructure:"input_schemas" form:"input_schemas" json:"input_schemas,omitempty" query:"input_schemas"` OutputSchemas []*common.ArgsSchema `thrift:"output_schemas,3,optional" frugal:"3,optional,list" mapstructure:"output_schemas" form:"output_schemas" json:"output_schemas,omitempty" query:"output_schemas"` // 101-200 Evaluator类型 - PromptEvaluator *PromptEvaluator `thrift:"prompt_evaluator,101,optional" frugal:"101,optional,PromptEvaluator" mapstructure:"prompt_evaluator" form:"prompt_evaluator" json:"prompt_evaluator,omitempty" query:"prompt_evaluator"` - CodeEvaluator *CodeEvaluator `thrift:"code_evaluator,102,optional" frugal:"102,optional,CodeEvaluator" form:"code_evaluator" json:"code_evaluator,omitempty" query:"code_evaluator"` + PromptEvaluator *PromptEvaluator `thrift:"prompt_evaluator,101,optional" frugal:"101,optional,PromptEvaluator" mapstructure:"prompt_evaluator" form:"prompt_evaluator" json:"prompt_evaluator,omitempty" query:"prompt_evaluator"` + CodeEvaluator *CodeEvaluator `thrift:"code_evaluator,102,optional" frugal:"102,optional,CodeEvaluator" form:"code_evaluator" json:"code_evaluator,omitempty" query:"code_evaluator"` + CustomRPCEvaluator *CustomRPCEvaluator `thrift:"custom_rpc_evaluator,103,optional" frugal:"103,optional,CustomRPCEvaluator" form:"custom_rpc_evaluator" json:"custom_rpc_evaluator,omitempty" query:"custom_rpc_evaluator"` } func NewEvaluatorContent() *EvaluatorContent { @@ -2401,6 +2890,18 @@ func (p *EvaluatorContent) GetCodeEvaluator() (v *CodeEvaluator) { } return p.CodeEvaluator } + +var EvaluatorContent_CustomRPCEvaluator_DEFAULT *CustomRPCEvaluator + +func (p *EvaluatorContent) GetCustomRPCEvaluator() (v *CustomRPCEvaluator) { + if p == nil { + return + } + if !p.IsSetCustomRPCEvaluator() { + return EvaluatorContent_CustomRPCEvaluator_DEFAULT + } + return p.CustomRPCEvaluator +} func (p *EvaluatorContent) SetReceiveChatHistory(val *bool) { p.ReceiveChatHistory = val } @@ -2416,6 +2917,9 @@ func (p *EvaluatorContent) SetPromptEvaluator(val *PromptEvaluator) { func (p *EvaluatorContent) SetCodeEvaluator(val *CodeEvaluator) { p.CodeEvaluator = val } +func (p *EvaluatorContent) SetCustomRPCEvaluator(val *CustomRPCEvaluator) { + p.CustomRPCEvaluator = val +} var fieldIDToName_EvaluatorContent = map[int16]string{ 1: "receive_chat_history", @@ -2423,6 +2927,7 @@ var fieldIDToName_EvaluatorContent = map[int16]string{ 3: "output_schemas", 101: "prompt_evaluator", 102: "code_evaluator", + 103: "custom_rpc_evaluator", } func (p *EvaluatorContent) IsSetReceiveChatHistory() bool { @@ -2445,6 +2950,10 @@ func (p *EvaluatorContent) IsSetCodeEvaluator() bool { return p.CodeEvaluator != nil } +func (p *EvaluatorContent) IsSetCustomRPCEvaluator() bool { + return p.CustomRPCEvaluator != nil +} + func (p *EvaluatorContent) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -2503,6 +3012,14 @@ func (p *EvaluatorContent) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 103: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField103(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } default: if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError @@ -2605,6 +3122,14 @@ func (p *EvaluatorContent) ReadField102(iprot thrift.TProtocol) error { p.CodeEvaluator = _field return nil } +func (p *EvaluatorContent) ReadField103(iprot thrift.TProtocol) error { + _field := NewCustomRPCEvaluator() + if err := _field.Read(iprot); err != nil { + return err + } + p.CustomRPCEvaluator = _field + return nil +} func (p *EvaluatorContent) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 @@ -2632,6 +3157,10 @@ func (p *EvaluatorContent) Write(oprot thrift.TProtocol) (err error) { fieldId = 102 goto WriteFieldError } + if err = p.writeField103(oprot); err != nil { + fieldId = 103 + goto WriteFieldError + } } if err = oprot.WriteFieldStop(); err != nil { goto WriteFieldStopError @@ -2756,6 +3285,24 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 102 end error: ", p), err) } +func (p *EvaluatorContent) writeField103(oprot thrift.TProtocol) (err error) { + if p.IsSetCustomRPCEvaluator() { + if err = oprot.WriteFieldBegin("custom_rpc_evaluator", thrift.STRUCT, 103); err != nil { + goto WriteFieldBeginError + } + if err := p.CustomRPCEvaluator.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 103 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 103 end error: ", p), err) +} func (p *EvaluatorContent) String() string { if p == nil { @@ -2786,6 +3333,9 @@ func (p *EvaluatorContent) DeepEqual(ano *EvaluatorContent) bool { if !p.Field102DeepEqual(ano.CodeEvaluator) { return false } + if !p.Field103DeepEqual(ano.CustomRPCEvaluator) { + return false + } return true } @@ -2841,6 +3391,13 @@ func (p *EvaluatorContent) Field102DeepEqual(src *CodeEvaluator) bool { } return true } +func (p *EvaluatorContent) Field103DeepEqual(src *CustomRPCEvaluator) bool { + + if !p.CustomRPCEvaluator.DeepEqual(src) { + return false + } + return true +} type Evaluator struct { EvaluatorID *int64 `thrift:"evaluator_id,1,optional" frugal:"1,optional,i64" json:"evaluator_id" form:"evaluator_id" query:"evaluator_id"` diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go index 6ab11c44e..42ab119e6 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go @@ -43,6 +43,9 @@ func (p *PromptEvaluator) IsValid() error { func (p *CodeEvaluator) IsValid() error { return nil } +func (p *CustomRPCEvaluator) IsValid() error { + return nil +} func (p *EvaluatorVersion) IsValid() error { if p.BaseInfo != nil { if err := p.BaseInfo.IsValid(); err != nil { @@ -67,6 +70,11 @@ func (p *EvaluatorContent) IsValid() error { return fmt.Errorf("field CodeEvaluator not valid, %w", err) } } + if p.CustomRPCEvaluator != nil { + if err := p.CustomRPCEvaluator.IsValid(); err != nil { + return fmt.Errorf("field CustomRPCEvaluator not valid, %w", err) + } + } return nil } func (p *Evaluator) IsValid() error { diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go index f93c7e4fc..82a1243ee 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go @@ -1156,6 +1156,345 @@ func (p *CodeEvaluator) DeepCopy(s interface{}) error { return nil } +func (p *CustomRPCEvaluator) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + var issetAccessProtocol bool = false + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField2(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } + issetAccessProtocol = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 3: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField3(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 4: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField4(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 10: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField10(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + if !issetAccessProtocol { + fieldId = 2 + goto RequiredFieldNotSetError + } + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_CustomRPCEvaluator[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +RequiredFieldNotSetError: + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_CustomRPCEvaluator[fieldId])) +} + +func (p *CustomRPCEvaluator) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.ProviderEvaluatorCode = _field + return offset, nil +} + +func (p *CustomRPCEvaluator) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field AccessProtocol + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.AccessProtocol = _field + return offset, nil +} + +func (p *CustomRPCEvaluator) FastReadField3(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.ServiceName = _field + return offset, nil +} + +func (p *CustomRPCEvaluator) FastReadField4(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Cluster = _field + return offset, nil +} + +func (p *CustomRPCEvaluator) FastReadField10(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Timeout = _field + return offset, nil +} + +func (p *CustomRPCEvaluator) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *CustomRPCEvaluator) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField10(buf[offset:], w) + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) + offset += p.fastWriteField4(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *CustomRPCEvaluator) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field3Length() + l += p.field4Length() + l += p.field10Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *CustomRPCEvaluator) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetProviderEvaluatorCode() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 1) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.ProviderEvaluatorCode) + } + return offset +} + +func (p *CustomRPCEvaluator) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 2) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, p.AccessProtocol) + return offset +} + +func (p *CustomRPCEvaluator) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetServiceName() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 3) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.ServiceName) + } + return offset +} + +func (p *CustomRPCEvaluator) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetCluster() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 4) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Cluster) + } + return offset +} + +func (p *CustomRPCEvaluator) fastWriteField10(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetTimeout() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 10) + offset += thrift.Binary.WriteI64(buf[offset:], *p.Timeout) + } + return offset +} + +func (p *CustomRPCEvaluator) field1Length() int { + l := 0 + if p.IsSetProviderEvaluatorCode() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.ProviderEvaluatorCode) + } + return l +} + +func (p *CustomRPCEvaluator) field2Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(p.AccessProtocol) + return l +} + +func (p *CustomRPCEvaluator) field3Length() int { + l := 0 + if p.IsSetServiceName() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.ServiceName) + } + return l +} + +func (p *CustomRPCEvaluator) field4Length() int { + l := 0 + if p.IsSetCluster() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Cluster) + } + return l +} + +func (p *CustomRPCEvaluator) field10Length() int { + l := 0 + if p.IsSetTimeout() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *CustomRPCEvaluator) DeepCopy(s interface{}) error { + src, ok := s.(*CustomRPCEvaluator) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.ProviderEvaluatorCode != nil { + var tmp string + if *src.ProviderEvaluatorCode != "" { + tmp = kutils.StringDeepCopy(*src.ProviderEvaluatorCode) + } + p.ProviderEvaluatorCode = &tmp + } + + p.AccessProtocol = src.AccessProtocol + + if src.ServiceName != nil { + var tmp string + if *src.ServiceName != "" { + tmp = kutils.StringDeepCopy(*src.ServiceName) + } + p.ServiceName = &tmp + } + + if src.Cluster != nil { + var tmp string + if *src.Cluster != "" { + tmp = kutils.StringDeepCopy(*src.Cluster) + } + p.Cluster = &tmp + } + + if src.Timeout != nil { + tmp := *src.Timeout + p.Timeout = &tmp + } + + return nil +} + func (p *EvaluatorVersion) FastRead(buf []byte) (int, error) { var err error @@ -1582,6 +1921,20 @@ func (p *EvaluatorContent) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 103: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField103(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 + } + } default: l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -1688,6 +2041,18 @@ func (p *EvaluatorContent) FastReadField102(buf []byte) (int, error) { return offset, nil } +func (p *EvaluatorContent) FastReadField103(buf []byte) (int, error) { + offset := 0 + _field := NewCustomRPCEvaluator() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.CustomRPCEvaluator = _field + return offset, nil +} + func (p *EvaluatorContent) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } @@ -1700,6 +2065,7 @@ func (p *EvaluatorContent) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) in offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField101(buf[offset:], w) offset += p.fastWriteField102(buf[offset:], w) + offset += p.fastWriteField103(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) return offset @@ -1713,6 +2079,7 @@ func (p *EvaluatorContent) BLength() int { l += p.field3Length() l += p.field101Length() l += p.field102Length() + l += p.field103Length() } l += thrift.Binary.FieldStopLength() return l @@ -1777,6 +2144,15 @@ func (p *EvaluatorContent) fastWriteField102(buf []byte, w thrift.NocopyWriter) return offset } +func (p *EvaluatorContent) fastWriteField103(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetCustomRPCEvaluator() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 103) + offset += p.CustomRPCEvaluator.FastWriteNocopy(buf[offset:], w) + } + return offset +} + func (p *EvaluatorContent) field1Length() int { l := 0 if p.IsSetReceiveChatHistory() { @@ -1830,6 +2206,15 @@ func (p *EvaluatorContent) field102Length() int { return l } +func (p *EvaluatorContent) field103Length() int { + l := 0 + if p.IsSetCustomRPCEvaluator() { + l += thrift.Binary.FieldBeginLength() + l += p.CustomRPCEvaluator.BLength() + } + return l +} + func (p *EvaluatorContent) DeepCopy(s interface{}) error { src, ok := s.(*EvaluatorContent) if !ok { @@ -1889,6 +2274,15 @@ func (p *EvaluatorContent) DeepCopy(s interface{}) error { } p.CodeEvaluator = _codeEvaluator + var _customRPCEvaluator *CustomRPCEvaluator + if src.CustomRPCEvaluator != nil { + _customRPCEvaluator = &CustomRPCEvaluator{} + if err := _customRPCEvaluator.DeepCopy(src.CustomRPCEvaluator); err != nil { + return err + } + } + p.CustomRPCEvaluator = _customRPCEvaluator + return nil } diff --git a/backend/kitex_gen/coze/loop/evaluation/evalspiservice/client.go b/backend/kitex_gen/coze/loop/evaluation/evalspiservice/client.go index d09738d01..2e942e8f8 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evalspiservice/client.go +++ b/backend/kitex_gen/coze/loop/evaluation/evalspiservice/client.go @@ -14,6 +14,7 @@ type Client interface { SearchEvalTarget(ctx context.Context, req *spi.SearchEvalTargetRequest, callOptions ...callopt.Option) (r *spi.SearchEvalTargetResponse, err error) InvokeEvalTarget(ctx context.Context, req *spi.InvokeEvalTargetRequest, callOptions ...callopt.Option) (r *spi.InvokeEvalTargetResponse, err error) AsyncInvokeEvalTarget(ctx context.Context, req *spi.AsyncInvokeEvalTargetRequest, callOptions ...callopt.Option) (r *spi.AsyncInvokeEvalTargetResponse, err error) + InvokeEvaluator(ctx context.Context, req *spi.InvokeEvaluatorRequest, callOptions ...callopt.Option) (r *spi.InvokeEvaluatorResponse, err error) } // NewClient creates a client for the service defined in IDL. @@ -59,3 +60,8 @@ func (p *kEvalSPIServiceClient) AsyncInvokeEvalTarget(ctx context.Context, req * ctx = client.NewCtxWithCallOptions(ctx, callOptions) return p.kClient.AsyncInvokeEvalTarget(ctx, req) } + +func (p *kEvalSPIServiceClient) InvokeEvaluator(ctx context.Context, req *spi.InvokeEvaluatorRequest, callOptions ...callopt.Option) (r *spi.InvokeEvaluatorResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.InvokeEvaluator(ctx, req) +} diff --git a/backend/kitex_gen/coze/loop/evaluation/evalspiservice/evalspiservice.go b/backend/kitex_gen/coze/loop/evaluation/evalspiservice/evalspiservice.go index 868956109..bb533a138 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evalspiservice/evalspiservice.go +++ b/backend/kitex_gen/coze/loop/evaluation/evalspiservice/evalspiservice.go @@ -35,6 +35,13 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), + "InvokeEvaluator": kitex.NewMethodInfo( + invokeEvaluatorHandler, + newEvaluationSPIServiceInvokeEvaluatorArgs, + newEvaluationSPIServiceInvokeEvaluatorResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), } var ( @@ -125,6 +132,25 @@ func newEvaluationSPIServiceAsyncInvokeEvalTargetResult() interface{} { return spi.NewEvaluationSPIServiceAsyncInvokeEvalTargetResult() } +func invokeEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*spi.EvaluationSPIServiceInvokeEvaluatorArgs) + realResult := result.(*spi.EvaluationSPIServiceInvokeEvaluatorResult) + success, err := handler.(spi.EvaluationSPIService).InvokeEvaluator(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluationSPIServiceInvokeEvaluatorArgs() interface{} { + return spi.NewEvaluationSPIServiceInvokeEvaluatorArgs() +} + +func newEvaluationSPIServiceInvokeEvaluatorResult() interface{} { + return spi.NewEvaluationSPIServiceInvokeEvaluatorResult() +} + type kClient struct { c client.Client sc client.Streaming @@ -166,3 +192,13 @@ func (p *kClient) AsyncInvokeEvalTarget(ctx context.Context, req *spi.AsyncInvok } return _result.GetSuccess(), nil } + +func (p *kClient) InvokeEvaluator(ctx context.Context, req *spi.InvokeEvaluatorRequest) (r *spi.InvokeEvaluatorResponse, err error) { + var _args spi.EvaluationSPIServiceInvokeEvaluatorArgs + _args.Req = req + var _result spi.EvaluationSPIServiceInvokeEvaluatorResult + if err = p.c.Call(ctx, "InvokeEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} diff --git a/backend/kitex_gen/coze/loop/evaluation/spi/coze.loop.evaluation.spi.go b/backend/kitex_gen/coze/loop/evaluation/spi/coze.loop.evaluation.spi.go index b51b5e25d..79e584c0c 100644 --- a/backend/kitex_gen/coze/loop/evaluation/spi/coze.loop.evaluation.spi.go +++ b/backend/kitex_gen/coze/loop/evaluation/spi/coze.loop.evaluation.spi.go @@ -67,6 +67,54 @@ func (p *InvokeEvalTargetStatus) Value() (driver.Value, error) { return int64(*p), nil } +// the run status enumerate for custom evaluator +type InvokeEvaluatorRunStatus int64 + +const ( + InvokeEvaluatorRunStatus_UNKNOWN InvokeEvaluatorRunStatus = 0 + InvokeEvaluatorRunStatus_SUCCESS InvokeEvaluatorRunStatus = 1 + InvokeEvaluatorRunStatus_FAILED InvokeEvaluatorRunStatus = 2 +) + +func (p InvokeEvaluatorRunStatus) String() string { + switch p { + case InvokeEvaluatorRunStatus_UNKNOWN: + return "UNKNOWN" + case InvokeEvaluatorRunStatus_SUCCESS: + return "SUCCESS" + case InvokeEvaluatorRunStatus_FAILED: + return "FAILED" + } + return "" +} + +func InvokeEvaluatorRunStatusFromString(s string) (InvokeEvaluatorRunStatus, error) { + switch s { + case "UNKNOWN": + return InvokeEvaluatorRunStatus_UNKNOWN, nil + case "SUCCESS": + return InvokeEvaluatorRunStatus_SUCCESS, nil + case "FAILED": + return InvokeEvaluatorRunStatus_FAILED, nil + } + return InvokeEvaluatorRunStatus(0), fmt.Errorf("not a valid InvokeEvaluatorRunStatus string") +} + +func InvokeEvaluatorRunStatusPtr(v InvokeEvaluatorRunStatus) *InvokeEvaluatorRunStatus { return &v } +func (p *InvokeEvaluatorRunStatus) Scan(value interface{}) (err error) { + var result sql.NullInt64 + err = result.Scan(value) + *p = InvokeEvaluatorRunStatus(result.Int64) + return +} + +func (p *InvokeEvaluatorRunStatus) Value() (driver.Value, error) { + if p == nil { + return nil, nil + } + return int64(*p), nil +} + type ContentType = string type SearchEvalTargetRequest struct { @@ -4390,290 +4438,2887 @@ func (p *AsyncInvokeEvalTargetResponse) Field255DeepEqual(src *base.BaseResp) bo return true } -type EvaluationSPIService interface { - SearchEvalTarget(ctx context.Context, req *SearchEvalTargetRequest) (r *SearchEvalTargetResponse, err error) - - InvokeEvalTarget(ctx context.Context, req *InvokeEvalTargetRequest) (r *InvokeEvalTargetResponse, err error) +// the custom evaluator identity and parameter information +type InvokeCustomEvaluator struct { + // provider-side evaluator identity code + ProviderEvaluatorCode *string `thrift:"provider_evaluator_code,1,optional" frugal:"1,optional,string" form:"provider_evaluator_code" json:"provider_evaluator_code,omitempty" query:"provider_evaluator_code"` +} - AsyncInvokeEvalTarget(ctx context.Context, req *AsyncInvokeEvalTargetRequest) (r *AsyncInvokeEvalTargetResponse, err error) +func NewInvokeCustomEvaluator() *InvokeCustomEvaluator { + return &InvokeCustomEvaluator{} } -type EvaluationSPIServiceClient struct { - c thrift.TClient +func (p *InvokeCustomEvaluator) InitDefault() { } -func NewEvaluationSPIServiceClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *EvaluationSPIServiceClient { - return &EvaluationSPIServiceClient{ - c: thrift.NewTStandardClient(f.GetProtocol(t), f.GetProtocol(t)), +var InvokeCustomEvaluator_ProviderEvaluatorCode_DEFAULT string + +func (p *InvokeCustomEvaluator) GetProviderEvaluatorCode() (v string) { + if p == nil { + return } + if !p.IsSetProviderEvaluatorCode() { + return InvokeCustomEvaluator_ProviderEvaluatorCode_DEFAULT + } + return *p.ProviderEvaluatorCode +} +func (p *InvokeCustomEvaluator) SetProviderEvaluatorCode(val *string) { + p.ProviderEvaluatorCode = val } -func NewEvaluationSPIServiceClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *EvaluationSPIServiceClient { - return &EvaluationSPIServiceClient{ - c: thrift.NewTStandardClient(iprot, oprot), - } +var fieldIDToName_InvokeCustomEvaluator = map[int16]string{ + 1: "provider_evaluator_code", } -func NewEvaluationSPIServiceClient(c thrift.TClient) *EvaluationSPIServiceClient { - return &EvaluationSPIServiceClient{ - c: c, +func (p *InvokeCustomEvaluator) IsSetProviderEvaluatorCode() bool { + return p.ProviderEvaluatorCode != nil +} + +func (p *InvokeCustomEvaluator) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRING { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeCustomEvaluator[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluationSPIServiceClient) Client_() thrift.TClient { - return p.c +func (p *InvokeCustomEvaluator) ReadField1(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.ProviderEvaluatorCode = _field + return nil } -func (p *EvaluationSPIServiceClient) SearchEvalTarget(ctx context.Context, req *SearchEvalTargetRequest) (r *SearchEvalTargetResponse, err error) { - var _args EvaluationSPIServiceSearchEvalTargetArgs - _args.Req = req - var _result EvaluationSPIServiceSearchEvalTargetResult - if err = p.Client_().Call(ctx, "SearchEvalTarget", &_args, &_result); err != nil { - return +func (p *InvokeCustomEvaluator) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("InvokeCustomEvaluator"); err != nil { + goto WriteStructBeginError } - return _result.GetSuccess(), nil + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluationSPIServiceClient) InvokeEvalTarget(ctx context.Context, req *InvokeEvalTargetRequest) (r *InvokeEvalTargetResponse, err error) { - var _args EvaluationSPIServiceInvokeEvalTargetArgs - _args.Req = req - var _result EvaluationSPIServiceInvokeEvalTargetResult - if err = p.Client_().Call(ctx, "InvokeEvalTarget", &_args, &_result); err != nil { - return + +func (p *InvokeCustomEvaluator) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetProviderEvaluatorCode() { + if err = oprot.WriteFieldBegin("provider_evaluator_code", thrift.STRING, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.ProviderEvaluatorCode); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } } - return _result.GetSuccess(), nil + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluationSPIServiceClient) AsyncInvokeEvalTarget(ctx context.Context, req *AsyncInvokeEvalTargetRequest) (r *AsyncInvokeEvalTargetResponse, err error) { - var _args EvaluationSPIServiceAsyncInvokeEvalTargetArgs - _args.Req = req - var _result EvaluationSPIServiceAsyncInvokeEvalTargetResult - if err = p.Client_().Call(ctx, "AsyncInvokeEvalTarget", &_args, &_result); err != nil { - return + +func (p *InvokeCustomEvaluator) String() string { + if p == nil { + return "" } - return _result.GetSuccess(), nil + return fmt.Sprintf("InvokeCustomEvaluator(%+v)", *p) + } -type EvaluationSPIServiceProcessor struct { - processorMap map[string]thrift.TProcessorFunction - handler EvaluationSPIService +func (p *InvokeCustomEvaluator) DeepEqual(ano *InvokeCustomEvaluator) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.ProviderEvaluatorCode) { + return false + } + return true } -func (p *EvaluationSPIServiceProcessor) AddToProcessorMap(key string, processor thrift.TProcessorFunction) { - p.processorMap[key] = processor +func (p *InvokeCustomEvaluator) Field1DeepEqual(src *string) bool { + + if p.ProviderEvaluatorCode == src { + return true + } else if p.ProviderEvaluatorCode == nil || src == nil { + return false + } + if strings.Compare(*p.ProviderEvaluatorCode, *src) != 0 { + return false + } + return true } -func (p *EvaluationSPIServiceProcessor) GetProcessorFunction(key string) (processor thrift.TProcessorFunction, ok bool) { - processor, ok = p.processorMap[key] - return processor, ok +// the input data structure for custom evaluator +type InvokeEvaluatorInputData struct { + // key-value structure of input variables required by the evaluator + InputFields map[string]*Content `thrift:"input_fields,1,optional" frugal:"1,optional,map" form:"input_fields" json:"input_fields,omitempty" query:"input_fields"` } -func (p *EvaluationSPIServiceProcessor) ProcessorMap() map[string]thrift.TProcessorFunction { - return p.processorMap +func NewInvokeEvaluatorInputData() *InvokeEvaluatorInputData { + return &InvokeEvaluatorInputData{} } -func NewEvaluationSPIServiceProcessor(handler EvaluationSPIService) *EvaluationSPIServiceProcessor { - self := &EvaluationSPIServiceProcessor{handler: handler, processorMap: make(map[string]thrift.TProcessorFunction)} - self.AddToProcessorMap("SearchEvalTarget", &evaluationSPIServiceProcessorSearchEvalTarget{handler: handler}) - self.AddToProcessorMap("InvokeEvalTarget", &evaluationSPIServiceProcessorInvokeEvalTarget{handler: handler}) - self.AddToProcessorMap("AsyncInvokeEvalTarget", &evaluationSPIServiceProcessorAsyncInvokeEvalTarget{handler: handler}) - return self +func (p *InvokeEvaluatorInputData) InitDefault() { } -func (p *EvaluationSPIServiceProcessor) Process(ctx context.Context, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - name, _, seqId, err := iprot.ReadMessageBegin() - if err != nil { - return false, err + +var InvokeEvaluatorInputData_InputFields_DEFAULT map[string]*Content + +func (p *InvokeEvaluatorInputData) GetInputFields() (v map[string]*Content) { + if p == nil { + return } - if processor, ok := p.GetProcessorFunction(name); ok { - return processor.Process(ctx, seqId, iprot, oprot) + if !p.IsSetInputFields() { + return InvokeEvaluatorInputData_InputFields_DEFAULT } - iprot.Skip(thrift.STRUCT) - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, "Unknown function "+name) - oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, x + return p.InputFields +} +func (p *InvokeEvaluatorInputData) SetInputFields(val map[string]*Content) { + p.InputFields = val } -type evaluationSPIServiceProcessorSearchEvalTarget struct { - handler EvaluationSPIService +var fieldIDToName_InvokeEvaluatorInputData = map[int16]string{ + 1: "input_fields", } -func (p *evaluationSPIServiceProcessorSearchEvalTarget) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluationSPIServiceSearchEvalTargetArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("SearchEvalTarget", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *InvokeEvaluatorInputData) IsSetInputFields() bool { + return p.InputFields != nil +} + +func (p *InvokeEvaluatorInputData) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError } - iprot.ReadMessageEnd() - var err2 error - result := EvaluationSPIServiceSearchEvalTargetResult{} - var retval *SearchEvalTargetResponse - if retval, err2 = p.handler.SearchEvalTarget(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing SearchEvalTarget: "+err2.Error()) - oprot.WriteMessageBegin("SearchEvalTarget", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("SearchEvalTarget", thrift.REPLY, seqId); err2 != nil { - err = err2 + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.MAP { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorInputData[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *InvokeEvaluatorInputData) ReadField1(iprot thrift.TProtocol) error { + _, _, size, err := iprot.ReadMapBegin() + if err != nil { + return err } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + _field := make(map[string]*Content, size) + values := make([]Content, size) + for i := 0; i < size; i++ { + var _key string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _key = v + } + + _val := &values[i] + _val.InitDefault() + if err := _val.Read(iprot); err != nil { + return err + } + + _field[_key] = _val } - if err != nil { - return + if err := iprot.ReadMapEnd(); err != nil { + return err } - return true, err + p.InputFields = _field + return nil } -type evaluationSPIServiceProcessorInvokeEvalTarget struct { - handler EvaluationSPIService +func (p *InvokeEvaluatorInputData) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("InvokeEvaluatorInputData"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *evaluationSPIServiceProcessorInvokeEvalTarget) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluationSPIServiceInvokeEvalTargetArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("InvokeEvalTarget", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *InvokeEvaluatorInputData) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetInputFields() { + if err = oprot.WriteFieldBegin("input_fields", thrift.MAP, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteMapBegin(thrift.STRING, thrift.STRUCT, len(p.InputFields)); err != nil { + return err + } + for k, v := range p.InputFields { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := v.Write(oprot); err != nil { + return err + } + } + if err := oprot.WriteMapEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} - iprot.ReadMessageEnd() - var err2 error - result := EvaluationSPIServiceInvokeEvalTargetResult{} - var retval *InvokeEvalTargetResponse - if retval, err2 = p.handler.InvokeEvalTarget(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing InvokeEvalTarget: "+err2.Error()) - oprot.WriteMessageBegin("InvokeEvalTarget", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval +func (p *InvokeEvaluatorInputData) String() string { + if p == nil { + return "" } - if err2 = oprot.WriteMessageBegin("InvokeEvalTarget", thrift.REPLY, seqId); err2 != nil { - err = err2 + return fmt.Sprintf("InvokeEvaluatorInputData(%+v)", *p) + +} + +func (p *InvokeEvaluatorInputData) DeepEqual(ano *InvokeEvaluatorInputData) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + if !p.Field1DeepEqual(ano.InputFields) { + return false } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + return true +} + +func (p *InvokeEvaluatorInputData) Field1DeepEqual(src map[string]*Content) bool { + + if len(p.InputFields) != len(src) { + return false } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + for k, v := range p.InputFields { + _src := src[k] + if !v.DeepEqual(_src) { + return false + } } - if err != nil { + return true +} + +// the output data structure for custom evaluator +type InvokeEvaluatorOutputData struct { + EvaluatorResult_ *InvokeEvaluatorResult_ `thrift:"evaluator_result,1,optional" frugal:"1,optional,InvokeEvaluatorResult_" form:"evaluator_result" json:"evaluator_result,omitempty" query:"evaluator_result"` + EvaluatorUsage *InvokeEvaluatorUsage `thrift:"evaluator_usage,2,optional" frugal:"2,optional,InvokeEvaluatorUsage" form:"evaluator_usage" json:"evaluator_usage,omitempty" query:"evaluator_usage"` + EvaluatorRunError *InvokeEvaluatorRunError `thrift:"evaluator_run_error,3,optional" frugal:"3,optional,InvokeEvaluatorRunError" form:"evaluator_run_error" json:"evaluator_run_error,omitempty" query:"evaluator_run_error"` +} + +func NewInvokeEvaluatorOutputData() *InvokeEvaluatorOutputData { + return &InvokeEvaluatorOutputData{} +} + +func (p *InvokeEvaluatorOutputData) InitDefault() { +} + +var InvokeEvaluatorOutputData_EvaluatorResult__DEFAULT *InvokeEvaluatorResult_ + +func (p *InvokeEvaluatorOutputData) GetEvaluatorResult_() (v *InvokeEvaluatorResult_) { + if p == nil { return } - return true, err + if !p.IsSetEvaluatorResult_() { + return InvokeEvaluatorOutputData_EvaluatorResult__DEFAULT + } + return p.EvaluatorResult_ } -type evaluationSPIServiceProcessorAsyncInvokeEvalTarget struct { - handler EvaluationSPIService -} +var InvokeEvaluatorOutputData_EvaluatorUsage_DEFAULT *InvokeEvaluatorUsage -func (p *evaluationSPIServiceProcessorAsyncInvokeEvalTarget) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := EvaluationSPIServiceAsyncInvokeEvalTargetArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("AsyncInvokeEvalTarget", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return false, err +func (p *InvokeEvaluatorOutputData) GetEvaluatorUsage() (v *InvokeEvaluatorUsage) { + if p == nil { + return + } + if !p.IsSetEvaluatorUsage() { + return InvokeEvaluatorOutputData_EvaluatorUsage_DEFAULT } + return p.EvaluatorUsage +} - iprot.ReadMessageEnd() - var err2 error - result := EvaluationSPIServiceAsyncInvokeEvalTargetResult{} - var retval *AsyncInvokeEvalTargetResponse - if retval, err2 = p.handler.AsyncInvokeEvalTarget(ctx, args.Req); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing AsyncInvokeEvalTarget: "+err2.Error()) - oprot.WriteMessageBegin("AsyncInvokeEvalTarget", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush(ctx) - return true, err2 - } else { - result.Success = retval +var InvokeEvaluatorOutputData_EvaluatorRunError_DEFAULT *InvokeEvaluatorRunError + +func (p *InvokeEvaluatorOutputData) GetEvaluatorRunError() (v *InvokeEvaluatorRunError) { + if p == nil { + return } - if err2 = oprot.WriteMessageBegin("AsyncInvokeEvalTarget", thrift.REPLY, seqId); err2 != nil { - err = err2 + if !p.IsSetEvaluatorRunError() { + return InvokeEvaluatorOutputData_EvaluatorRunError_DEFAULT } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 + return p.EvaluatorRunError +} +func (p *InvokeEvaluatorOutputData) SetEvaluatorResult_(val *InvokeEvaluatorResult_) { + p.EvaluatorResult_ = val +} +func (p *InvokeEvaluatorOutputData) SetEvaluatorUsage(val *InvokeEvaluatorUsage) { + p.EvaluatorUsage = val +} +func (p *InvokeEvaluatorOutputData) SetEvaluatorRunError(val *InvokeEvaluatorRunError) { + p.EvaluatorRunError = val +} + +var fieldIDToName_InvokeEvaluatorOutputData = map[int16]string{ + 1: "evaluator_result", + 2: "evaluator_usage", + 3: "evaluator_run_error", +} + +func (p *InvokeEvaluatorOutputData) IsSetEvaluatorResult_() bool { + return p.EvaluatorResult_ != nil +} + +func (p *InvokeEvaluatorOutputData) IsSetEvaluatorUsage() bool { + return p.EvaluatorUsage != nil +} + +func (p *InvokeEvaluatorOutputData) IsSetEvaluatorRunError() bool { + return p.EvaluatorRunError != nil +} + +func (p *InvokeEvaluatorOutputData) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 3: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorOutputData[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *InvokeEvaluatorOutputData) ReadField1(iprot thrift.TProtocol) error { + _field := NewInvokeEvaluatorResult_() + if err := _field.Read(iprot); err != nil { + return err + } + p.EvaluatorResult_ = _field + return nil +} +func (p *InvokeEvaluatorOutputData) ReadField2(iprot thrift.TProtocol) error { + _field := NewInvokeEvaluatorUsage() + if err := _field.Read(iprot); err != nil { + return err + } + p.EvaluatorUsage = _field + return nil +} +func (p *InvokeEvaluatorOutputData) ReadField3(iprot thrift.TProtocol) error { + _field := NewInvokeEvaluatorRunError() + if err := _field.Read(iprot); err != nil { + return err + } + p.EvaluatorRunError = _field + return nil +} + +func (p *InvokeEvaluatorOutputData) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("InvokeEvaluatorOutputData"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *InvokeEvaluatorOutputData) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluatorResult_() { + if err = oprot.WriteFieldBegin("evaluator_result", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorResult_.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *InvokeEvaluatorOutputData) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluatorUsage() { + if err = oprot.WriteFieldBegin("evaluator_usage", thrift.STRUCT, 2); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorUsage.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *InvokeEvaluatorOutputData) writeField3(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluatorRunError() { + if err = oprot.WriteFieldBegin("evaluator_run_error", thrift.STRUCT, 3); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorRunError.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} + +func (p *InvokeEvaluatorOutputData) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("InvokeEvaluatorOutputData(%+v)", *p) + +} + +func (p *InvokeEvaluatorOutputData) DeepEqual(ano *InvokeEvaluatorOutputData) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorResult_) { + return false + } + if !p.Field2DeepEqual(ano.EvaluatorUsage) { + return false + } + if !p.Field3DeepEqual(ano.EvaluatorRunError) { + return false + } + return true +} + +func (p *InvokeEvaluatorOutputData) Field1DeepEqual(src *InvokeEvaluatorResult_) bool { + + if !p.EvaluatorResult_.DeepEqual(src) { + return false + } + return true +} +func (p *InvokeEvaluatorOutputData) Field2DeepEqual(src *InvokeEvaluatorUsage) bool { + + if !p.EvaluatorUsage.DeepEqual(src) { + return false + } + return true +} +func (p *InvokeEvaluatorOutputData) Field3DeepEqual(src *InvokeEvaluatorRunError) bool { + + if !p.EvaluatorRunError.DeepEqual(src) { + return false + } + return true +} + +// the result data structure for custom evaluator +type InvokeEvaluatorResult_ struct { + Score *float64 `thrift:"score,1,optional" frugal:"1,optional,double" form:"score" json:"score,omitempty" query:"score"` + Reasoning *string `thrift:"reasoning,2,optional" frugal:"2,optional,string" form:"reasoning" json:"reasoning,omitempty" query:"reasoning"` +} + +func NewInvokeEvaluatorResult_() *InvokeEvaluatorResult_ { + return &InvokeEvaluatorResult_{} +} + +func (p *InvokeEvaluatorResult_) InitDefault() { +} + +var InvokeEvaluatorResult__Score_DEFAULT float64 + +func (p *InvokeEvaluatorResult_) GetScore() (v float64) { + if p == nil { + return + } + if !p.IsSetScore() { + return InvokeEvaluatorResult__Score_DEFAULT + } + return *p.Score +} + +var InvokeEvaluatorResult__Reasoning_DEFAULT string + +func (p *InvokeEvaluatorResult_) GetReasoning() (v string) { + if p == nil { + return + } + if !p.IsSetReasoning() { + return InvokeEvaluatorResult__Reasoning_DEFAULT + } + return *p.Reasoning +} +func (p *InvokeEvaluatorResult_) SetScore(val *float64) { + p.Score = val +} +func (p *InvokeEvaluatorResult_) SetReasoning(val *string) { + p.Reasoning = val +} + +var fieldIDToName_InvokeEvaluatorResult_ = map[int16]string{ + 1: "score", + 2: "reasoning", +} + +func (p *InvokeEvaluatorResult_) IsSetScore() bool { + return p.Score != nil +} + +func (p *InvokeEvaluatorResult_) IsSetReasoning() bool { + return p.Reasoning != nil +} + +func (p *InvokeEvaluatorResult_) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.DOUBLE { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRING { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorResult_[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *InvokeEvaluatorResult_) ReadField1(iprot thrift.TProtocol) error { + + var _field *float64 + if v, err := iprot.ReadDouble(); err != nil { + return err + } else { + _field = &v + } + p.Score = _field + return nil +} +func (p *InvokeEvaluatorResult_) ReadField2(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Reasoning = _field + return nil +} + +func (p *InvokeEvaluatorResult_) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("InvokeEvaluatorResult"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *InvokeEvaluatorResult_) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetScore() { + if err = oprot.WriteFieldBegin("score", thrift.DOUBLE, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteDouble(*p.Score); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *InvokeEvaluatorResult_) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetReasoning() { + if err = oprot.WriteFieldBegin("reasoning", thrift.STRING, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Reasoning); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} + +func (p *InvokeEvaluatorResult_) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("InvokeEvaluatorResult_(%+v)", *p) + +} + +func (p *InvokeEvaluatorResult_) DeepEqual(ano *InvokeEvaluatorResult_) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Score) { + return false + } + if !p.Field2DeepEqual(ano.Reasoning) { + return false + } + return true +} + +func (p *InvokeEvaluatorResult_) Field1DeepEqual(src *float64) bool { + + if p.Score == src { + return true + } else if p.Score == nil || src == nil { + return false + } + if *p.Score != *src { + return false + } + return true +} +func (p *InvokeEvaluatorResult_) Field2DeepEqual(src *string) bool { + + if p.Reasoning == src { + return true + } else if p.Reasoning == nil || src == nil { + return false + } + if strings.Compare(*p.Reasoning, *src) != 0 { + return false + } + return true +} + +// the usage data structure for custom evaluator +type InvokeEvaluatorUsage struct { + InputTokens *int64 `thrift:"input_tokens,1,optional" frugal:"1,optional,i64" form:"input_tokens" json:"input_tokens,omitempty" query:"input_tokens"` + OutputTokens *int64 `thrift:"output_tokens,2,optional" frugal:"2,optional,i64" form:"output_tokens" json:"output_tokens,omitempty" query:"output_tokens"` +} + +func NewInvokeEvaluatorUsage() *InvokeEvaluatorUsage { + return &InvokeEvaluatorUsage{} +} + +func (p *InvokeEvaluatorUsage) InitDefault() { +} + +var InvokeEvaluatorUsage_InputTokens_DEFAULT int64 + +func (p *InvokeEvaluatorUsage) GetInputTokens() (v int64) { + if p == nil { + return + } + if !p.IsSetInputTokens() { + return InvokeEvaluatorUsage_InputTokens_DEFAULT + } + return *p.InputTokens +} + +var InvokeEvaluatorUsage_OutputTokens_DEFAULT int64 + +func (p *InvokeEvaluatorUsage) GetOutputTokens() (v int64) { + if p == nil { + return + } + if !p.IsSetOutputTokens() { + return InvokeEvaluatorUsage_OutputTokens_DEFAULT + } + return *p.OutputTokens +} +func (p *InvokeEvaluatorUsage) SetInputTokens(val *int64) { + p.InputTokens = val +} +func (p *InvokeEvaluatorUsage) SetOutputTokens(val *int64) { + p.OutputTokens = val +} + +var fieldIDToName_InvokeEvaluatorUsage = map[int16]string{ + 1: "input_tokens", + 2: "output_tokens", +} + +func (p *InvokeEvaluatorUsage) IsSetInputTokens() bool { + return p.InputTokens != nil +} + +func (p *InvokeEvaluatorUsage) IsSetOutputTokens() bool { + return p.OutputTokens != nil +} + +func (p *InvokeEvaluatorUsage) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.I64 { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorUsage[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *InvokeEvaluatorUsage) ReadField1(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.InputTokens = _field + return nil +} +func (p *InvokeEvaluatorUsage) ReadField2(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.OutputTokens = _field + return nil +} + +func (p *InvokeEvaluatorUsage) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("InvokeEvaluatorUsage"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *InvokeEvaluatorUsage) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetInputTokens() { + if err = oprot.WriteFieldBegin("input_tokens", thrift.I64, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.InputTokens); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *InvokeEvaluatorUsage) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetOutputTokens() { + if err = oprot.WriteFieldBegin("output_tokens", thrift.I64, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.OutputTokens); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} + +func (p *InvokeEvaluatorUsage) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("InvokeEvaluatorUsage(%+v)", *p) + +} + +func (p *InvokeEvaluatorUsage) DeepEqual(ano *InvokeEvaluatorUsage) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.InputTokens) { + return false + } + if !p.Field2DeepEqual(ano.OutputTokens) { + return false + } + return true +} + +func (p *InvokeEvaluatorUsage) Field1DeepEqual(src *int64) bool { + + if p.InputTokens == src { + return true + } else if p.InputTokens == nil || src == nil { + return false + } + if *p.InputTokens != *src { + return false + } + return true +} +func (p *InvokeEvaluatorUsage) Field2DeepEqual(src *int64) bool { + + if p.OutputTokens == src { + return true + } else if p.OutputTokens == nil || src == nil { + return false + } + if *p.OutputTokens != *src { + return false + } + return true +} + +// the error data structure for custom evaluator +type InvokeEvaluatorRunError struct { + Code *int32 `thrift:"code,1,optional" frugal:"1,optional,i32" form:"code" json:"code,omitempty" query:"code"` + Message *string `thrift:"message,2,optional" frugal:"2,optional,string" form:"message" json:"message,omitempty" query:"message"` +} + +func NewInvokeEvaluatorRunError() *InvokeEvaluatorRunError { + return &InvokeEvaluatorRunError{} +} + +func (p *InvokeEvaluatorRunError) InitDefault() { +} + +var InvokeEvaluatorRunError_Code_DEFAULT int32 + +func (p *InvokeEvaluatorRunError) GetCode() (v int32) { + if p == nil { + return + } + if !p.IsSetCode() { + return InvokeEvaluatorRunError_Code_DEFAULT + } + return *p.Code +} + +var InvokeEvaluatorRunError_Message_DEFAULT string + +func (p *InvokeEvaluatorRunError) GetMessage() (v string) { + if p == nil { + return + } + if !p.IsSetMessage() { + return InvokeEvaluatorRunError_Message_DEFAULT + } + return *p.Message +} +func (p *InvokeEvaluatorRunError) SetCode(val *int32) { + p.Code = val +} +func (p *InvokeEvaluatorRunError) SetMessage(val *string) { + p.Message = val +} + +var fieldIDToName_InvokeEvaluatorRunError = map[int16]string{ + 1: "code", + 2: "message", +} + +func (p *InvokeEvaluatorRunError) IsSetCode() bool { + return p.Code != nil +} + +func (p *InvokeEvaluatorRunError) IsSetMessage() bool { + return p.Message != nil +} + +func (p *InvokeEvaluatorRunError) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I32 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRING { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorRunError[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *InvokeEvaluatorRunError) ReadField1(iprot thrift.TProtocol) error { + + var _field *int32 + if v, err := iprot.ReadI32(); err != nil { + return err + } else { + _field = &v + } + p.Code = _field + return nil +} +func (p *InvokeEvaluatorRunError) ReadField2(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Message = _field + return nil +} + +func (p *InvokeEvaluatorRunError) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("InvokeEvaluatorRunError"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *InvokeEvaluatorRunError) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetCode() { + if err = oprot.WriteFieldBegin("code", thrift.I32, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI32(*p.Code); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *InvokeEvaluatorRunError) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetMessage() { + if err = oprot.WriteFieldBegin("message", thrift.STRING, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Message); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} + +func (p *InvokeEvaluatorRunError) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("InvokeEvaluatorRunError(%+v)", *p) + +} + +func (p *InvokeEvaluatorRunError) DeepEqual(ano *InvokeEvaluatorRunError) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Code) { + return false + } + if !p.Field2DeepEqual(ano.Message) { + return false + } + return true +} + +func (p *InvokeEvaluatorRunError) Field1DeepEqual(src *int32) bool { + + if p.Code == src { + return true + } else if p.Code == nil || src == nil { + return false + } + if *p.Code != *src { + return false + } + return true +} +func (p *InvokeEvaluatorRunError) Field2DeepEqual(src *string) bool { + + if p.Message == src { + return true + } else if p.Message == nil || src == nil { + return false + } + if strings.Compare(*p.Message, *src) != 0 { + return false + } + return true +} + +// invoke custom evaluator request +type InvokeEvaluatorRequest struct { + WorkspaceID *int64 `thrift:"workspace_id,1,optional" frugal:"1,optional,i64" form:"workspace_id" json:"workspace_id,omitempty" query:"workspace_id"` + Evaluator *InvokeCustomEvaluator `thrift:"evaluator,2,optional" frugal:"2,optional,InvokeCustomEvaluator" form:"evaluator" json:"evaluator,omitempty" query:"evaluator"` + InputData *InvokeEvaluatorInputData `thrift:"input_data,3,optional" frugal:"3,optional,InvokeEvaluatorInputData" form:"input_data" json:"input_data,omitempty" query:"input_data"` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` +} + +func NewInvokeEvaluatorRequest() *InvokeEvaluatorRequest { + return &InvokeEvaluatorRequest{} +} + +func (p *InvokeEvaluatorRequest) InitDefault() { +} + +var InvokeEvaluatorRequest_WorkspaceID_DEFAULT int64 + +func (p *InvokeEvaluatorRequest) GetWorkspaceID() (v int64) { + if p == nil { + return + } + if !p.IsSetWorkspaceID() { + return InvokeEvaluatorRequest_WorkspaceID_DEFAULT + } + return *p.WorkspaceID +} + +var InvokeEvaluatorRequest_Evaluator_DEFAULT *InvokeCustomEvaluator + +func (p *InvokeEvaluatorRequest) GetEvaluator() (v *InvokeCustomEvaluator) { + if p == nil { + return + } + if !p.IsSetEvaluator() { + return InvokeEvaluatorRequest_Evaluator_DEFAULT + } + return p.Evaluator +} + +var InvokeEvaluatorRequest_InputData_DEFAULT *InvokeEvaluatorInputData + +func (p *InvokeEvaluatorRequest) GetInputData() (v *InvokeEvaluatorInputData) { + if p == nil { + return + } + if !p.IsSetInputData() { + return InvokeEvaluatorRequest_InputData_DEFAULT + } + return p.InputData +} + +var InvokeEvaluatorRequest_Base_DEFAULT *base.Base + +func (p *InvokeEvaluatorRequest) GetBase() (v *base.Base) { + if p == nil { + return + } + if !p.IsSetBase() { + return InvokeEvaluatorRequest_Base_DEFAULT + } + return p.Base +} +func (p *InvokeEvaluatorRequest) SetWorkspaceID(val *int64) { + p.WorkspaceID = val +} +func (p *InvokeEvaluatorRequest) SetEvaluator(val *InvokeCustomEvaluator) { + p.Evaluator = val +} +func (p *InvokeEvaluatorRequest) SetInputData(val *InvokeEvaluatorInputData) { + p.InputData = val +} +func (p *InvokeEvaluatorRequest) SetBase(val *base.Base) { + p.Base = val +} + +var fieldIDToName_InvokeEvaluatorRequest = map[int16]string{ + 1: "workspace_id", + 2: "evaluator", + 3: "input_data", + 255: "Base", +} + +func (p *InvokeEvaluatorRequest) IsSetWorkspaceID() bool { + return p.WorkspaceID != nil +} + +func (p *InvokeEvaluatorRequest) IsSetEvaluator() bool { + return p.Evaluator != nil +} + +func (p *InvokeEvaluatorRequest) IsSetInputData() bool { + return p.InputData != nil +} + +func (p *InvokeEvaluatorRequest) IsSetBase() bool { + return p.Base != nil +} + +func (p *InvokeEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 3: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorRequest[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *InvokeEvaluatorRequest) ReadField1(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.WorkspaceID = _field + return nil +} +func (p *InvokeEvaluatorRequest) ReadField2(iprot thrift.TProtocol) error { + _field := NewInvokeCustomEvaluator() + if err := _field.Read(iprot); err != nil { + return err + } + p.Evaluator = _field + return nil +} +func (p *InvokeEvaluatorRequest) ReadField3(iprot thrift.TProtocol) error { + _field := NewInvokeEvaluatorInputData() + if err := _field.Read(iprot); err != nil { + return err + } + p.InputData = _field + return nil +} +func (p *InvokeEvaluatorRequest) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBase() + if err := _field.Read(iprot); err != nil { + return err + } + p.Base = _field + return nil +} + +func (p *InvokeEvaluatorRequest) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("InvokeEvaluatorRequest"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *InvokeEvaluatorRequest) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetWorkspaceID() { + if err = oprot.WriteFieldBegin("workspace_id", thrift.I64, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.WorkspaceID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *InvokeEvaluatorRequest) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluator() { + if err = oprot.WriteFieldBegin("evaluator", thrift.STRUCT, 2); err != nil { + goto WriteFieldBeginError + } + if err := p.Evaluator.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *InvokeEvaluatorRequest) writeField3(oprot thrift.TProtocol) (err error) { + if p.IsSetInputData() { + if err = oprot.WriteFieldBegin("input_data", thrift.STRUCT, 3); err != nil { + goto WriteFieldBeginError + } + if err := p.InputData.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} +func (p *InvokeEvaluatorRequest) writeField255(oprot thrift.TProtocol) (err error) { + if p.IsSetBase() { + if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.Base.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *InvokeEvaluatorRequest) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("InvokeEvaluatorRequest(%+v)", *p) + +} + +func (p *InvokeEvaluatorRequest) DeepEqual(ano *InvokeEvaluatorRequest) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.WorkspaceID) { + return false + } + if !p.Field2DeepEqual(ano.Evaluator) { + return false + } + if !p.Field3DeepEqual(ano.InputData) { + return false + } + if !p.Field255DeepEqual(ano.Base) { + return false + } + return true +} + +func (p *InvokeEvaluatorRequest) Field1DeepEqual(src *int64) bool { + + if p.WorkspaceID == src { + return true + } else if p.WorkspaceID == nil || src == nil { + return false + } + if *p.WorkspaceID != *src { + return false + } + return true +} +func (p *InvokeEvaluatorRequest) Field2DeepEqual(src *InvokeCustomEvaluator) bool { + + if !p.Evaluator.DeepEqual(src) { + return false + } + return true +} +func (p *InvokeEvaluatorRequest) Field3DeepEqual(src *InvokeEvaluatorInputData) bool { + + if !p.InputData.DeepEqual(src) { + return false + } + return true +} +func (p *InvokeEvaluatorRequest) Field255DeepEqual(src *base.Base) bool { + + if !p.Base.DeepEqual(src) { + return false + } + return true +} + +// invoke custom evaluator response +type InvokeEvaluatorResponse struct { + OutputData *InvokeEvaluatorOutputData `thrift:"output_data,1,optional" frugal:"1,optional,InvokeEvaluatorOutputData" form:"output_data" json:"output_data,omitempty" query:"output_data"` + Status *InvokeEvaluatorRunStatus `thrift:"status,2,optional" frugal:"2,optional,InvokeEvaluatorRunStatus" form:"status" json:"status,omitempty" query:"status"` + BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` +} + +func NewInvokeEvaluatorResponse() *InvokeEvaluatorResponse { + return &InvokeEvaluatorResponse{} +} + +func (p *InvokeEvaluatorResponse) InitDefault() { +} + +var InvokeEvaluatorResponse_OutputData_DEFAULT *InvokeEvaluatorOutputData + +func (p *InvokeEvaluatorResponse) GetOutputData() (v *InvokeEvaluatorOutputData) { + if p == nil { + return + } + if !p.IsSetOutputData() { + return InvokeEvaluatorResponse_OutputData_DEFAULT + } + return p.OutputData +} + +var InvokeEvaluatorResponse_Status_DEFAULT InvokeEvaluatorRunStatus + +func (p *InvokeEvaluatorResponse) GetStatus() (v InvokeEvaluatorRunStatus) { + if p == nil { + return + } + if !p.IsSetStatus() { + return InvokeEvaluatorResponse_Status_DEFAULT + } + return *p.Status +} + +var InvokeEvaluatorResponse_BaseResp_DEFAULT *base.BaseResp + +func (p *InvokeEvaluatorResponse) GetBaseResp() (v *base.BaseResp) { + if p == nil { + return + } + if !p.IsSetBaseResp() { + return InvokeEvaluatorResponse_BaseResp_DEFAULT + } + return p.BaseResp +} +func (p *InvokeEvaluatorResponse) SetOutputData(val *InvokeEvaluatorOutputData) { + p.OutputData = val +} +func (p *InvokeEvaluatorResponse) SetStatus(val *InvokeEvaluatorRunStatus) { + p.Status = val +} +func (p *InvokeEvaluatorResponse) SetBaseResp(val *base.BaseResp) { + p.BaseResp = val +} + +var fieldIDToName_InvokeEvaluatorResponse = map[int16]string{ + 1: "output_data", + 2: "status", + 255: "BaseResp", +} + +func (p *InvokeEvaluatorResponse) IsSetOutputData() bool { + return p.OutputData != nil +} + +func (p *InvokeEvaluatorResponse) IsSetStatus() bool { + return p.Status != nil +} + +func (p *InvokeEvaluatorResponse) IsSetBaseResp() bool { + return p.BaseResp != nil +} + +func (p *InvokeEvaluatorResponse) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.I32 { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 255: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField255(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorResponse[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *InvokeEvaluatorResponse) ReadField1(iprot thrift.TProtocol) error { + _field := NewInvokeEvaluatorOutputData() + if err := _field.Read(iprot); err != nil { + return err + } + p.OutputData = _field + return nil +} +func (p *InvokeEvaluatorResponse) ReadField2(iprot thrift.TProtocol) error { + + var _field *InvokeEvaluatorRunStatus + if v, err := iprot.ReadI32(); err != nil { + return err + } else { + tmp := InvokeEvaluatorRunStatus(v) + _field = &tmp + } + p.Status = _field + return nil +} +func (p *InvokeEvaluatorResponse) ReadField255(iprot thrift.TProtocol) error { + _field := base.NewBaseResp() + if err := _field.Read(iprot); err != nil { + return err + } + p.BaseResp = _field + return nil +} + +func (p *InvokeEvaluatorResponse) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("InvokeEvaluatorResponse"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField255(oprot); err != nil { + fieldId = 255 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *InvokeEvaluatorResponse) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetOutputData() { + if err = oprot.WriteFieldBegin("output_data", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.OutputData.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *InvokeEvaluatorResponse) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetStatus() { + if err = oprot.WriteFieldBegin("status", thrift.I32, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI32(int32(*p.Status)); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *InvokeEvaluatorResponse) writeField255(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { + goto WriteFieldBeginError + } + if err := p.BaseResp.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) +} + +func (p *InvokeEvaluatorResponse) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("InvokeEvaluatorResponse(%+v)", *p) + +} + +func (p *InvokeEvaluatorResponse) DeepEqual(ano *InvokeEvaluatorResponse) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.OutputData) { + return false + } + if !p.Field2DeepEqual(ano.Status) { + return false + } + if !p.Field255DeepEqual(ano.BaseResp) { + return false + } + return true +} + +func (p *InvokeEvaluatorResponse) Field1DeepEqual(src *InvokeEvaluatorOutputData) bool { + + if !p.OutputData.DeepEqual(src) { + return false + } + return true +} +func (p *InvokeEvaluatorResponse) Field2DeepEqual(src *InvokeEvaluatorRunStatus) bool { + + if p.Status == src { + return true + } else if p.Status == nil || src == nil { + return false + } + if *p.Status != *src { + return false + } + return true +} +func (p *InvokeEvaluatorResponse) Field255DeepEqual(src *base.BaseResp) bool { + + if !p.BaseResp.DeepEqual(src) { + return false + } + return true +} + +type EvaluationSPIService interface { + SearchEvalTarget(ctx context.Context, req *SearchEvalTargetRequest) (r *SearchEvalTargetResponse, err error) + + InvokeEvalTarget(ctx context.Context, req *InvokeEvalTargetRequest) (r *InvokeEvalTargetResponse, err error) + + AsyncInvokeEvalTarget(ctx context.Context, req *AsyncInvokeEvalTargetRequest) (r *AsyncInvokeEvalTargetResponse, err error) + // invoke custom evaluator + InvokeEvaluator(ctx context.Context, req *InvokeEvaluatorRequest) (r *InvokeEvaluatorResponse, err error) +} + +type EvaluationSPIServiceClient struct { + c thrift.TClient +} + +func NewEvaluationSPIServiceClientFactory(t thrift.TTransport, f thrift.TProtocolFactory) *EvaluationSPIServiceClient { + return &EvaluationSPIServiceClient{ + c: thrift.NewTStandardClient(f.GetProtocol(t), f.GetProtocol(t)), + } +} + +func NewEvaluationSPIServiceClientProtocol(t thrift.TTransport, iprot thrift.TProtocol, oprot thrift.TProtocol) *EvaluationSPIServiceClient { + return &EvaluationSPIServiceClient{ + c: thrift.NewTStandardClient(iprot, oprot), + } +} + +func NewEvaluationSPIServiceClient(c thrift.TClient) *EvaluationSPIServiceClient { + return &EvaluationSPIServiceClient{ + c: c, + } +} + +func (p *EvaluationSPIServiceClient) Client_() thrift.TClient { + return p.c +} + +func (p *EvaluationSPIServiceClient) SearchEvalTarget(ctx context.Context, req *SearchEvalTargetRequest) (r *SearchEvalTargetResponse, err error) { + var _args EvaluationSPIServiceSearchEvalTargetArgs + _args.Req = req + var _result EvaluationSPIServiceSearchEvalTargetResult + if err = p.Client_().Call(ctx, "SearchEvalTarget", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluationSPIServiceClient) InvokeEvalTarget(ctx context.Context, req *InvokeEvalTargetRequest) (r *InvokeEvalTargetResponse, err error) { + var _args EvaluationSPIServiceInvokeEvalTargetArgs + _args.Req = req + var _result EvaluationSPIServiceInvokeEvalTargetResult + if err = p.Client_().Call(ctx, "InvokeEvalTarget", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluationSPIServiceClient) AsyncInvokeEvalTarget(ctx context.Context, req *AsyncInvokeEvalTargetRequest) (r *AsyncInvokeEvalTargetResponse, err error) { + var _args EvaluationSPIServiceAsyncInvokeEvalTargetArgs + _args.Req = req + var _result EvaluationSPIServiceAsyncInvokeEvalTargetResult + if err = p.Client_().Call(ctx, "AsyncInvokeEvalTarget", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} +func (p *EvaluationSPIServiceClient) InvokeEvaluator(ctx context.Context, req *InvokeEvaluatorRequest) (r *InvokeEvaluatorResponse, err error) { + var _args EvaluationSPIServiceInvokeEvaluatorArgs + _args.Req = req + var _result EvaluationSPIServiceInvokeEvaluatorResult + if err = p.Client_().Call(ctx, "InvokeEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + +type EvaluationSPIServiceProcessor struct { + processorMap map[string]thrift.TProcessorFunction + handler EvaluationSPIService +} + +func (p *EvaluationSPIServiceProcessor) AddToProcessorMap(key string, processor thrift.TProcessorFunction) { + p.processorMap[key] = processor +} + +func (p *EvaluationSPIServiceProcessor) GetProcessorFunction(key string) (processor thrift.TProcessorFunction, ok bool) { + processor, ok = p.processorMap[key] + return processor, ok +} + +func (p *EvaluationSPIServiceProcessor) ProcessorMap() map[string]thrift.TProcessorFunction { + return p.processorMap +} + +func NewEvaluationSPIServiceProcessor(handler EvaluationSPIService) *EvaluationSPIServiceProcessor { + self := &EvaluationSPIServiceProcessor{handler: handler, processorMap: make(map[string]thrift.TProcessorFunction)} + self.AddToProcessorMap("SearchEvalTarget", &evaluationSPIServiceProcessorSearchEvalTarget{handler: handler}) + self.AddToProcessorMap("InvokeEvalTarget", &evaluationSPIServiceProcessorInvokeEvalTarget{handler: handler}) + self.AddToProcessorMap("AsyncInvokeEvalTarget", &evaluationSPIServiceProcessorAsyncInvokeEvalTarget{handler: handler}) + self.AddToProcessorMap("InvokeEvaluator", &evaluationSPIServiceProcessorInvokeEvaluator{handler: handler}) + return self +} +func (p *EvaluationSPIServiceProcessor) Process(ctx context.Context, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + name, _, seqId, err := iprot.ReadMessageBegin() + if err != nil { + return false, err + } + if processor, ok := p.GetProcessorFunction(name); ok { + return processor.Process(ctx, seqId, iprot, oprot) + } + iprot.Skip(thrift.STRUCT) + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, "Unknown function "+name) + oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, x +} + +type evaluationSPIServiceProcessorSearchEvalTarget struct { + handler EvaluationSPIService +} + +func (p *evaluationSPIServiceProcessorSearchEvalTarget) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluationSPIServiceSearchEvalTargetArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("SearchEvalTarget", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluationSPIServiceSearchEvalTargetResult{} + var retval *SearchEvalTargetResponse + if retval, err2 = p.handler.SearchEvalTarget(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing SearchEvalTarget: "+err2.Error()) + oprot.WriteMessageBegin("SearchEvalTarget", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("SearchEvalTarget", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluationSPIServiceProcessorInvokeEvalTarget struct { + handler EvaluationSPIService +} + +func (p *evaluationSPIServiceProcessorInvokeEvalTarget) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluationSPIServiceInvokeEvalTargetArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("InvokeEvalTarget", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluationSPIServiceInvokeEvalTargetResult{} + var retval *InvokeEvalTargetResponse + if retval, err2 = p.handler.InvokeEvalTarget(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing InvokeEvalTarget: "+err2.Error()) + oprot.WriteMessageBegin("InvokeEvalTarget", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("InvokeEvalTarget", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluationSPIServiceProcessorAsyncInvokeEvalTarget struct { + handler EvaluationSPIService +} + +func (p *evaluationSPIServiceProcessorAsyncInvokeEvalTarget) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluationSPIServiceAsyncInvokeEvalTargetArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("AsyncInvokeEvalTarget", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluationSPIServiceAsyncInvokeEvalTargetResult{} + var retval *AsyncInvokeEvalTargetResponse + if retval, err2 = p.handler.AsyncInvokeEvalTarget(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing AsyncInvokeEvalTarget: "+err2.Error()) + oprot.WriteMessageBegin("AsyncInvokeEvalTarget", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("AsyncInvokeEvalTarget", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type evaluationSPIServiceProcessorInvokeEvaluator struct { + handler EvaluationSPIService +} + +func (p *evaluationSPIServiceProcessorInvokeEvaluator) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluationSPIServiceInvokeEvaluatorArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("InvokeEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluationSPIServiceInvokeEvaluatorResult{} + var retval *InvokeEvaluatorResponse + if retval, err2 = p.handler.InvokeEvaluator(ctx, args.Req); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing InvokeEvaluator: "+err2.Error()) + oprot.WriteMessageBegin("InvokeEvaluator", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("InvokeEvaluator", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + +type EvaluationSPIServiceSearchEvalTargetArgs struct { + Req *SearchEvalTargetRequest `thrift:"req,1" frugal:"1,default,SearchEvalTargetRequest"` +} + +func NewEvaluationSPIServiceSearchEvalTargetArgs() *EvaluationSPIServiceSearchEvalTargetArgs { + return &EvaluationSPIServiceSearchEvalTargetArgs{} +} + +func (p *EvaluationSPIServiceSearchEvalTargetArgs) InitDefault() { +} + +var EvaluationSPIServiceSearchEvalTargetArgs_Req_DEFAULT *SearchEvalTargetRequest + +func (p *EvaluationSPIServiceSearchEvalTargetArgs) GetReq() (v *SearchEvalTargetRequest) { + if p == nil { + return + } + if !p.IsSetReq() { + return EvaluationSPIServiceSearchEvalTargetArgs_Req_DEFAULT + } + return p.Req +} +func (p *EvaluationSPIServiceSearchEvalTargetArgs) SetReq(val *SearchEvalTargetRequest) { + p.Req = val +} + +var fieldIDToName_EvaluationSPIServiceSearchEvalTargetArgs = map[int16]string{ + 1: "req", +} + +func (p *EvaluationSPIServiceSearchEvalTargetArgs) IsSetReq() bool { + return p.Req != nil +} + +func (p *EvaluationSPIServiceSearchEvalTargetArgs) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceSearchEvalTargetArgs[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluationSPIServiceSearchEvalTargetArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewSearchEvalTargetRequest() + if err := _field.Read(iprot); err != nil { + return err + } + p.Req = _field + return nil +} + +func (p *EvaluationSPIServiceSearchEvalTargetArgs) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("SearchEvalTarget_args"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluationSPIServiceSearchEvalTargetArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.Req.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} + +func (p *EvaluationSPIServiceSearchEvalTargetArgs) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluationSPIServiceSearchEvalTargetArgs(%+v)", *p) + +} + +func (p *EvaluationSPIServiceSearchEvalTargetArgs) DeepEqual(ano *EvaluationSPIServiceSearchEvalTargetArgs) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Req) { + return false + } + return true +} + +func (p *EvaluationSPIServiceSearchEvalTargetArgs) Field1DeepEqual(src *SearchEvalTargetRequest) bool { + + if !p.Req.DeepEqual(src) { + return false + } + return true +} + +type EvaluationSPIServiceSearchEvalTargetResult struct { + Success *SearchEvalTargetResponse `thrift:"success,0,optional" frugal:"0,optional,SearchEvalTargetResponse"` +} + +func NewEvaluationSPIServiceSearchEvalTargetResult() *EvaluationSPIServiceSearchEvalTargetResult { + return &EvaluationSPIServiceSearchEvalTargetResult{} +} + +func (p *EvaluationSPIServiceSearchEvalTargetResult) InitDefault() { +} + +var EvaluationSPIServiceSearchEvalTargetResult_Success_DEFAULT *SearchEvalTargetResponse + +func (p *EvaluationSPIServiceSearchEvalTargetResult) GetSuccess() (v *SearchEvalTargetResponse) { + if p == nil { + return + } + if !p.IsSetSuccess() { + return EvaluationSPIServiceSearchEvalTargetResult_Success_DEFAULT + } + return p.Success +} +func (p *EvaluationSPIServiceSearchEvalTargetResult) SetSuccess(x interface{}) { + p.Success = x.(*SearchEvalTargetResponse) +} + +var fieldIDToName_EvaluationSPIServiceSearchEvalTargetResult = map[int16]string{ + 0: "success", +} + +func (p *EvaluationSPIServiceSearchEvalTargetResult) IsSetSuccess() bool { + return p.Success != nil +} + +func (p *EvaluationSPIServiceSearchEvalTargetResult) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField0(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceSearchEvalTargetResult[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluationSPIServiceSearchEvalTargetResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewSearchEvalTargetResponse() + if err := _field.Read(iprot); err != nil { + return err + } + p.Success = _field + return nil +} + +func (p *EvaluationSPIServiceSearchEvalTargetResult) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("SearchEvalTarget_result"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField0(oprot); err != nil { + fieldId = 0 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluationSPIServiceSearchEvalTargetResult) writeField0(oprot thrift.TProtocol) (err error) { + if p.IsSetSuccess() { + if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { + goto WriteFieldBeginError + } + if err := p.Success.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) +} + +func (p *EvaluationSPIServiceSearchEvalTargetResult) String() string { + if p == nil { + return "" } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 + return fmt.Sprintf("EvaluationSPIServiceSearchEvalTargetResult(%+v)", *p) + +} + +func (p *EvaluationSPIServiceSearchEvalTargetResult) DeepEqual(ano *EvaluationSPIServiceSearchEvalTargetResult) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false } - if err2 = oprot.Flush(ctx); err == nil && err2 != nil { - err = err2 + if !p.Field0DeepEqual(ano.Success) { + return false } - if err != nil { - return + return true +} + +func (p *EvaluationSPIServiceSearchEvalTargetResult) Field0DeepEqual(src *SearchEvalTargetResponse) bool { + + if !p.Success.DeepEqual(src) { + return false } - return true, err + return true } -type EvaluationSPIServiceSearchEvalTargetArgs struct { - Req *SearchEvalTargetRequest `thrift:"req,1" frugal:"1,default,SearchEvalTargetRequest"` +type EvaluationSPIServiceInvokeEvalTargetArgs struct { + Req *InvokeEvalTargetRequest `thrift:"req,1" frugal:"1,default,InvokeEvalTargetRequest"` } -func NewEvaluationSPIServiceSearchEvalTargetArgs() *EvaluationSPIServiceSearchEvalTargetArgs { - return &EvaluationSPIServiceSearchEvalTargetArgs{} +func NewEvaluationSPIServiceInvokeEvalTargetArgs() *EvaluationSPIServiceInvokeEvalTargetArgs { + return &EvaluationSPIServiceInvokeEvalTargetArgs{} } -func (p *EvaluationSPIServiceSearchEvalTargetArgs) InitDefault() { +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) InitDefault() { } -var EvaluationSPIServiceSearchEvalTargetArgs_Req_DEFAULT *SearchEvalTargetRequest +var EvaluationSPIServiceInvokeEvalTargetArgs_Req_DEFAULT *InvokeEvalTargetRequest -func (p *EvaluationSPIServiceSearchEvalTargetArgs) GetReq() (v *SearchEvalTargetRequest) { +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) GetReq() (v *InvokeEvalTargetRequest) { if p == nil { return } if !p.IsSetReq() { - return EvaluationSPIServiceSearchEvalTargetArgs_Req_DEFAULT + return EvaluationSPIServiceInvokeEvalTargetArgs_Req_DEFAULT } return p.Req } -func (p *EvaluationSPIServiceSearchEvalTargetArgs) SetReq(val *SearchEvalTargetRequest) { +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) SetReq(val *InvokeEvalTargetRequest) { p.Req = val } -var fieldIDToName_EvaluationSPIServiceSearchEvalTargetArgs = map[int16]string{ +var fieldIDToName_EvaluationSPIServiceInvokeEvalTargetArgs = map[int16]string{ 1: "req", } -func (p *EvaluationSPIServiceSearchEvalTargetArgs) IsSetReq() bool { +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) IsSetReq() bool { return p.Req != nil } -func (p *EvaluationSPIServiceSearchEvalTargetArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -4718,7 +7363,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceSearchEvalTargetArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceInvokeEvalTargetArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -4728,8 +7373,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluationSPIServiceSearchEvalTargetArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewSearchEvalTargetRequest() +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewInvokeEvalTargetRequest() if err := _field.Read(iprot); err != nil { return err } @@ -4737,9 +7382,9 @@ func (p *EvaluationSPIServiceSearchEvalTargetArgs) ReadField1(iprot thrift.TProt return nil } -func (p *EvaluationSPIServiceSearchEvalTargetArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("SearchEvalTarget_args"); err != nil { + if err = oprot.WriteStructBegin("InvokeEvalTarget_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -4765,7 +7410,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluationSPIServiceSearchEvalTargetArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -4782,15 +7427,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluationSPIServiceSearchEvalTargetArgs) String() string { +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluationSPIServiceSearchEvalTargetArgs(%+v)", *p) + return fmt.Sprintf("EvaluationSPIServiceInvokeEvalTargetArgs(%+v)", *p) } -func (p *EvaluationSPIServiceSearchEvalTargetArgs) DeepEqual(ano *EvaluationSPIServiceSearchEvalTargetArgs) bool { +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) DeepEqual(ano *EvaluationSPIServiceInvokeEvalTargetArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -4802,7 +7447,7 @@ func (p *EvaluationSPIServiceSearchEvalTargetArgs) DeepEqual(ano *EvaluationSPIS return true } -func (p *EvaluationSPIServiceSearchEvalTargetArgs) Field1DeepEqual(src *SearchEvalTargetRequest) bool { +func (p *EvaluationSPIServiceInvokeEvalTargetArgs) Field1DeepEqual(src *InvokeEvalTargetRequest) bool { if !p.Req.DeepEqual(src) { return false @@ -4810,41 +7455,41 @@ func (p *EvaluationSPIServiceSearchEvalTargetArgs) Field1DeepEqual(src *SearchEv return true } -type EvaluationSPIServiceSearchEvalTargetResult struct { - Success *SearchEvalTargetResponse `thrift:"success,0,optional" frugal:"0,optional,SearchEvalTargetResponse"` +type EvaluationSPIServiceInvokeEvalTargetResult struct { + Success *InvokeEvalTargetResponse `thrift:"success,0,optional" frugal:"0,optional,InvokeEvalTargetResponse"` } -func NewEvaluationSPIServiceSearchEvalTargetResult() *EvaluationSPIServiceSearchEvalTargetResult { - return &EvaluationSPIServiceSearchEvalTargetResult{} +func NewEvaluationSPIServiceInvokeEvalTargetResult() *EvaluationSPIServiceInvokeEvalTargetResult { + return &EvaluationSPIServiceInvokeEvalTargetResult{} } -func (p *EvaluationSPIServiceSearchEvalTargetResult) InitDefault() { +func (p *EvaluationSPIServiceInvokeEvalTargetResult) InitDefault() { } -var EvaluationSPIServiceSearchEvalTargetResult_Success_DEFAULT *SearchEvalTargetResponse +var EvaluationSPIServiceInvokeEvalTargetResult_Success_DEFAULT *InvokeEvalTargetResponse -func (p *EvaluationSPIServiceSearchEvalTargetResult) GetSuccess() (v *SearchEvalTargetResponse) { +func (p *EvaluationSPIServiceInvokeEvalTargetResult) GetSuccess() (v *InvokeEvalTargetResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluationSPIServiceSearchEvalTargetResult_Success_DEFAULT + return EvaluationSPIServiceInvokeEvalTargetResult_Success_DEFAULT } return p.Success } -func (p *EvaluationSPIServiceSearchEvalTargetResult) SetSuccess(x interface{}) { - p.Success = x.(*SearchEvalTargetResponse) +func (p *EvaluationSPIServiceInvokeEvalTargetResult) SetSuccess(x interface{}) { + p.Success = x.(*InvokeEvalTargetResponse) } -var fieldIDToName_EvaluationSPIServiceSearchEvalTargetResult = map[int16]string{ +var fieldIDToName_EvaluationSPIServiceInvokeEvalTargetResult = map[int16]string{ 0: "success", } -func (p *EvaluationSPIServiceSearchEvalTargetResult) IsSetSuccess() bool { +func (p *EvaluationSPIServiceInvokeEvalTargetResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluationSPIServiceSearchEvalTargetResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvalTargetResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -4889,7 +7534,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceSearchEvalTargetResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceInvokeEvalTargetResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -4899,8 +7544,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluationSPIServiceSearchEvalTargetResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewSearchEvalTargetResponse() +func (p *EvaluationSPIServiceInvokeEvalTargetResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewInvokeEvalTargetResponse() if err := _field.Read(iprot); err != nil { return err } @@ -4908,9 +7553,9 @@ func (p *EvaluationSPIServiceSearchEvalTargetResult) ReadField0(iprot thrift.TPr return nil } -func (p *EvaluationSPIServiceSearchEvalTargetResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvalTargetResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("SearchEvalTarget_result"); err != nil { + if err = oprot.WriteStructBegin("InvokeEvalTarget_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -4936,7 +7581,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluationSPIServiceSearchEvalTargetResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvalTargetResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -4955,15 +7600,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluationSPIServiceSearchEvalTargetResult) String() string { +func (p *EvaluationSPIServiceInvokeEvalTargetResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluationSPIServiceSearchEvalTargetResult(%+v)", *p) + return fmt.Sprintf("EvaluationSPIServiceInvokeEvalTargetResult(%+v)", *p) } -func (p *EvaluationSPIServiceSearchEvalTargetResult) DeepEqual(ano *EvaluationSPIServiceSearchEvalTargetResult) bool { +func (p *EvaluationSPIServiceInvokeEvalTargetResult) DeepEqual(ano *EvaluationSPIServiceInvokeEvalTargetResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -4975,7 +7620,7 @@ func (p *EvaluationSPIServiceSearchEvalTargetResult) DeepEqual(ano *EvaluationSP return true } -func (p *EvaluationSPIServiceSearchEvalTargetResult) Field0DeepEqual(src *SearchEvalTargetResponse) bool { +func (p *EvaluationSPIServiceInvokeEvalTargetResult) Field0DeepEqual(src *InvokeEvalTargetResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -4983,41 +7628,41 @@ func (p *EvaluationSPIServiceSearchEvalTargetResult) Field0DeepEqual(src *Search return true } -type EvaluationSPIServiceInvokeEvalTargetArgs struct { - Req *InvokeEvalTargetRequest `thrift:"req,1" frugal:"1,default,InvokeEvalTargetRequest"` +type EvaluationSPIServiceAsyncInvokeEvalTargetArgs struct { + Req *AsyncInvokeEvalTargetRequest `thrift:"req,1" frugal:"1,default,AsyncInvokeEvalTargetRequest"` } -func NewEvaluationSPIServiceInvokeEvalTargetArgs() *EvaluationSPIServiceInvokeEvalTargetArgs { - return &EvaluationSPIServiceInvokeEvalTargetArgs{} +func NewEvaluationSPIServiceAsyncInvokeEvalTargetArgs() *EvaluationSPIServiceAsyncInvokeEvalTargetArgs { + return &EvaluationSPIServiceAsyncInvokeEvalTargetArgs{} } -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) InitDefault() { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) InitDefault() { } -var EvaluationSPIServiceInvokeEvalTargetArgs_Req_DEFAULT *InvokeEvalTargetRequest +var EvaluationSPIServiceAsyncInvokeEvalTargetArgs_Req_DEFAULT *AsyncInvokeEvalTargetRequest -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) GetReq() (v *InvokeEvalTargetRequest) { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) GetReq() (v *AsyncInvokeEvalTargetRequest) { if p == nil { return } if !p.IsSetReq() { - return EvaluationSPIServiceInvokeEvalTargetArgs_Req_DEFAULT + return EvaluationSPIServiceAsyncInvokeEvalTargetArgs_Req_DEFAULT } return p.Req } -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) SetReq(val *InvokeEvalTargetRequest) { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) SetReq(val *AsyncInvokeEvalTargetRequest) { p.Req = val } -var fieldIDToName_EvaluationSPIServiceInvokeEvalTargetArgs = map[int16]string{ +var fieldIDToName_EvaluationSPIServiceAsyncInvokeEvalTargetArgs = map[int16]string{ 1: "req", } -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) IsSetReq() bool { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) IsSetReq() bool { return p.Req != nil } -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -5062,7 +7707,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceInvokeEvalTargetArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceAsyncInvokeEvalTargetArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -5072,8 +7717,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewInvokeEvalTargetRequest() +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewAsyncInvokeEvalTargetRequest() if err := _field.Read(iprot); err != nil { return err } @@ -5081,9 +7726,9 @@ func (p *EvaluationSPIServiceInvokeEvalTargetArgs) ReadField1(iprot thrift.TProt return nil } -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("InvokeEvalTarget_args"); err != nil { + if err = oprot.WriteStructBegin("AsyncInvokeEvalTarget_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -5109,7 +7754,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -5126,15 +7771,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) String() string { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluationSPIServiceInvokeEvalTargetArgs(%+v)", *p) + return fmt.Sprintf("EvaluationSPIServiceAsyncInvokeEvalTargetArgs(%+v)", *p) } -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) DeepEqual(ano *EvaluationSPIServiceInvokeEvalTargetArgs) bool { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) DeepEqual(ano *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -5146,7 +7791,7 @@ func (p *EvaluationSPIServiceInvokeEvalTargetArgs) DeepEqual(ano *EvaluationSPIS return true } -func (p *EvaluationSPIServiceInvokeEvalTargetArgs) Field1DeepEqual(src *InvokeEvalTargetRequest) bool { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) Field1DeepEqual(src *AsyncInvokeEvalTargetRequest) bool { if !p.Req.DeepEqual(src) { return false @@ -5154,41 +7799,41 @@ func (p *EvaluationSPIServiceInvokeEvalTargetArgs) Field1DeepEqual(src *InvokeEv return true } -type EvaluationSPIServiceInvokeEvalTargetResult struct { - Success *InvokeEvalTargetResponse `thrift:"success,0,optional" frugal:"0,optional,InvokeEvalTargetResponse"` +type EvaluationSPIServiceAsyncInvokeEvalTargetResult struct { + Success *AsyncInvokeEvalTargetResponse `thrift:"success,0,optional" frugal:"0,optional,AsyncInvokeEvalTargetResponse"` } -func NewEvaluationSPIServiceInvokeEvalTargetResult() *EvaluationSPIServiceInvokeEvalTargetResult { - return &EvaluationSPIServiceInvokeEvalTargetResult{} +func NewEvaluationSPIServiceAsyncInvokeEvalTargetResult() *EvaluationSPIServiceAsyncInvokeEvalTargetResult { + return &EvaluationSPIServiceAsyncInvokeEvalTargetResult{} } -func (p *EvaluationSPIServiceInvokeEvalTargetResult) InitDefault() { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) InitDefault() { } -var EvaluationSPIServiceInvokeEvalTargetResult_Success_DEFAULT *InvokeEvalTargetResponse +var EvaluationSPIServiceAsyncInvokeEvalTargetResult_Success_DEFAULT *AsyncInvokeEvalTargetResponse -func (p *EvaluationSPIServiceInvokeEvalTargetResult) GetSuccess() (v *InvokeEvalTargetResponse) { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) GetSuccess() (v *AsyncInvokeEvalTargetResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluationSPIServiceInvokeEvalTargetResult_Success_DEFAULT + return EvaluationSPIServiceAsyncInvokeEvalTargetResult_Success_DEFAULT } return p.Success } -func (p *EvaluationSPIServiceInvokeEvalTargetResult) SetSuccess(x interface{}) { - p.Success = x.(*InvokeEvalTargetResponse) +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) SetSuccess(x interface{}) { + p.Success = x.(*AsyncInvokeEvalTargetResponse) } -var fieldIDToName_EvaluationSPIServiceInvokeEvalTargetResult = map[int16]string{ +var fieldIDToName_EvaluationSPIServiceAsyncInvokeEvalTargetResult = map[int16]string{ 0: "success", } -func (p *EvaluationSPIServiceInvokeEvalTargetResult) IsSetSuccess() bool { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluationSPIServiceInvokeEvalTargetResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -5233,7 +7878,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceInvokeEvalTargetResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceAsyncInvokeEvalTargetResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -5243,8 +7888,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluationSPIServiceInvokeEvalTargetResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewInvokeEvalTargetResponse() +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewAsyncInvokeEvalTargetResponse() if err := _field.Read(iprot); err != nil { return err } @@ -5252,9 +7897,9 @@ func (p *EvaluationSPIServiceInvokeEvalTargetResult) ReadField0(iprot thrift.TPr return nil } -func (p *EvaluationSPIServiceInvokeEvalTargetResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("InvokeEvalTarget_result"); err != nil { + if err = oprot.WriteStructBegin("AsyncInvokeEvalTarget_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -5280,7 +7925,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluationSPIServiceInvokeEvalTargetResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -5299,15 +7944,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluationSPIServiceInvokeEvalTargetResult) String() string { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluationSPIServiceInvokeEvalTargetResult(%+v)", *p) + return fmt.Sprintf("EvaluationSPIServiceAsyncInvokeEvalTargetResult(%+v)", *p) } -func (p *EvaluationSPIServiceInvokeEvalTargetResult) DeepEqual(ano *EvaluationSPIServiceInvokeEvalTargetResult) bool { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) DeepEqual(ano *EvaluationSPIServiceAsyncInvokeEvalTargetResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -5319,7 +7964,7 @@ func (p *EvaluationSPIServiceInvokeEvalTargetResult) DeepEqual(ano *EvaluationSP return true } -func (p *EvaluationSPIServiceInvokeEvalTargetResult) Field0DeepEqual(src *InvokeEvalTargetResponse) bool { +func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) Field0DeepEqual(src *AsyncInvokeEvalTargetResponse) bool { if !p.Success.DeepEqual(src) { return false @@ -5327,41 +7972,41 @@ func (p *EvaluationSPIServiceInvokeEvalTargetResult) Field0DeepEqual(src *Invoke return true } -type EvaluationSPIServiceAsyncInvokeEvalTargetArgs struct { - Req *AsyncInvokeEvalTargetRequest `thrift:"req,1" frugal:"1,default,AsyncInvokeEvalTargetRequest"` +type EvaluationSPIServiceInvokeEvaluatorArgs struct { + Req *InvokeEvaluatorRequest `thrift:"req,1" frugal:"1,default,InvokeEvaluatorRequest"` } -func NewEvaluationSPIServiceAsyncInvokeEvalTargetArgs() *EvaluationSPIServiceAsyncInvokeEvalTargetArgs { - return &EvaluationSPIServiceAsyncInvokeEvalTargetArgs{} +func NewEvaluationSPIServiceInvokeEvaluatorArgs() *EvaluationSPIServiceInvokeEvaluatorArgs { + return &EvaluationSPIServiceInvokeEvaluatorArgs{} } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) InitDefault() { +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) InitDefault() { } -var EvaluationSPIServiceAsyncInvokeEvalTargetArgs_Req_DEFAULT *AsyncInvokeEvalTargetRequest +var EvaluationSPIServiceInvokeEvaluatorArgs_Req_DEFAULT *InvokeEvaluatorRequest -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) GetReq() (v *AsyncInvokeEvalTargetRequest) { +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) GetReq() (v *InvokeEvaluatorRequest) { if p == nil { return } if !p.IsSetReq() { - return EvaluationSPIServiceAsyncInvokeEvalTargetArgs_Req_DEFAULT + return EvaluationSPIServiceInvokeEvaluatorArgs_Req_DEFAULT } return p.Req } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) SetReq(val *AsyncInvokeEvalTargetRequest) { +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) SetReq(val *InvokeEvaluatorRequest) { p.Req = val } -var fieldIDToName_EvaluationSPIServiceAsyncInvokeEvalTargetArgs = map[int16]string{ +var fieldIDToName_EvaluationSPIServiceInvokeEvaluatorArgs = map[int16]string{ 1: "req", } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) IsSetReq() bool { +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) IsSetReq() bool { return p.Req != nil } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -5406,7 +8051,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceAsyncInvokeEvalTargetArgs[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceInvokeEvaluatorArgs[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -5416,8 +8061,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) ReadField1(iprot thrift.TProtocol) error { - _field := NewAsyncInvokeEvalTargetRequest() +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) ReadField1(iprot thrift.TProtocol) error { + _field := NewInvokeEvaluatorRequest() if err := _field.Read(iprot); err != nil { return err } @@ -5425,9 +8070,9 @@ func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) ReadField1(iprot thrift. return nil } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("AsyncInvokeEvalTarget_args"); err != nil { + if err = oprot.WriteStructBegin("InvokeEvaluator_args"); err != nil { goto WriteStructBeginError } if p != nil { @@ -5453,7 +8098,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) writeField1(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("req", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError } @@ -5470,15 +8115,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) String() string { +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluationSPIServiceAsyncInvokeEvalTargetArgs(%+v)", *p) + return fmt.Sprintf("EvaluationSPIServiceInvokeEvaluatorArgs(%+v)", *p) } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) DeepEqual(ano *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) bool { +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) DeepEqual(ano *EvaluationSPIServiceInvokeEvaluatorArgs) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -5490,7 +8135,7 @@ func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) DeepEqual(ano *Evaluatio return true } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) Field1DeepEqual(src *AsyncInvokeEvalTargetRequest) bool { +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) Field1DeepEqual(src *InvokeEvaluatorRequest) bool { if !p.Req.DeepEqual(src) { return false @@ -5498,41 +8143,41 @@ func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) Field1DeepEqual(src *Asy return true } -type EvaluationSPIServiceAsyncInvokeEvalTargetResult struct { - Success *AsyncInvokeEvalTargetResponse `thrift:"success,0,optional" frugal:"0,optional,AsyncInvokeEvalTargetResponse"` +type EvaluationSPIServiceInvokeEvaluatorResult struct { + Success *InvokeEvaluatorResponse `thrift:"success,0,optional" frugal:"0,optional,InvokeEvaluatorResponse"` } -func NewEvaluationSPIServiceAsyncInvokeEvalTargetResult() *EvaluationSPIServiceAsyncInvokeEvalTargetResult { - return &EvaluationSPIServiceAsyncInvokeEvalTargetResult{} +func NewEvaluationSPIServiceInvokeEvaluatorResult() *EvaluationSPIServiceInvokeEvaluatorResult { + return &EvaluationSPIServiceInvokeEvaluatorResult{} } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) InitDefault() { +func (p *EvaluationSPIServiceInvokeEvaluatorResult) InitDefault() { } -var EvaluationSPIServiceAsyncInvokeEvalTargetResult_Success_DEFAULT *AsyncInvokeEvalTargetResponse +var EvaluationSPIServiceInvokeEvaluatorResult_Success_DEFAULT *InvokeEvaluatorResponse -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) GetSuccess() (v *AsyncInvokeEvalTargetResponse) { +func (p *EvaluationSPIServiceInvokeEvaluatorResult) GetSuccess() (v *InvokeEvaluatorResponse) { if p == nil { return } if !p.IsSetSuccess() { - return EvaluationSPIServiceAsyncInvokeEvalTargetResult_Success_DEFAULT + return EvaluationSPIServiceInvokeEvaluatorResult_Success_DEFAULT } return p.Success } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) SetSuccess(x interface{}) { - p.Success = x.(*AsyncInvokeEvalTargetResponse) +func (p *EvaluationSPIServiceInvokeEvaluatorResult) SetSuccess(x interface{}) { + p.Success = x.(*InvokeEvaluatorResponse) } -var fieldIDToName_EvaluationSPIServiceAsyncInvokeEvalTargetResult = map[int16]string{ +var fieldIDToName_EvaluationSPIServiceInvokeEvaluatorResult = map[int16]string{ 0: "success", } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) IsSetSuccess() bool { +func (p *EvaluationSPIServiceInvokeEvaluatorResult) IsSetSuccess() bool { return p.Success != nil } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) Read(iprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvaluatorResult) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -5577,7 +8222,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceAsyncInvokeEvalTargetResult[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceInvokeEvaluatorResult[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -5587,8 +8232,8 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) ReadField0(iprot thrift.TProtocol) error { - _field := NewAsyncInvokeEvalTargetResponse() +func (p *EvaluationSPIServiceInvokeEvaluatorResult) ReadField0(iprot thrift.TProtocol) error { + _field := NewInvokeEvaluatorResponse() if err := _field.Read(iprot); err != nil { return err } @@ -5596,9 +8241,9 @@ func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) ReadField0(iprot thrif return nil } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) Write(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvaluatorResult) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("AsyncInvokeEvalTarget_result"); err != nil { + if err = oprot.WriteStructBegin("InvokeEvaluator_result"); err != nil { goto WriteStructBeginError } if p != nil { @@ -5624,7 +8269,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) writeField0(oprot thrift.TProtocol) (err error) { +func (p *EvaluationSPIServiceInvokeEvaluatorResult) writeField0(oprot thrift.TProtocol) (err error) { if p.IsSetSuccess() { if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { goto WriteFieldBeginError @@ -5643,15 +8288,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) String() string { +func (p *EvaluationSPIServiceInvokeEvaluatorResult) String() string { if p == nil { return "" } - return fmt.Sprintf("EvaluationSPIServiceAsyncInvokeEvalTargetResult(%+v)", *p) + return fmt.Sprintf("EvaluationSPIServiceInvokeEvaluatorResult(%+v)", *p) } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) DeepEqual(ano *EvaluationSPIServiceAsyncInvokeEvalTargetResult) bool { +func (p *EvaluationSPIServiceInvokeEvaluatorResult) DeepEqual(ano *EvaluationSPIServiceInvokeEvaluatorResult) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -5663,7 +8308,7 @@ func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) DeepEqual(ano *Evaluat return true } -func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) Field0DeepEqual(src *AsyncInvokeEvalTargetResponse) bool { +func (p *EvaluationSPIServiceInvokeEvaluatorResult) Field0DeepEqual(src *InvokeEvaluatorResponse) bool { if !p.Success.DeepEqual(src) { return false diff --git a/backend/kitex_gen/coze/loop/evaluation/spi/coze.loop.evaluation.spi_validator.go b/backend/kitex_gen/coze/loop/evaluation/spi/coze.loop.evaluation.spi_validator.go index 1fd02ed04..45323eb51 100644 --- a/backend/kitex_gen/coze/loop/evaluation/spi/coze.loop.evaluation.spi_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/spi/coze.loop.evaluation.spi_validator.go @@ -127,3 +127,67 @@ func (p *AsyncInvokeEvalTargetResponse) IsValid() error { } return nil } +func (p *InvokeCustomEvaluator) IsValid() error { + return nil +} +func (p *InvokeEvaluatorInputData) IsValid() error { + return nil +} +func (p *InvokeEvaluatorOutputData) IsValid() error { + if p.EvaluatorResult_ != nil { + if err := p.EvaluatorResult_.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorResult_ not valid, %w", err) + } + } + if p.EvaluatorUsage != nil { + if err := p.EvaluatorUsage.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorUsage not valid, %w", err) + } + } + if p.EvaluatorRunError != nil { + if err := p.EvaluatorRunError.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorRunError not valid, %w", err) + } + } + return nil +} +func (p *InvokeEvaluatorResult_) IsValid() error { + return nil +} +func (p *InvokeEvaluatorUsage) IsValid() error { + return nil +} +func (p *InvokeEvaluatorRunError) IsValid() error { + return nil +} +func (p *InvokeEvaluatorRequest) IsValid() error { + if p.Evaluator != nil { + if err := p.Evaluator.IsValid(); err != nil { + return fmt.Errorf("field Evaluator not valid, %w", err) + } + } + if p.InputData != nil { + if err := p.InputData.IsValid(); err != nil { + return fmt.Errorf("field InputData not valid, %w", err) + } + } + if p.Base != nil { + if err := p.Base.IsValid(); err != nil { + return fmt.Errorf("field Base not valid, %w", err) + } + } + return nil +} +func (p *InvokeEvaluatorResponse) IsValid() error { + if p.OutputData != nil { + if err := p.OutputData.IsValid(); err != nil { + return fmt.Errorf("field OutputData not valid, %w", err) + } + } + if p.BaseResp != nil { + if err := p.BaseResp.IsValid(); err != nil { + return fmt.Errorf("field BaseResp not valid, %w", err) + } + } + return nil +} diff --git a/backend/kitex_gen/coze/loop/evaluation/spi/evaluationspiservice/client.go b/backend/kitex_gen/coze/loop/evaluation/spi/evaluationspiservice/client.go index 4805b07ff..955c4f648 100644 --- a/backend/kitex_gen/coze/loop/evaluation/spi/evaluationspiservice/client.go +++ b/backend/kitex_gen/coze/loop/evaluation/spi/evaluationspiservice/client.go @@ -14,6 +14,7 @@ type Client interface { SearchEvalTarget(ctx context.Context, req *spi.SearchEvalTargetRequest, callOptions ...callopt.Option) (r *spi.SearchEvalTargetResponse, err error) InvokeEvalTarget(ctx context.Context, req *spi.InvokeEvalTargetRequest, callOptions ...callopt.Option) (r *spi.InvokeEvalTargetResponse, err error) AsyncInvokeEvalTarget(ctx context.Context, req *spi.AsyncInvokeEvalTargetRequest, callOptions ...callopt.Option) (r *spi.AsyncInvokeEvalTargetResponse, err error) + InvokeEvaluator(ctx context.Context, req *spi.InvokeEvaluatorRequest, callOptions ...callopt.Option) (r *spi.InvokeEvaluatorResponse, err error) } // NewClient creates a client for the service defined in IDL. @@ -59,3 +60,8 @@ func (p *kEvaluationSPIServiceClient) AsyncInvokeEvalTarget(ctx context.Context, ctx = client.NewCtxWithCallOptions(ctx, callOptions) return p.kClient.AsyncInvokeEvalTarget(ctx, req) } + +func (p *kEvaluationSPIServiceClient) InvokeEvaluator(ctx context.Context, req *spi.InvokeEvaluatorRequest, callOptions ...callopt.Option) (r *spi.InvokeEvaluatorResponse, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.InvokeEvaluator(ctx, req) +} diff --git a/backend/kitex_gen/coze/loop/evaluation/spi/evaluationspiservice/evaluationspiservice.go b/backend/kitex_gen/coze/loop/evaluation/spi/evaluationspiservice/evaluationspiservice.go index 12c2c80cf..da3aadc19 100644 --- a/backend/kitex_gen/coze/loop/evaluation/spi/evaluationspiservice/evaluationspiservice.go +++ b/backend/kitex_gen/coze/loop/evaluation/spi/evaluationspiservice/evaluationspiservice.go @@ -34,6 +34,13 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), + "InvokeEvaluator": kitex.NewMethodInfo( + invokeEvaluatorHandler, + newEvaluationSPIServiceInvokeEvaluatorArgs, + newEvaluationSPIServiceInvokeEvaluatorResult, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), } var ( @@ -124,6 +131,25 @@ func newEvaluationSPIServiceAsyncInvokeEvalTargetResult() interface{} { return spi.NewEvaluationSPIServiceAsyncInvokeEvalTargetResult() } +func invokeEvaluatorHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*spi.EvaluationSPIServiceInvokeEvaluatorArgs) + realResult := result.(*spi.EvaluationSPIServiceInvokeEvaluatorResult) + success, err := handler.(spi.EvaluationSPIService).InvokeEvaluator(ctx, realArg.Req) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluationSPIServiceInvokeEvaluatorArgs() interface{} { + return spi.NewEvaluationSPIServiceInvokeEvaluatorArgs() +} + +func newEvaluationSPIServiceInvokeEvaluatorResult() interface{} { + return spi.NewEvaluationSPIServiceInvokeEvaluatorResult() +} + type kClient struct { c client.Client sc client.Streaming @@ -165,3 +191,13 @@ func (p *kClient) AsyncInvokeEvalTarget(ctx context.Context, req *spi.AsyncInvok } return _result.GetSuccess(), nil } + +func (p *kClient) InvokeEvaluator(ctx context.Context, req *spi.InvokeEvaluatorRequest) (r *spi.InvokeEvaluatorResponse, err error) { + var _args spi.EvaluationSPIServiceInvokeEvaluatorArgs + _args.Req = req + var _result spi.EvaluationSPIServiceInvokeEvaluatorResult + if err = p.c.Call(ctx, "InvokeEvaluator", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} diff --git a/backend/kitex_gen/coze/loop/evaluation/spi/k-coze.loop.evaluation.spi.go b/backend/kitex_gen/coze/loop/evaluation/spi/k-coze.loop.evaluation.spi.go index fbf9a9308..3339ea2a0 100644 --- a/backend/kitex_gen/coze/loop/evaluation/spi/k-coze.loop.evaluation.spi.go +++ b/backend/kitex_gen/coze/loop/evaluation/spi/k-coze.loop.evaluation.spi.go @@ -3151,6 +3151,1543 @@ func (p *AsyncInvokeEvalTargetResponse) DeepCopy(s interface{}) error { return nil } +func (p *InvokeCustomEvaluator) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeCustomEvaluator[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *InvokeCustomEvaluator) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.ProviderEvaluatorCode = _field + return offset, nil +} + +func (p *InvokeCustomEvaluator) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *InvokeCustomEvaluator) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *InvokeCustomEvaluator) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *InvokeCustomEvaluator) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetProviderEvaluatorCode() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 1) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.ProviderEvaluatorCode) + } + return offset +} + +func (p *InvokeCustomEvaluator) field1Length() int { + l := 0 + if p.IsSetProviderEvaluatorCode() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.ProviderEvaluatorCode) + } + return l +} + +func (p *InvokeCustomEvaluator) DeepCopy(s interface{}) error { + src, ok := s.(*InvokeCustomEvaluator) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.ProviderEvaluatorCode != nil { + var tmp string + if *src.ProviderEvaluatorCode != "" { + tmp = kutils.StringDeepCopy(*src.ProviderEvaluatorCode) + } + p.ProviderEvaluatorCode = &tmp + } + + return nil +} + +func (p *InvokeEvaluatorInputData) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.MAP { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorInputData[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *InvokeEvaluatorInputData) FastReadField1(buf []byte) (int, error) { + offset := 0 + + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make(map[string]*Content, size) + values := make([]Content, size) + for i := 0; i < size; i++ { + var _key string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _key = v + } + + _val := &values[i] + _val.InitDefault() + if l, err := _val.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + + _field[_key] = _val + } + p.InputFields = _field + return offset, nil +} + +func (p *InvokeEvaluatorInputData) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *InvokeEvaluatorInputData) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *InvokeEvaluatorInputData) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *InvokeEvaluatorInputData) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetInputFields() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 1) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() + var length int + for k, v := range p.InputFields { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + offset += v.FastWriteNocopy(buf[offset:], w) + } + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.STRUCT, length) + } + return offset +} + +func (p *InvokeEvaluatorInputData) field1Length() int { + l := 0 + if p.IsSetInputFields() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.MapBeginLength() + for k, v := range p.InputFields { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += v.BLength() + } + } + return l +} + +func (p *InvokeEvaluatorInputData) DeepCopy(s interface{}) error { + src, ok := s.(*InvokeEvaluatorInputData) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.InputFields != nil { + p.InputFields = make(map[string]*Content, len(src.InputFields)) + for key, val := range src.InputFields { + var _key string + if key != "" { + _key = kutils.StringDeepCopy(key) + } + + var _val *Content + if val != nil { + _val = &Content{} + if err := _val.DeepCopy(val); err != nil { + return err + } + } + + p.InputFields[_key] = _val + } + } + + return nil +} + +func (p *InvokeEvaluatorOutputData) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField2(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 3: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField3(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorOutputData[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *InvokeEvaluatorOutputData) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewInvokeEvaluatorResult_() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.EvaluatorResult_ = _field + return offset, nil +} + +func (p *InvokeEvaluatorOutputData) FastReadField2(buf []byte) (int, error) { + offset := 0 + _field := NewInvokeEvaluatorUsage() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.EvaluatorUsage = _field + return offset, nil +} + +func (p *InvokeEvaluatorOutputData) FastReadField3(buf []byte) (int, error) { + offset := 0 + _field := NewInvokeEvaluatorRunError() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.EvaluatorRunError = _field + return offset, nil +} + +func (p *InvokeEvaluatorOutputData) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *InvokeEvaluatorOutputData) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *InvokeEvaluatorOutputData) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field3Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *InvokeEvaluatorOutputData) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetEvaluatorResult_() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.EvaluatorResult_.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *InvokeEvaluatorOutputData) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetEvaluatorUsage() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 2) + offset += p.EvaluatorUsage.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *InvokeEvaluatorOutputData) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetEvaluatorRunError() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 3) + offset += p.EvaluatorRunError.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *InvokeEvaluatorOutputData) field1Length() int { + l := 0 + if p.IsSetEvaluatorResult_() { + l += thrift.Binary.FieldBeginLength() + l += p.EvaluatorResult_.BLength() + } + return l +} + +func (p *InvokeEvaluatorOutputData) field2Length() int { + l := 0 + if p.IsSetEvaluatorUsage() { + l += thrift.Binary.FieldBeginLength() + l += p.EvaluatorUsage.BLength() + } + return l +} + +func (p *InvokeEvaluatorOutputData) field3Length() int { + l := 0 + if p.IsSetEvaluatorRunError() { + l += thrift.Binary.FieldBeginLength() + l += p.EvaluatorRunError.BLength() + } + return l +} + +func (p *InvokeEvaluatorOutputData) DeepCopy(s interface{}) error { + src, ok := s.(*InvokeEvaluatorOutputData) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _evaluatorResult_ *InvokeEvaluatorResult_ + if src.EvaluatorResult_ != nil { + _evaluatorResult_ = &InvokeEvaluatorResult_{} + if err := _evaluatorResult_.DeepCopy(src.EvaluatorResult_); err != nil { + return err + } + } + p.EvaluatorResult_ = _evaluatorResult_ + + var _evaluatorUsage *InvokeEvaluatorUsage + if src.EvaluatorUsage != nil { + _evaluatorUsage = &InvokeEvaluatorUsage{} + if err := _evaluatorUsage.DeepCopy(src.EvaluatorUsage); err != nil { + return err + } + } + p.EvaluatorUsage = _evaluatorUsage + + var _evaluatorRunError *InvokeEvaluatorRunError + if src.EvaluatorRunError != nil { + _evaluatorRunError = &InvokeEvaluatorRunError{} + if err := _evaluatorRunError.DeepCopy(src.EvaluatorRunError); err != nil { + return err + } + } + p.EvaluatorRunError = _evaluatorRunError + + return nil +} + +func (p *InvokeEvaluatorResult_) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.DOUBLE { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField2(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorResult_[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *InvokeEvaluatorResult_) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field *float64 + if v, l, err := thrift.Binary.ReadDouble(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Score = _field + return offset, nil +} + +func (p *InvokeEvaluatorResult_) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Reasoning = _field + return offset, nil +} + +func (p *InvokeEvaluatorResult_) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *InvokeEvaluatorResult_) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *InvokeEvaluatorResult_) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *InvokeEvaluatorResult_) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetScore() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.DOUBLE, 1) + offset += thrift.Binary.WriteDouble(buf[offset:], *p.Score) + } + return offset +} + +func (p *InvokeEvaluatorResult_) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetReasoning() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 2) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Reasoning) + } + return offset +} + +func (p *InvokeEvaluatorResult_) field1Length() int { + l := 0 + if p.IsSetScore() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.DoubleLength() + } + return l +} + +func (p *InvokeEvaluatorResult_) field2Length() int { + l := 0 + if p.IsSetReasoning() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Reasoning) + } + return l +} + +func (p *InvokeEvaluatorResult_) DeepCopy(s interface{}) error { + src, ok := s.(*InvokeEvaluatorResult_) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.Score != nil { + tmp := *src.Score + p.Score = &tmp + } + + if src.Reasoning != nil { + var tmp string + if *src.Reasoning != "" { + tmp = kutils.StringDeepCopy(*src.Reasoning) + } + p.Reasoning = &tmp + } + + return nil +} + +func (p *InvokeEvaluatorUsage) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField2(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorUsage[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *InvokeEvaluatorUsage) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.InputTokens = _field + return offset, nil +} + +func (p *InvokeEvaluatorUsage) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.OutputTokens = _field + return offset, nil +} + +func (p *InvokeEvaluatorUsage) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *InvokeEvaluatorUsage) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *InvokeEvaluatorUsage) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *InvokeEvaluatorUsage) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetInputTokens() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], *p.InputTokens) + } + return offset +} + +func (p *InvokeEvaluatorUsage) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetOutputTokens() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 2) + offset += thrift.Binary.WriteI64(buf[offset:], *p.OutputTokens) + } + return offset +} + +func (p *InvokeEvaluatorUsage) field1Length() int { + l := 0 + if p.IsSetInputTokens() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *InvokeEvaluatorUsage) field2Length() int { + l := 0 + if p.IsSetOutputTokens() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *InvokeEvaluatorUsage) DeepCopy(s interface{}) error { + src, ok := s.(*InvokeEvaluatorUsage) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.InputTokens != nil { + tmp := *src.InputTokens + p.InputTokens = &tmp + } + + if src.OutputTokens != nil { + tmp := *src.OutputTokens + p.OutputTokens = &tmp + } + + return nil +} + +func (p *InvokeEvaluatorRunError) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.I32 { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField2(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorRunError[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *InvokeEvaluatorRunError) FastReadField1(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.Code = _field + return offset, nil +} + +func (p *InvokeEvaluatorRunError) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Message = _field + return offset, nil +} + +func (p *InvokeEvaluatorRunError) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *InvokeEvaluatorRunError) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *InvokeEvaluatorRunError) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *InvokeEvaluatorRunError) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetCode() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I32, 1) + offset += thrift.Binary.WriteI32(buf[offset:], *p.Code) + } + return offset +} + +func (p *InvokeEvaluatorRunError) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetMessage() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 2) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Message) + } + return offset +} + +func (p *InvokeEvaluatorRunError) field1Length() int { + l := 0 + if p.IsSetCode() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I32Length() + } + return l +} + +func (p *InvokeEvaluatorRunError) field2Length() int { + l := 0 + if p.IsSetMessage() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Message) + } + return l +} + +func (p *InvokeEvaluatorRunError) DeepCopy(s interface{}) error { + src, ok := s.(*InvokeEvaluatorRunError) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.Code != nil { + tmp := *src.Code + p.Code = &tmp + } + + if src.Message != nil { + var tmp string + if *src.Message != "" { + tmp = kutils.StringDeepCopy(*src.Message) + } + p.Message = &tmp + } + + return nil +} + +func (p *InvokeEvaluatorRequest) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField2(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 3: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField3(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 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorRequest[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *InvokeEvaluatorRequest) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.WorkspaceID = _field + return offset, nil +} + +func (p *InvokeEvaluatorRequest) FastReadField2(buf []byte) (int, error) { + offset := 0 + _field := NewInvokeCustomEvaluator() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Evaluator = _field + return offset, nil +} + +func (p *InvokeEvaluatorRequest) FastReadField3(buf []byte) (int, error) { + offset := 0 + _field := NewInvokeEvaluatorInputData() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.InputData = _field + return offset, nil +} + +func (p *InvokeEvaluatorRequest) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBase() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Base = _field + return offset, nil +} + +func (p *InvokeEvaluatorRequest) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *InvokeEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *InvokeEvaluatorRequest) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field3Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *InvokeEvaluatorRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetWorkspaceID() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], *p.WorkspaceID) + } + return offset +} + +func (p *InvokeEvaluatorRequest) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetEvaluator() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 2) + offset += p.Evaluator.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *InvokeEvaluatorRequest) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetInputData() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 3) + offset += p.InputData.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *InvokeEvaluatorRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBase() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.Base.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *InvokeEvaluatorRequest) field1Length() int { + l := 0 + if p.IsSetWorkspaceID() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *InvokeEvaluatorRequest) field2Length() int { + l := 0 + if p.IsSetEvaluator() { + l += thrift.Binary.FieldBeginLength() + l += p.Evaluator.BLength() + } + return l +} + +func (p *InvokeEvaluatorRequest) field3Length() int { + l := 0 + if p.IsSetInputData() { + l += thrift.Binary.FieldBeginLength() + l += p.InputData.BLength() + } + return l +} + +func (p *InvokeEvaluatorRequest) field255Length() int { + l := 0 + if p.IsSetBase() { + l += thrift.Binary.FieldBeginLength() + l += p.Base.BLength() + } + return l +} + +func (p *InvokeEvaluatorRequest) DeepCopy(s interface{}) error { + src, ok := s.(*InvokeEvaluatorRequest) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.WorkspaceID != nil { + tmp := *src.WorkspaceID + p.WorkspaceID = &tmp + } + + var _evaluator *InvokeCustomEvaluator + if src.Evaluator != nil { + _evaluator = &InvokeCustomEvaluator{} + if err := _evaluator.DeepCopy(src.Evaluator); err != nil { + return err + } + } + p.Evaluator = _evaluator + + var _inputData *InvokeEvaluatorInputData + if src.InputData != nil { + _inputData = &InvokeEvaluatorInputData{} + if err := _inputData.DeepCopy(src.InputData); err != nil { + return err + } + } + p.InputData = _inputData + + var _base *base.Base + if src.Base != nil { + _base = &base.Base{} + if err := _base.DeepCopy(src.Base); err != nil { + return err + } + } + p.Base = _base + + return nil +} + +func (p *InvokeEvaluatorResponse) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.I32 { + l, err = p.FastReadField2(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 255: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField255(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_InvokeEvaluatorResponse[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *InvokeEvaluatorResponse) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewInvokeEvaluatorOutputData() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.OutputData = _field + return offset, nil +} + +func (p *InvokeEvaluatorResponse) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field *InvokeEvaluatorRunStatus + if v, l, err := thrift.Binary.ReadI32(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + + tmp := InvokeEvaluatorRunStatus(v) + _field = &tmp + } + p.Status = _field + return offset, nil +} + +func (p *InvokeEvaluatorResponse) FastReadField255(buf []byte) (int, error) { + offset := 0 + _field := base.NewBaseResp() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.BaseResp = _field + return offset, nil +} + +func (p *InvokeEvaluatorResponse) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *InvokeEvaluatorResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField255(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *InvokeEvaluatorResponse) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field255Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *InvokeEvaluatorResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetOutputData() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.OutputData.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *InvokeEvaluatorResponse) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetStatus() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I32, 2) + offset += thrift.Binary.WriteI32(buf[offset:], int32(*p.Status)) + } + return offset +} + +func (p *InvokeEvaluatorResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) + offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *InvokeEvaluatorResponse) field1Length() int { + l := 0 + if p.IsSetOutputData() { + l += thrift.Binary.FieldBeginLength() + l += p.OutputData.BLength() + } + return l +} + +func (p *InvokeEvaluatorResponse) field2Length() int { + l := 0 + if p.IsSetStatus() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I32Length() + } + return l +} + +func (p *InvokeEvaluatorResponse) field255Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.BaseResp.BLength() + return l +} + +func (p *InvokeEvaluatorResponse) DeepCopy(s interface{}) error { + src, ok := s.(*InvokeEvaluatorResponse) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _outputData *InvokeEvaluatorOutputData + if src.OutputData != nil { + _outputData = &InvokeEvaluatorOutputData{} + if err := _outputData.DeepCopy(src.OutputData); err != nil { + return err + } + } + p.OutputData = _outputData + + if src.Status != nil { + tmp := *src.Status + p.Status = &tmp + } + + var _baseResp *base.BaseResp + if src.BaseResp != nil { + _baseResp = &base.BaseResp{} + if err := _baseResp.DeepCopy(src.BaseResp); err != nil { + return err + } + } + p.BaseResp = _baseResp + + return nil +} + func (p *EvaluationSPIServiceSearchEvalTargetArgs) FastRead(buf []byte) (int, error) { var err error @@ -3853,6 +5390,240 @@ func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) DeepCopy(s interface{} return nil } +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceInvokeEvaluatorArgs[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewInvokeEvaluatorRequest() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Req = _field + return offset, nil +} + +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Req.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Req.BLength() + return l +} + +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluationSPIServiceInvokeEvaluatorArgs) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _req *InvokeEvaluatorRequest + if src.Req != nil { + _req = &InvokeEvaluatorRequest{} + if err := _req.DeepCopy(src.Req); err != nil { + return err + } + } + p.Req = _req + + return nil +} + +func (p *EvaluationSPIServiceInvokeEvaluatorResult) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField0(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluationSPIServiceInvokeEvaluatorResult[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluationSPIServiceInvokeEvaluatorResult) FastReadField0(buf []byte) (int, error) { + offset := 0 + _field := NewInvokeEvaluatorResponse() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Success = _field + return offset, nil +} + +func (p *EvaluationSPIServiceInvokeEvaluatorResult) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluationSPIServiceInvokeEvaluatorResult) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField0(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluationSPIServiceInvokeEvaluatorResult) BLength() int { + l := 0 + if p != nil { + l += p.field0Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluationSPIServiceInvokeEvaluatorResult) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSuccess() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) + offset += p.Success.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluationSPIServiceInvokeEvaluatorResult) field0Length() int { + l := 0 + if p.IsSetSuccess() { + l += thrift.Binary.FieldBeginLength() + l += p.Success.BLength() + } + return l +} + +func (p *EvaluationSPIServiceInvokeEvaluatorResult) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluationSPIServiceInvokeEvaluatorResult) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _success *InvokeEvaluatorResponse + if src.Success != nil { + _success = &InvokeEvaluatorResponse{} + if err := _success.DeepCopy(src.Success); err != nil { + return err + } + } + p.Success = _success + + return nil +} + func (p *EvaluationSPIServiceSearchEvalTargetArgs) GetFirstArgument() interface{} { return p.Req } @@ -3876,3 +5647,11 @@ func (p *EvaluationSPIServiceAsyncInvokeEvalTargetArgs) GetFirstArgument() inter func (p *EvaluationSPIServiceAsyncInvokeEvalTargetResult) GetResult() interface{} { return p.Success } + +func (p *EvaluationSPIServiceInvokeEvaluatorArgs) GetFirstArgument() interface{} { + return p.Req +} + +func (p *EvaluationSPIServiceInvokeEvaluatorResult) GetResult() interface{} { + return p.Success +} diff --git a/backend/loop_gen/coze/loop/evaluation/lospi/local_evaluationspiservice.go b/backend/loop_gen/coze/loop/evaluation/lospi/local_evaluationspiservice.go index 67597c82e..d803d4a56 100644 --- a/backend/loop_gen/coze/loop/evaluation/lospi/local_evaluationspiservice.go +++ b/backend/loop_gen/coze/loop/evaluation/lospi/local_evaluationspiservice.go @@ -85,6 +85,29 @@ func (l *LocalEvaluationSPIService) AsyncInvokeEvalTarget(ctx context.Context, r return result.GetSuccess(), nil } +// InvokeEvaluator +// invoke custom evaluator +func (l *LocalEvaluationSPIService) InvokeEvaluator(ctx context.Context, req *spi.InvokeEvaluatorRequest, callOptions ...callopt.Option) (*spi.InvokeEvaluatorResponse, error) { + chain := l.mds(func(ctx context.Context, in, out interface{}) error { + arg := in.(*spi.EvaluationSPIServiceInvokeEvaluatorArgs) + result := out.(*spi.EvaluationSPIServiceInvokeEvaluatorResult) + resp, err := l.impl.InvokeEvaluator(ctx, arg.Req) + if err != nil { + return err + } + result.SetSuccess(resp) + return nil + }) + + arg := &spi.EvaluationSPIServiceInvokeEvaluatorArgs{Req: req} + result := &spi.EvaluationSPIServiceInvokeEvaluatorResult{} + ctx = l.injectRPCInfo(ctx, "InvokeEvaluator") + if err := chain(ctx, arg, result); err != nil { + return nil, err + } + return result.GetSuccess(), nil +} + func (l *LocalEvaluationSPIService) injectRPCInfo(ctx context.Context, method string) context.Context { rpcStats := rpcinfo.AsMutableRPCStats(rpcinfo.NewRPCStats()) ri := rpcinfo.NewRPCInfo( diff --git a/backend/modules/evaluation/application/convertor/common/common.go b/backend/modules/evaluation/application/convertor/common/common.go index 7f096f38d..ad6b5f310 100644 --- a/backend/modules/evaluation/application/convertor/common/common.go +++ b/backend/modules/evaluation/application/convertor/common/common.go @@ -228,6 +228,17 @@ func ConvertArgsSchemaDTO2DO(schema *commondto.ArgsSchema) *commonentity.ArgsSch } } +func ConvertArgsSchemaListDTO2DO(schemas []*commondto.ArgsSchema) []*commonentity.ArgsSchema { + if len(schemas) == 0 { + return nil + } + res := make([]*commonentity.ArgsSchema, 0, len(schemas)) + for _, schema := range schemas { + res = append(res, ConvertArgsSchemaDTO2DO(schema)) + } + return res +} + // ConvertArgsSchemaDO2DTO 将 ArgsSchema 结构体转换为 DTO func ConvertArgsSchemaDO2DTO(schema *commonentity.ArgsSchema) *commondto.ArgsSchema { if schema == nil { @@ -244,6 +255,17 @@ func ConvertArgsSchemaDO2DTO(schema *commonentity.ArgsSchema) *commondto.ArgsSch } } +func ConvertArgsSchemaListDO2DTO(schemas []*commonentity.ArgsSchema) []*commondto.ArgsSchema { + if len(schemas) == 0 { + return nil + } + res := make([]*commondto.ArgsSchema, 0, len(schemas)) + for _, schema := range schemas { + res = append(res, ConvertArgsSchemaDO2DTO(schema)) + } + return res +} + // ConvertUserInfoDTO2DO 将 DTO 转换为 UserInfo 结构体 func ConvertUserInfoDTO2DO(info *commondto.UserInfo) *commonentity.UserInfo { if info == nil { diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go index 2d3227216..da630ea9c 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go @@ -38,6 +38,8 @@ func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.E evaluatorDO.PromptEvaluatorVersion = ConvertPromptEvaluatorVersionDTO2DO(evaluatorDO.ID, evaluatorDO.SpaceID, evaluatorDTO.GetCurrentVersion()) case evaluatordto.EvaluatorType_Code: evaluatorDO.CodeEvaluatorVersion = ConvertCodeEvaluatorVersionDTO2DO(evaluatorDO.ID, evaluatorDO.SpaceID, evaluatorDTO.GetCurrentVersion()) + case evaluatordto.EvaluatorType_CustomRPC: + evaluatorDO.CustomRPCEvaluatorVersion = ConvertCustomRPCEvaluatorVersionDTO2DO(evaluatorDO.ID, evaluatorDO.SpaceID, evaluatorDTO.GetCurrentVersion()) } } return evaluatorDO @@ -81,6 +83,11 @@ func ConvertEvaluatorDO2DTO(do *evaluatordo.Evaluator) *evaluatordto.Evaluator { versionDTO := ConvertCodeEvaluatorVersionDO2DTO(do.CodeEvaluatorVersion) dto.CurrentVersion = versionDTO } + case evaluatordo.EvaluatorTypeCustomRPC: + if do.CustomRPCEvaluatorVersion != nil { + versionDTO := ConvertCustomRPCEvaluatorVersionDO2DTO(do.CustomRPCEvaluatorVersion) + dto.CurrentVersion = versionDTO + } } return dto } @@ -227,6 +234,21 @@ func ConvertEvaluatorContent2DO(content *evaluatordto.EvaluatorContent, evaluato evaluator.CodeEvaluatorVersion = codeVersion + case evaluatordto.EvaluatorType_CustomRPC: + if content.CustomRPCEvaluator == nil { + return nil, errorx.NewByCode(errno.InvalidInputDataCode, errorx.WithExtraMsg("custom rpc evaluator content is nil")) + } + + customRPCVersion := &evaluatordo.CustomRPCEvaluatorVersion{ + ProviderEvaluatorCode: content.CustomRPCEvaluator.ProviderEvaluatorCode, + AccessProtocol: content.CustomRPCEvaluator.AccessProtocol, + ServiceName: content.CustomRPCEvaluator.ServiceName, + Cluster: content.CustomRPCEvaluator.Cluster, + Timeout: content.CustomRPCEvaluator.Timeout, + } + + evaluator.CustomRPCEvaluatorVersion = customRPCVersion + default: return nil, errorx.NewByCode(errno.InvalidEvaluatorTypeCode, errorx.WithExtraMsg("unsupported evaluator type")) } @@ -373,3 +395,55 @@ func ConvertEvaluatorTagKeyDO2DTO(doKey evaluatordo.EvaluatorTagKey) evaluatordt return evaluatordto.EvaluatorTagKey(doKey) } } + +func ConvertCustomRPCEvaluatorVersionDTO2DO(evaluatorID, spaceID int64, dto *evaluatordto.EvaluatorVersion) *evaluatordo.CustomRPCEvaluatorVersion { + if dto == nil { + return nil + } + customRPCEvaluatorVersion := &evaluatordo.CustomRPCEvaluatorVersion{ + ID: dto.GetID(), + SpaceID: spaceID, + EvaluatorType: evaluatordo.EvaluatorTypeCustomRPC, + EvaluatorID: evaluatorID, + Description: dto.GetDescription(), + Version: dto.GetVersion(), + BaseInfo: commonconvertor.ConvertBaseInfoDTO2DO(dto.GetBaseInfo()), + } + if dto.EvaluatorContent != nil { + customRPCEvaluatorVersion.InputSchemas = commonconvertor.ConvertArgsSchemaListDTO2DO(dto.EvaluatorContent.InputSchemas) + customRPCEvaluatorVersion.OutputSchemas = commonconvertor.ConvertArgsSchemaListDTO2DO(dto.EvaluatorContent.OutputSchemas) + if dto.EvaluatorContent.CustomRPCEvaluator != nil { + customRPCEvaluatorVersion.ProviderEvaluatorCode = dto.EvaluatorContent.CustomRPCEvaluator.ProviderEvaluatorCode + customRPCEvaluatorVersion.AccessProtocol = dto.EvaluatorContent.CustomRPCEvaluator.AccessProtocol + customRPCEvaluatorVersion.ServiceName = dto.EvaluatorContent.CustomRPCEvaluator.ServiceName + customRPCEvaluatorVersion.Cluster = dto.EvaluatorContent.CustomRPCEvaluator.Cluster + customRPCEvaluatorVersion.Timeout = dto.EvaluatorContent.CustomRPCEvaluator.Timeout + } + } + return customRPCEvaluatorVersion +} + +func ConvertCustomRPCEvaluatorVersionDO2DTO(do *evaluatordo.CustomRPCEvaluatorVersion) *evaluatordto.EvaluatorVersion { + if do == nil { + return nil + } + dto := &evaluatordto.EvaluatorVersion{ + ID: gptr.Of(do.ID), + Version: gptr.Of(do.Version), + Description: gptr.Of(do.Description), + BaseInfo: commonconvertor.ConvertBaseInfoDO2DTO(do.BaseInfo), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + ReceiveChatHistory: nil, + InputSchemas: commonconvertor.ConvertArgsSchemaListDO2DTO(do.InputSchemas), + OutputSchemas: commonconvertor.ConvertArgsSchemaListDO2DTO(do.OutputSchemas), + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: do.ProviderEvaluatorCode, + AccessProtocol: do.AccessProtocol, + ServiceName: do.ServiceName, + Cluster: do.Cluster, + Timeout: do.Timeout, + }, + }, + } + return dto +} diff --git a/backend/modules/evaluation/domain/entity/evaluator.go b/backend/modules/evaluation/domain/entity/evaluator.go index e3d7d5f89..a0698dd3f 100644 --- a/backend/modules/evaluation/domain/entity/evaluator.go +++ b/backend/modules/evaluation/domain/entity/evaluator.go @@ -21,18 +21,21 @@ type Evaluator struct { PromptEvaluatorVersion *PromptEvaluatorVersion CodeEvaluatorVersion *CodeEvaluatorVersion + CustomRPCEvaluatorVersion *CustomRPCEvaluatorVersion } type EvaluatorType int64 const ( - EvaluatorTypePrompt EvaluatorType = 1 - EvaluatorTypeCode EvaluatorType = 2 + EvaluatorTypePrompt EvaluatorType = 1 + EvaluatorTypeCode EvaluatorType = 2 + EvaluatorTypeCustomRPC EvaluatorType = 3 ) var EvaluatorTypeSet = map[EvaluatorType]struct{}{ - EvaluatorTypePrompt: {}, - EvaluatorTypeCode: {}, + EvaluatorTypePrompt: {}, + EvaluatorTypeCode: {}, + EvaluatorTypeCustomRPC: {}, } // UpdateEvaluatorMetaRequest 用于更新评估器元信息的参数 @@ -60,6 +63,10 @@ func (e *Evaluator) GetEvaluatorVersionID() int64 { if e.CodeEvaluatorVersion != nil { return e.CodeEvaluatorVersion.GetID() } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + return e.CustomRPCEvaluatorVersion.GetID() + } default: return 0 } @@ -77,6 +84,10 @@ func (e *Evaluator) GetVersion() string { if e.CodeEvaluatorVersion != nil { return e.CodeEvaluatorVersion.GetVersion() } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + return e.CustomRPCEvaluatorVersion.GetVersion() + } default: return "" } @@ -94,6 +105,10 @@ func (e *Evaluator) GetEvaluatorID() int64 { if e.CodeEvaluatorVersion != nil { return e.CodeEvaluatorVersion.GetEvaluatorID() } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + return e.CustomRPCEvaluatorVersion.GetEvaluatorID() + } default: return 0 } @@ -111,6 +126,10 @@ func (e *Evaluator) GetSpaceID() int64 { if e.CodeEvaluatorVersion != nil { return e.CodeEvaluatorVersion.GetSpaceID() } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + return e.CustomRPCEvaluatorVersion.GetSpaceID() + } default: return 0 } @@ -133,6 +152,10 @@ func (e *Evaluator) GetEvaluatorVersionDescription() string { if e.CodeEvaluatorVersion != nil { return e.CodeEvaluatorVersion.GetDescription() } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + return e.CustomRPCEvaluatorVersion.GetDescription() + } default: return "" } @@ -150,6 +173,10 @@ func (e *Evaluator) GetBaseInfo() *BaseInfo { if e.CodeEvaluatorVersion != nil { return e.CodeEvaluatorVersion.GetBaseInfo() } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + return e.CustomRPCEvaluatorVersion.GetBaseInfo() + } default: return nil } @@ -193,6 +220,10 @@ func (e *Evaluator) ValidateInput(input *EvaluatorInputData) error { if e.CodeEvaluatorVersion != nil { return e.CodeEvaluatorVersion.ValidateInput(input) } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + return e.CustomRPCEvaluatorVersion.ValidateInput(input) + } default: return nil } @@ -210,6 +241,10 @@ func (e *Evaluator) ValidateBaseInfo() error { if e.CodeEvaluatorVersion != nil { return e.CodeEvaluatorVersion.ValidateBaseInfo() } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + return e.CustomRPCEvaluatorVersion.ValidateBaseInfo() + } default: return nil } @@ -227,6 +262,10 @@ func (e *Evaluator) SetEvaluatorVersionID(id int64) { if e.CodeEvaluatorVersion != nil { e.CodeEvaluatorVersion.SetID(id) } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + e.CustomRPCEvaluatorVersion.SetID(id) + } default: return } @@ -243,6 +282,10 @@ func (e *Evaluator) SetVersion(version string) { if e.CodeEvaluatorVersion != nil { e.CodeEvaluatorVersion.SetVersion(version) } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + e.CustomRPCEvaluatorVersion.SetVersion(version) + } default: return } @@ -264,6 +307,10 @@ func (e *Evaluator) SetEvaluatorVersionDescription(description string) { if e.CodeEvaluatorVersion != nil { e.CodeEvaluatorVersion.SetDescription(description) } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + e.CustomRPCEvaluatorVersion.SetDescription(description) + } default: return } @@ -280,6 +327,10 @@ func (e *Evaluator) SetBaseInfo(baseInfo *BaseInfo) { if e.CodeEvaluatorVersion != nil { e.CodeEvaluatorVersion.SetBaseInfo(baseInfo) } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + e.CustomRPCEvaluatorVersion.SetBaseInfo(baseInfo) + } default: return } @@ -332,6 +383,10 @@ func (e *Evaluator) SetEvaluatorID(evaluatorID int64) { if e.CodeEvaluatorVersion != nil { e.CodeEvaluatorVersion.SetEvaluatorID(evaluatorID) } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + e.CustomRPCEvaluatorVersion.SetEvaluatorID(evaluatorID) + } default: return } @@ -348,6 +403,10 @@ func (e *Evaluator) SetSpaceID(spaceID int64) { if e.CodeEvaluatorVersion != nil { e.CodeEvaluatorVersion.SetSpaceID(spaceID) } + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + e.CustomRPCEvaluatorVersion.SetSpaceID(spaceID) + } default: return } @@ -359,6 +418,8 @@ func (e *Evaluator) SetEvaluatorVersion(version *Evaluator) { e.PromptEvaluatorVersion = version.PromptEvaluatorVersion case EvaluatorTypeCode: e.CodeEvaluatorVersion = version.CodeEvaluatorVersion + case EvaluatorTypeCustomRPC: + e.CustomRPCEvaluatorVersion = version.CustomRPCEvaluatorVersion default: return } diff --git a/backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc.go b/backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc.go new file mode 100644 index 000000000..5da425290 --- /dev/null +++ b/backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc.go @@ -0,0 +1,128 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package entity + +import ( + "fmt" + + "github.com/bytedance/gg/gptr" + "github.com/bytedance/gg/gslice" + "github.com/samber/lo" + + "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/errno" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/json" + "github.com/coze-dev/coze-loop/backend/pkg/errorx" +) + +type CustomRPCEvaluatorVersion struct { + // standard EvaluatorVersion layer attributes + ID int64 `json:"id"` + SpaceID int64 `json:"space_id"` + EvaluatorType EvaluatorType `json:"evaluator_type"` + EvaluatorID int64 `json:"evaluator_id"` + Description string `json:"description"` + Version string `json:"version"` + BaseInfo *BaseInfo `json:"base_info"` + + // standard EvaluatorContent layer attributes + InputSchemas []*ArgsSchema `json:"input_schemas"` + OutputSchemas []*ArgsSchema `json:"output_schemas"` + + // specific CustomRPCEvaluator layer attributes, refer to CustomRPCEvaluator DTO + ProviderEvaluatorCode *string `json:"provider_evaluator_code"` // provider's evaluator identity code, e.g. provider A may name an evaluator as A001 + AccessProtocol AccessProtocol `json:"access_protocol"` // custom protocol + ServiceName *string `json:"service_name"` + Cluster *string `json:"cluster"` + Timeout *int64 `json:"timeout"` // timeout duration in milliseconds(ms) +} + +func (do *CustomRPCEvaluatorVersion) SetID(id int64) { + do.ID = id +} + +func (do *CustomRPCEvaluatorVersion) GetID() int64 { + return do.ID +} + +func (do *CustomRPCEvaluatorVersion) SetEvaluatorID(evaluatorID int64) { + do.EvaluatorID = evaluatorID +} + +func (do *CustomRPCEvaluatorVersion) GetEvaluatorID() int64 { + return do.EvaluatorID +} + +func (do *CustomRPCEvaluatorVersion) SetSpaceID(spaceID int64) { + do.SpaceID = spaceID +} + +func (do *CustomRPCEvaluatorVersion) GetSpaceID() int64 { + return do.SpaceID +} + +func (do *CustomRPCEvaluatorVersion) GetVersion() string { + return do.Version +} + +func (do *CustomRPCEvaluatorVersion) SetVersion(version string) { + do.Version = version +} + +func (do *CustomRPCEvaluatorVersion) SetDescription(description string) { + do.Description = description +} + +func (do *CustomRPCEvaluatorVersion) GetDescription() string { + return do.Description +} + +func (do *CustomRPCEvaluatorVersion) SetBaseInfo(baseInfo *BaseInfo) { + do.BaseInfo = baseInfo +} + +func (do *CustomRPCEvaluatorVersion) GetBaseInfo() *BaseInfo { + return do.BaseInfo +} + +func (do *CustomRPCEvaluatorVersion) ValidateInput(input *EvaluatorInputData) error { + inputSchemaMap := make(map[string]*ArgsSchema) + for _, argsSchema := range do.InputSchemas { + inputSchemaMap[gptr.Indirect(argsSchema.Key)] = argsSchema + } + for fieldKey, content := range input.InputFields { + if content == nil { + continue + } + // no need to validate schema for fields not defined in input schemas + if argsSchema, ok := inputSchemaMap[fieldKey]; ok { + if !gslice.Contains(argsSchema.SupportContentTypes, gptr.Indirect(content.ContentType)) { + return errorx.NewByCode(errno.ContentTypeNotSupportedCode, errorx.WithExtraMsg(fmt.Sprintf("content type %v not supported", gptr.Indirect(content.ContentType)))) + } + if gptr.Indirect(content.ContentType) == ContentTypeText { + valid, err := json.ValidateJSONSchema(gptr.Indirect(argsSchema.JsonSchema), gptr.Indirect(content.Text)) + if err != nil || !valid { + return errorx.NewByCode(errno.ContentSchemaInvalidCode, errorx.WithExtraMsg(fmt.Sprintf("content %v does not validate with expected schema: %v", gptr.Indirect(content.Text), gptr.Indirect(argsSchema.JsonSchema)))) + } + } + } + } + return nil +} + +func (do *CustomRPCEvaluatorVersion) ValidateBaseInfo() error { + if do == nil { + return errorx.NewByCode(errno.EvaluatorNotExistCode, errorx.WithExtraMsg("evaluator_version is nil")) + } + if do.ProviderEvaluatorCode == nil || lo.IsEmpty(*do.ProviderEvaluatorCode) { + return errorx.NewByCode(errno.InvalidProviderEvaluatorCodeCode, errorx.WithExtraMsg("provider_evaluator_code is empty")) + } + if lo.IsEmpty(do.AccessProtocol) { + return errorx.NewByCode(errno.InvalidAccessProtocolCode, errorx.WithExtraMsg("access_protocol is empty")) + } + if do.ServiceName == nil || lo.IsEmpty(*do.ServiceName) { + return errorx.NewByCode(errno.InvalidServiceNameCode, errorx.WithExtraMsg("service_name is empty")) + } + + return nil +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 41542e27c..93feda074 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -227,6 +227,15 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorByVersionID(ctx context.Context, sp evaluatorDO.CodeEvaluatorVersion = evaluatorVersionDO.CodeEvaluatorVersion evaluatorDO.EvaluatorType = entity.EvaluatorTypeCode evaluatorDOList = append(evaluatorDOList, evaluatorDO) + case int32(entity.EvaluatorTypeCustomRPC): + evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) + if err != nil { + return nil, err + } + evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorMap[evaluatorVersionPO.EvaluatorID]) + evaluatorDO.CustomRPCEvaluatorVersion = evaluatorVersionDO.CustomRPCEvaluatorVersion + evaluatorDO.EvaluatorType = entity.EvaluatorTypeCustomRPC + evaluatorDOList = append(evaluatorDOList, evaluatorDO) default: continue } @@ -768,6 +777,15 @@ func (r *EvaluatorRepoImpl) BatchGetBuiltinEvaluatorByVersionID(ctx context.Cont evaluatorDO.CodeEvaluatorVersion = evaluatorVersionDO.CodeEvaluatorVersion evaluatorDO.EvaluatorType = entity.EvaluatorTypeCode + case int32(entity.EvaluatorTypeCustomRPC): + evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) + if err != nil { + return nil, err + } + evaluatorDO = convertor.ConvertEvaluatorPO2DO(evaluatorPO) + evaluatorDO.CustomRPCEvaluatorVersion = evaluatorVersionDO.CustomRPCEvaluatorVersion + evaluatorDO.EvaluatorType = entity.EvaluatorTypeCustomRPC + default: continue } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go index c76f8c4e5..8f4790230 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go @@ -94,7 +94,8 @@ func ConvertEvaluatorPO2DO(po *model.Evaluator) *evaluatordo.Evaluator { func ConvertEvaluatorVersionDO2PO(do *evaluatordo.Evaluator) (*model.EvaluatorVersion, error) { if do == nil || (do.EvaluatorType == evaluatordo.EvaluatorTypePrompt && do.PromptEvaluatorVersion == nil) || - (do.EvaluatorType == evaluatordo.EvaluatorTypeCode && do.CodeEvaluatorVersion == nil) { + (do.EvaluatorType == evaluatordo.EvaluatorTypeCode && do.CodeEvaluatorVersion == nil) || + (do.EvaluatorType == evaluatordo.EvaluatorTypeCustomRPC && do.CustomRPCEvaluatorVersion == nil) { return nil, nil } @@ -156,6 +157,29 @@ func ConvertEvaluatorVersionDO2PO(do *evaluatordo.Evaluator) (*model.EvaluatorVe // Code evaluator不需要chat history，设置为nil po.ReceiveChatHistory = nil po.ID = do.CodeEvaluatorVersion.ID + case evaluatordo.EvaluatorTypeCustomRPC: + // 序列化Metainfo（整个CustomRPCEvaluatorVersion） + metaInfoByte, err := json.Marshal(do.CustomRPCEvaluatorVersion) + if err != nil { + return nil, err + } + // 序列化InputSchema + inputSchemaByte, err := json.Marshal(do.CustomRPCEvaluatorVersion.InputSchemas) + if err != nil { + return nil, err + } + // 序列化OutputSchema + outputSchemaByte, err := json.Marshal(do.CustomRPCEvaluatorVersion.OutputSchemas) + if err != nil { + return nil, err + } + + po.InputSchema = ptr.Of(inputSchemaByte) + po.OutputSchema = ptr.Of(outputSchemaByte) + po.Metainfo = ptr.Of(metaInfoByte) + // Custom RPC evaluator不需要chat history，设置为nil + po.ReceiveChatHistory = nil + po.ID = do.CustomRPCEvaluatorVersion.ID } return po, nil } @@ -204,6 +228,13 @@ func ConvertEvaluatorVersionPO2DO(po *model.EvaluatorVersion) (*evaluatordo.Eval return nil, err } } + case evaluatordo.EvaluatorTypeCustomRPC: + do.CustomRPCEvaluatorVersion = &evaluatordo.CustomRPCEvaluatorVersion{} + if po.Metainfo != nil { + if err := json.Unmarshal(*po.Metainfo, do.CustomRPCEvaluatorVersion); err != nil { + return nil, err + } + } } do.SetEvaluatorVersionID(po.ID) do.SetVersion(po.Version) diff --git a/backend/modules/evaluation/pkg/errno/evaluation.go b/backend/modules/evaluation/pkg/errno/evaluation.go index 875a9d6fe..2dd6a32d8 100644 --- a/backend/modules/evaluation/pkg/errno/evaluation.go +++ b/backend/modules/evaluation/pkg/errno/evaluation.go @@ -315,6 +315,30 @@ const ( ExecutionResultNilCode = 601205060 // execution result object is nil executionResultNilMessage = "execution result is nil" executionResultNilNoAffectStability = true + + InvalidProviderEvaluatorCodeCode = 601205061 // the provider evaluator code is invalid, check if it is empty or invalid + invalidProviderEvaluatorCodeMessage = "invalid provider evaluator code" + invalidProviderEvaluatorCodeNoAffectStability = true + + InvalidAccessProtocolCode = 601205062 // the access protocol is invalid, check if it is empty or invalid + invalidAccessProtocolMessage = "invalid access protocol" + invalidAccessProtocolNoAffectStability = true + + InvalidServiceNameCode = 601205063 // the service name is invalid, check if it is empty or invalid + invalidServiceNameMessage = "invalid service name" + invalidServiceNameNoAffectStability = true + + InvalidClusterCode = 601205064 // the cluster is invalid, check if it is empty or invalid + invalidClusterMessage = "invalid cluster" + invalidClusterNoAffectStability = true + + CustomRPCEvaluatorRunFailedCode = 601205065 // the custom rpc evaluator run failed, check if the configuration is correct + customRPCEvaluatorRunFailedMessage = "custom rpc evaluator run failed" + customRPCEvaluatorRunFailedNoAffectStability = true + + UnsupportedCustomRPCEvaluatorCode = 601205066 // the custom rpc evaluator is not supported, check if the configuration is correct + unsupportedCustomRPCEvaluatorMessage = "unsupported custom rpc evaluator" + unsupportedCustomRPCEvaluatorNoAffectStability = true ) func init() { @@ -781,4 +805,40 @@ func init() { code.WithAffectStability(!executionResultNilNoAffectStability), ) + code.Register( + InvalidProviderEvaluatorCodeCode, + invalidProviderEvaluatorCodeMessage, + code.WithAffectStability(!invalidProviderEvaluatorCodeNoAffectStability), + ) + + code.Register( + InvalidAccessProtocolCode, + invalidAccessProtocolMessage, + code.WithAffectStability(!invalidAccessProtocolNoAffectStability), + ) + + code.Register( + InvalidServiceNameCode, + invalidServiceNameMessage, + code.WithAffectStability(!invalidServiceNameNoAffectStability), + ) + + code.Register( + InvalidClusterCode, + invalidClusterMessage, + code.WithAffectStability(!invalidClusterNoAffectStability), + ) + + code.Register( + CustomRPCEvaluatorRunFailedCode, + customRPCEvaluatorRunFailedMessage, + code.WithAffectStability(!customRPCEvaluatorRunFailedNoAffectStability), + ) + + code.Register( + UnsupportedCustomRPCEvaluatorCode, + unsupportedCustomRPCEvaluatorMessage, + code.WithAffectStability(!unsupportedCustomRPCEvaluatorNoAffectStability), + ) + } diff --git a/backend/script/errorx/evaluation.yaml b/backend/script/errorx/evaluation.yaml index 6b5d0c92d..56d998e0b 100644 --- a/backend/script/errorx/evaluation.yaml +++ b/backend/script/errorx/evaluation.yaml @@ -404,4 +404,40 @@ error_code: code: 5060 message: execution result is nil description: execution result object is nil + no_affect_stability: true + + - name: InvalidProviderEvaluatorCode + code: 5061 + message: invalid provider evaluator code + description: the provider evaluator code is invalid, check if it is empty or invalid + no_affect_stability: true + + - name: InvalidAccessProtocol + code: 5062 + message: invalid access protocol + description: the access protocol is invalid, check if it is empty or invalid + no_affect_stability: true + + - name: InvalidServiceName + code: 5063 + message: invalid service name + description: the service name is invalid, check if it is empty or invalid + no_affect_stability: true + + - name: InvalidCluster + code: 5064 + message: invalid cluster + description: the cluster is invalid, check if it is empty or invalid + no_affect_stability: true + + - name: CustomRPCEvaluatorRunFailed + code: 5065 + message: custom rpc evaluator run failed + description: the custom rpc evaluator run failed, check if the configuration is correct + no_affect_stability: true + + - name: UnsupportedCustomRPCEvaluator + code: 5066 + message: unsupported custom rpc evaluator + description: the custom rpc evaluator is not supported, check if the configuration is correct no_affect_stability: true \ No newline at end of file diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.spi.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.spi.thrift index a8e169d28..65be6c824 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.spi.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.spi.thrift @@ -101,8 +101,70 @@ struct AsyncInvokeEvalTargetResponse { 255: base.BaseResp BaseResp (api.none="true") } +// the run status enumerate for custom evaluator +enum InvokeEvaluatorRunStatus { + UNKNOWN = 0 + SUCCESS = 1 + FAILED = 2 +} + +// the custom evaluator identity and parameter information +struct InvokeCustomEvaluator { + 1: optional string provider_evaluator_code // provider-side evaluator identity code +} + +// the input data structure for custom evaluator +struct InvokeEvaluatorInputData { + 1: optional map input_fields // key-value structure of input variables required by the evaluator +} + +// the output data structure for custom evaluator +struct InvokeEvaluatorOutputData { + 1: optional InvokeEvaluatorResult evaluator_result + 2: optional InvokeEvaluatorUsage evaluator_usage + 3: optional InvokeEvaluatorRunError evaluator_run_error +} + +// the result data structure for custom evaluator +struct InvokeEvaluatorResult { + 1: optional double score + 2: optional string reasoning +} + +// the usage data structure for custom evaluator +struct InvokeEvaluatorUsage { + 1: optional i64 input_tokens + 2: optional i64 output_tokens +} + +// the error data structure for custom evaluator +struct InvokeEvaluatorRunError { + 1: optional i32 code + 2: optional string message +} + +// invoke custom evaluator request +struct InvokeEvaluatorRequest { + 1: optional i64 workspace_id + 2: optional InvokeCustomEvaluator evaluator + 3: optional InvokeEvaluatorInputData input_data + + 255: optional base.Base Base +} + +// invoke custom evaluator response +struct InvokeEvaluatorResponse { + 1: optional InvokeEvaluatorOutputData output_data + 2: optional InvokeEvaluatorRunStatus status + + 255: base.BaseResp BaseResp +} + service EvaluationSPIService { SearchEvalTargetResponse SearchEvalTarget(1: SearchEvalTargetRequest req) // 搜索评测对象 InvokeEvalTargetResponse InvokeEvalTarget(1: InvokeEvalTargetRequest req) // 执行 AsyncInvokeEvalTargetResponse AsyncInvokeEvalTarget(1: AsyncInvokeEvalTargetRequest req) // 异步执行 -} \ No newline at end of file + + // invoke custom evaluator + InvokeEvaluatorResponse InvokeEvaluator(1: InvokeEvaluatorRequest req) +} diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index 99a283286..0043bcab9 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -6,7 +6,7 @@ include "../../llm/domain/runtime.thrift" enum EvaluatorType { Prompt = 1 Code = 2 - Builtin = 3 + CustomRPC = 3 } typedef string LanguageType(ts.enum="true") @@ -48,6 +48,9 @@ const EvaluatorTagKey EvaluatorTagKey_BusinessScenario = "BusinessScenario" // const EvaluatorTagKey EvaluatorTagKey_BoxType = "BoxType" // 黑白盒类型 const EvaluatorTagKey EvaluatorTagKey_Name = "Name" // 评估器名称 +typedef string AccessProtocol +const AccessProtocol AccessProtocol_RPC = "rpc" + struct Tool { 1: ToolType type (go.tag ='mapstructure:"type"') 2: optional Function function (go.tag ='mapstructure:"function"') @@ -75,6 +78,15 @@ struct CodeEvaluator { 4: optional string code_template_name } +struct CustomRPCEvaluator { + 1: optional string provider_evaluator_code // 自定义评估器编码，例如：EvalBot的给“代码生成-代码正确”赋予CN:480的评估器ID + 2: required AccessProtocol access_protocol // 本期是RPC，后续还可拓展HTTP + 3: optional string service_name + 4: optional string cluster + + 10: optional i64 timeout // ms +} + struct EvaluatorVersion { 1: optional i64 id (api.js_conv = 'true', go.tag = 'json:"id"') // 版本id 3: optional string version @@ -91,6 +103,7 @@ struct EvaluatorContent { // 101-200 Evaluator类型 101: optional PromptEvaluator prompt_evaluator (go.tag ='mapstructure:"prompt_evaluator"') 102: optional CodeEvaluator code_evaluator + 103: optional CustomRPCEvaluator custom_rpc_evaluator } struct Evaluator { From b096d218f58bbc021ff1e30a79af8aafcff029aa Mon Sep 17 00:00:00 2001 From: tpfz Date: Fri, 31 Oct 2025 14:58:35 +0800 Subject: [PATCH 07/42] =?UTF-8?q?debug=20Builtin=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluation/application/evaluator_app.go | 22 ++++++++++--- .../evaluation/domain/service/evaluator.go | 3 ++ .../domain/service/evaluator_impl.go | 33 +++++++++++++++++++ .../infra/repo/evaluator/evaluator_impl.go | 20 +++++++++++ 4 files changed, 73 insertions(+), 5 deletions(-) diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index 49d0cf578..e9f9d002f 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -1537,13 +1537,25 @@ func (e *EvaluatorHandlerImpl) DebugBuiltinEvaluator(ctx context.Context, reques if err != nil { return nil, err } + // 1) 通过 evaluator_id 查询预置评估器（按 builtin_visible_version 组装） + builtinEvaluatorDO, err := e.evaluatorService.GetBuiltinEvaluator(ctx, request.GetEvaluatorID()) + if err != nil { + return nil, err + } + if builtinEvaluatorDO == nil { + return nil, errorx.NewByCode(errno.EvaluatorNotExistCode) + } - // TODO: 实现预置评估器调试逻辑 - // 这里需要根据具体的预置评估器调试需求来实现 + // 2) 调用调试逻辑 + inputDataDO := evaluatorconvertor.ConvertEvaluatorInputDataDTO2DO(request.GetInputData()) + outputDataDO, err := e.evaluatorService.DebugEvaluator(ctx, builtinEvaluatorDO, inputDataDO) + if err != nil { + return nil, err + } + + // 3) 返回结果 return &evaluator.DebugBuiltinEvaluatorResponse{ - OutputData: &evaluatordto.EvaluatorOutputData{ - // 返回空的输出数据，具体实现需要根据业务需求 - }, + OutputData: evaluatorconvertor.ConvertEvaluatorOutputDataDO2DTO(outputDataDO), }, nil } diff --git a/backend/modules/evaluation/domain/service/evaluator.go b/backend/modules/evaluation/domain/service/evaluator.go index 3c2a3be88..3faf103db 100644 --- a/backend/modules/evaluation/domain/service/evaluator.go +++ b/backend/modules/evaluation/domain/service/evaluator.go @@ -33,6 +33,9 @@ type EvaluatorService interface { RunEvaluator(ctx context.Context, request *entity.RunEvaluatorRequest) (*entity.EvaluatorRecord, error) // DebugEvaluator 调试 evaluator_version DebugEvaluator(ctx context.Context, evaluatorDO *entity.Evaluator, inputData *entity.EvaluatorInputData) (*entity.EvaluatorOutputData, error) + // GetBuiltinEvaluator 根据 evaluatorID 查询元信息，若为预置评估器则按 builtin_visible_version 组装返回 + // 非预置评估器则返回nil + GetBuiltinEvaluator(ctx context.Context, evaluatorID int64) (*entity.Evaluator, error) // GetEvaluatorVersion 按 version id 单个查询 evaluator_version version // builtin=true 时查询内置评估器，需传入 spaceID；否则查询普通评估器 GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, builtin bool) (*entity.Evaluator, error) diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index be249811e..6565bf0e4 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -178,6 +178,39 @@ func (e *EvaluatorServiceImpl) GetEvaluator(ctx context.Context, spaceID, evalua return drafts[0], nil } +// GetBuiltinEvaluator 根据 evaluatorID 查询元信息，若为预置评估器则按 builtin_visible_version 组装返回 +// 非预置评估器或条件不满足时返回 nil +func (e *EvaluatorServiceImpl) GetBuiltinEvaluator(ctx context.Context, evaluatorID int64) (*entity.Evaluator, error) { + if evaluatorID == 0 { + return nil, nil + } + + // 0) 查询元信息以判断是否为预置评估器及其可见版本 + metas, err := e.evaluatorRepo.BatchGetEvaluatorMetaByID(ctx, []int64{evaluatorID}, false) + if err != nil { + return nil, err + } + if len(metas) == 0 || metas[0] == nil { + return nil, nil + } + meta := metas[0] + if !meta.Builtin || meta.BuiltinVisibleVersion == "" { + return nil, nil + } + + // 1) 通过 (evaluator_id, builtin_visible_version) 获取对应版本 + pairs := [][2]interface{}{{evaluatorID, meta.BuiltinVisibleVersion}} + versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) + if err != nil { + return nil, err + } + if len(versions) == 0 { + return nil, nil + } + + return versions[0], nil +} + // CreateEvaluator 创建 evaluator_version func (e *EvaluatorServiceImpl) CreateEvaluator(ctx context.Context, evaluator *entity.Evaluator, cid string) (int64, error) { err := e.idem.Set(ctx, e.makeCreateIdemKey(cid), time.Second*10) diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 93feda074..5683d4ad2 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -42,12 +42,32 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ct if err != nil { return nil, err } + // 收集 evaluatorIDs 以批量获取标签 + evaluatorIDs := make([]int64, 0, len(pos)) + for _, po := range pos { + evaluatorIDs = append(evaluatorIDs, po.EvaluatorID) + } + + // 批量查询标签（以 evaluatorID 为 source_id），按当前语言 + tagsBySourceID := make(map[int64][]*model.EvaluatorTag) + if len(evaluatorIDs) > 0 { + allTags, tagErr := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, evaluatorIDs, int32(entity.EvaluatorTagKeyType_Evaluator), contexts.CtxLocale(ctx)) + if tagErr == nil { + for _, tag := range allTags { + tagsBySourceID[tag.SourceID] = append(tagsBySourceID[tag.SourceID], tag) + } + } + } + + // 转换并回填标签 result := make([]*entity.Evaluator, 0, len(pos)) for _, po := range pos { do, err := convertor.ConvertEvaluatorVersionPO2DO(po) if err != nil { return nil, err } + // 根据 evaluatorID 设置标签 + r.setEvaluatorTags(do, po.EvaluatorID, tagsBySourceID) result = append(result, do) } return result, nil From 0b1bf1c565024b23d6c44634192da63b3e62d381 Mon Sep 17 00:00:00 2001 From: tpfz Date: Sat, 1 Nov 2025 17:30:29 +0800 Subject: [PATCH 08/42] feat: [Coda] evaluator ecosystem updates (LogID: 202511011729310100911101348364636) Co-Authored-By: Coda --- .../coze/loop/apis/evaluator_service.go | 16 - .../evaluation/domain/evaluator/evaluator.go | 114 ++- .../domain/evaluator/k-evaluator.go | 53 ++ .../coze.loop.evaluation.evaluator.go | 853 ++++-------------- ...oze.loop.evaluation.evaluator_validator.go | 21 - .../k-coze.loop.evaluation.evaluator.go | 539 ++--------- .../application/convertor/common/common.go | 22 +- .../convertor/evaluator/evaluator.go | 49 +- .../convertor/evaluator/evaluator_tag.go | 2 - .../convertor/evaluator/evaluator_tag_test.go | 4 +- .../convertor/evaluator/evaluator_test.go | 86 +- .../evaluation/application/evaluator_app.go | 57 +- .../application/evaluator_app_test.go | 6 +- .../evaluation/domain/entity/common.go | 1 + .../evaluation/domain/entity/evaluator.go | 28 +- .../evaluation/domain/repo/evaluator.go | 4 +- .../domain/repo/mocks/evaluator_mock.go | 66 +- .../repo/mocks/evaluator_template_mock.go | 14 + .../evaluation/domain/service/evaluator.go | 4 +- .../domain/service/evaluator_impl.go | 26 +- .../domain/service/evaluator_impl_test.go | 111 +-- .../service/evaluator_template_impl_test.go | 23 +- .../service/mocks/evaluator_service_mock.go | 37 +- .../infra/repo/evaluator/evaluator_impl.go | 142 +-- .../repo/evaluator/evaluator_impl_test.go | 114 +-- .../evaluator/evaluator_template_impl_test.go | 9 + .../evaluator/list_builtin_evaluator_test.go | 2 - .../evaluator/mysql/convertor/evaluator.go | 16 + .../infra/repo/evaluator/mysql/evaluator.go | 3 + .../mysql/evaluator_tag_filter_test.go | 70 +- .../mysql/gorm_gen/model/evaluator.gen.go | 1 + .../mysql/gorm_gen/query/evaluator.gen.go | 6 +- .../evaluator/mysql/mocks/evaluator_mock.go | 24 +- .../mysql/mocks/evaluator_template_mock.go | 19 + .../mysql/mocks/evaluator_version_mock.go | 20 + .../pkg/conf/evaluator_template_space_test.go | 70 -- .../evaluation/pkg/conf/evaluator_test.go | 57 ++ .../pkg/conf/mocks/evaluator_configer.go | 28 + .../coze.loop.evaluation.evaluator.thrift | 17 +- .../loop/evaluation/domain/evaluator.thrift | 6 +- .../mysql-init/init-sql/evaluator.sql | 1 + 41 files changed, 1061 insertions(+), 1680 deletions(-) delete mode 100644 backend/modules/evaluation/pkg/conf/evaluator_template_space_test.go diff --git a/backend/api/handler/coze/loop/apis/evaluator_service.go b/backend/api/handler/coze/loop/apis/evaluator_service.go index 8da52dd99..4d46c6664 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service.go @@ -187,22 +187,6 @@ func GetTemplateInfoV2(ctx context.Context, c *app.RequestContext) { c.JSON(consts.StatusOK, resp) } -// GetLatestEvaluatorVersion . -// @router /api/evaluation/v1/evaluators/:evaluator_id/latest_version [POST] -func GetLatestEvaluatorVersion(ctx context.Context, c *app.RequestContext) { - var err error - var req evaluator.GetLatestEvaluatorVersionRequest - err = c.BindAndValidate(&req) - if err != nil { - c.String(consts.StatusBadRequest, err.Error()) - return - } - - resp := new(evaluator.GetLatestEvaluatorVersionResponse) - - c.JSON(consts.StatusOK, resp) -} - // DebugBuiltinEvaluator . // @router /api/evaluation/v1/evaluators/debug_builtin [POST] func DebugBuiltinEvaluator(ctx context.Context, c *app.RequestContext) { diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go index 9a75796d0..c6c36bf35 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go @@ -28,10 +28,12 @@ const ( EvaluatorTagKeyBusinessScenario = "BusinessScenario" - EvaluatorTagKeyBoxType = "BoxType" - EvaluatorTagKeyName = "Name" + EvaluatorBoxTypeWhite = "White" + + EvaluatorBoxTypeBlack = "Black" + AccessProtocolRPC = "rpc" EvaluatorFilterLogicOpUnknown = "Unknown" @@ -291,6 +293,8 @@ type EvaluatorTagLangType = string // Evaluator筛选字段 type EvaluatorTagKey = string +type EvaluatorBoxType = string + type AccessProtocol = string // 筛选逻辑操作符 @@ -3400,20 +3404,22 @@ func (p *EvaluatorContent) Field103DeepEqual(src *CustomRPCEvaluator) bool { } type Evaluator struct { - EvaluatorID *int64 `thrift:"evaluator_id,1,optional" frugal:"1,optional,i64" json:"evaluator_id" form:"evaluator_id" query:"evaluator_id"` - WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" form:"workspace_id" query:"workspace_id"` - EvaluatorType *EvaluatorType `thrift:"evaluator_type,3,optional" frugal:"3,optional,EvaluatorType" form:"evaluator_type" json:"evaluator_type,omitempty" query:"evaluator_type"` - Name *string `thrift:"name,4,optional" frugal:"4,optional,string" form:"name" json:"name,omitempty" query:"name"` - Description *string `thrift:"description,5,optional" frugal:"5,optional,string" form:"description" json:"description,omitempty" query:"description"` - DraftSubmitted *bool `thrift:"draft_submitted,6,optional" frugal:"6,optional,bool" form:"draft_submitted" json:"draft_submitted,omitempty" query:"draft_submitted"` - BaseInfo *common.BaseInfo `thrift:"base_info,7,optional" frugal:"7,optional,common.BaseInfo" form:"base_info" json:"base_info,omitempty" query:"base_info"` - CurrentVersion *EvaluatorVersion `thrift:"current_version,11,optional" frugal:"11,optional,EvaluatorVersion" form:"current_version" json:"current_version,omitempty" query:"current_version"` - LatestVersion *string `thrift:"latest_version,12,optional" frugal:"12,optional,string" form:"latest_version" json:"latest_version,omitempty" query:"latest_version"` - Builtin *bool `thrift:"builtin,20,optional" frugal:"20,optional,bool" json:"builtin" form:"builtin" query:"builtin"` - Benchmark *string `thrift:"benchmark,21,optional" frugal:"21,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` - Vendor *string `thrift:"vendor,22,optional" frugal:"22,optional,string" json:"vendor" form:"vendor" query:"vendor"` - BuiltinVisibleVersion *string `thrift:"builtin_visible_version,23,optional" frugal:"23,optional,string" json:"builtin_visible_version" form:"builtin_visible_version" query:"builtin_visible_version"` - Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `thrift:"tags,100,optional" frugal:"100,optional,map>>" json:"tags" form:"tags" query:"tags"` + EvaluatorID *int64 `thrift:"evaluator_id,1,optional" frugal:"1,optional,i64" json:"evaluator_id" form:"evaluator_id" query:"evaluator_id"` + WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" form:"workspace_id" query:"workspace_id"` + EvaluatorType *EvaluatorType `thrift:"evaluator_type,3,optional" frugal:"3,optional,EvaluatorType" form:"evaluator_type" json:"evaluator_type,omitempty" query:"evaluator_type"` + Name *string `thrift:"name,4,optional" frugal:"4,optional,string" form:"name" json:"name,omitempty" query:"name"` + Description *string `thrift:"description,5,optional" frugal:"5,optional,string" form:"description" json:"description,omitempty" query:"description"` + DraftSubmitted *bool `thrift:"draft_submitted,6,optional" frugal:"6,optional,bool" form:"draft_submitted" json:"draft_submitted,omitempty" query:"draft_submitted"` + BaseInfo *common.BaseInfo `thrift:"base_info,7,optional" frugal:"7,optional,common.BaseInfo" form:"base_info" json:"base_info,omitempty" query:"base_info"` + CurrentVersion *EvaluatorVersion `thrift:"current_version,11,optional" frugal:"11,optional,EvaluatorVersion" form:"current_version" json:"current_version,omitempty" query:"current_version"` + LatestVersion *string `thrift:"latest_version,12,optional" frugal:"12,optional,string" form:"latest_version" json:"latest_version,omitempty" query:"latest_version"` + Builtin *bool `thrift:"builtin,20,optional" frugal:"20,optional,bool" json:"builtin" form:"builtin" query:"builtin"` + Benchmark *string `thrift:"benchmark,21,optional" frugal:"21,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` + Vendor *string `thrift:"vendor,22,optional" frugal:"22,optional,string" json:"vendor" form:"vendor" query:"vendor"` + BuiltinVisibleVersion *string `thrift:"builtin_visible_version,23,optional" frugal:"23,optional,string" json:"builtin_visible_version" form:"builtin_visible_version" query:"builtin_visible_version"` + // 默认白盒 + BoxType *EvaluatorBoxType `thrift:"box_type,24,optional" frugal:"24,optional,string" json:"box_type" form:"box_type" query:"box_type"` + Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `thrift:"tags,100,optional" frugal:"100,optional,map>>" json:"tags" form:"tags" query:"tags"` } func NewEvaluator() *Evaluator { @@ -3579,6 +3585,18 @@ func (p *Evaluator) GetBuiltinVisibleVersion() (v string) { return *p.BuiltinVisibleVersion } +var Evaluator_BoxType_DEFAULT EvaluatorBoxType + +func (p *Evaluator) GetBoxType() (v EvaluatorBoxType) { + if p == nil { + return + } + if !p.IsSetBoxType() { + return Evaluator_BoxType_DEFAULT + } + return *p.BoxType +} + var Evaluator_Tags_DEFAULT map[EvaluatorTagLangType]map[EvaluatorTagKey][]string func (p *Evaluator) GetTags() (v map[EvaluatorTagLangType]map[EvaluatorTagKey][]string) { @@ -3629,6 +3647,9 @@ func (p *Evaluator) SetVendor(val *string) { func (p *Evaluator) SetBuiltinVisibleVersion(val *string) { p.BuiltinVisibleVersion = val } +func (p *Evaluator) SetBoxType(val *EvaluatorBoxType) { + p.BoxType = val +} func (p *Evaluator) SetTags(val map[EvaluatorTagLangType]map[EvaluatorTagKey][]string) { p.Tags = val } @@ -3647,6 +3668,7 @@ var fieldIDToName_Evaluator = map[int16]string{ 21: "benchmark", 22: "vendor", 23: "builtin_visible_version", + 24: "box_type", 100: "tags", } @@ -3702,6 +3724,10 @@ func (p *Evaluator) IsSetBuiltinVisibleVersion() bool { return p.BuiltinVisibleVersion != nil } +func (p *Evaluator) IsSetBoxType() bool { + return p.BoxType != nil +} + func (p *Evaluator) IsSetTags() bool { return p.Tags != nil } @@ -3828,6 +3854,14 @@ func (p *Evaluator) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 24: + if fieldTypeId == thrift.STRING { + if err = p.ReadField24(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } case 100: if fieldTypeId == thrift.MAP { if err = p.ReadField100(iprot); err != nil { @@ -4003,6 +4037,17 @@ func (p *Evaluator) ReadField23(iprot thrift.TProtocol) error { p.BuiltinVisibleVersion = _field return nil } +func (p *Evaluator) ReadField24(iprot thrift.TProtocol) error { + + var _field *EvaluatorBoxType + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.BoxType = _field + return nil +} func (p *Evaluator) ReadField100(iprot thrift.TProtocol) error { _, _, size, err := iprot.ReadMapBegin() if err != nil { @@ -4121,6 +4166,10 @@ func (p *Evaluator) Write(oprot thrift.TProtocol) (err error) { fieldId = 23 goto WriteFieldError } + if err = p.writeField24(oprot); err != nil { + fieldId = 24 + goto WriteFieldError + } if err = p.writeField100(oprot); err != nil { fieldId = 100 goto WriteFieldError @@ -4377,6 +4426,24 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 23 end error: ", p), err) } +func (p *Evaluator) writeField24(oprot thrift.TProtocol) (err error) { + if p.IsSetBoxType() { + if err = oprot.WriteFieldBegin("box_type", thrift.STRING, 24); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.BoxType); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 24 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 24 end error: ", p), err) +} func (p *Evaluator) writeField100(oprot thrift.TProtocol) (err error) { if p.IsSetTags() { if err = oprot.WriteFieldBegin("tags", thrift.MAP, 100); err != nil { @@ -4479,6 +4546,9 @@ func (p *Evaluator) DeepEqual(ano *Evaluator) bool { if !p.Field23DeepEqual(ano.BuiltinVisibleVersion) { return false } + if !p.Field24DeepEqual(ano.BoxType) { + return false + } if !p.Field100DeepEqual(ano.Tags) { return false } @@ -4631,6 +4701,18 @@ func (p *Evaluator) Field23DeepEqual(src *string) bool { } return true } +func (p *Evaluator) Field24DeepEqual(src *EvaluatorBoxType) bool { + + if p.BoxType == src { + return true + } else if p.BoxType == nil || src == nil { + return false + } + if strings.Compare(*p.BoxType, *src) != 0 { + return false + } + return true +} func (p *Evaluator) Field100DeepEqual(src map[EvaluatorTagLangType]map[EvaluatorTagKey][]string) bool { if len(p.Tags) != len(src) { diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go index 82a1243ee..690882344 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go @@ -2485,6 +2485,20 @@ func (p *Evaluator) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 24: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField24(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 100: if fieldTypeId == thrift.MAP { l, err = p.FastReadField100(buf[offset:]) @@ -2697,6 +2711,20 @@ func (p *Evaluator) FastReadField23(buf []byte) (int, error) { return offset, nil } +func (p *Evaluator) FastReadField24(buf []byte) (int, error) { + offset := 0 + + var _field *EvaluatorBoxType + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.BoxType = _field + return offset, nil +} + func (p *Evaluator) FastReadField100(buf []byte) (int, error) { offset := 0 @@ -2777,6 +2805,7 @@ func (p *Evaluator) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset += p.fastWriteField21(buf[offset:], w) offset += p.fastWriteField22(buf[offset:], w) offset += p.fastWriteField23(buf[offset:], w) + offset += p.fastWriteField24(buf[offset:], w) offset += p.fastWriteField100(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -2799,6 +2828,7 @@ func (p *Evaluator) BLength() int { l += p.field21Length() l += p.field22Length() l += p.field23Length() + l += p.field24Length() l += p.field100Length() } l += thrift.Binary.FieldStopLength() @@ -2922,6 +2952,15 @@ func (p *Evaluator) fastWriteField23(buf []byte, w thrift.NocopyWriter) int { return offset } +func (p *Evaluator) fastWriteField24(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBoxType() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 24) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.BoxType) + } + return offset +} + func (p *Evaluator) fastWriteField100(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetTags() { @@ -3071,6 +3110,15 @@ func (p *Evaluator) field23Length() int { return l } +func (p *Evaluator) field24Length() int { + l := 0 + if p.IsSetBoxType() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.BoxType) + } + return l +} + func (p *Evaluator) field100Length() int { l := 0 if p.IsSetTags() { @@ -3193,6 +3241,11 @@ func (p *Evaluator) DeepCopy(s interface{}) error { p.BuiltinVisibleVersion = &tmp } + if src.BoxType != nil { + tmp := *src.BoxType + p.BoxType = &tmp + } + if src.Tags != nil { p.Tags = make(map[EvaluatorTagLangType]map[EvaluatorTagKey][]string, len(src.Tags)) for key, val := range src.Tags { diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go index 37e041b6f..a3d207a4b 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go @@ -3952,11 +3952,12 @@ type UpdateEvaluatorRequest struct { // 描述 Description *string `thrift:"description,5,optional" frugal:"5,optional,string" json:"description" form:"description" ` // 是否预置评估器 - Builtin *bool `thrift:"builtin,11,optional" frugal:"11,optional,bool" json:"builtin" form:"builtin" ` - Benchmark *string `thrift:"benchmark,12,optional" frugal:"12,optional,string" json:"benchmark" form:"benchmark" ` - Vendor *string `thrift:"vendor,13,optional" frugal:"13,optional,string" json:"vendor" form:"vendor" ` - BuiltinVisibleVersion *string `thrift:"builtin_visible_version,14,optional" frugal:"14,optional,string" json:"builtin_visible_version" form:"builtin_visible_version" ` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + Builtin *bool `thrift:"builtin,11,optional" frugal:"11,optional,bool" json:"builtin" form:"builtin" ` + Benchmark *string `thrift:"benchmark,12,optional" frugal:"12,optional,string" json:"benchmark" form:"benchmark" ` + Vendor *string `thrift:"vendor,13,optional" frugal:"13,optional,string" json:"vendor" form:"vendor" ` + BuiltinVisibleVersion *string `thrift:"builtin_visible_version,14,optional" frugal:"14,optional,string" json:"builtin_visible_version" form:"builtin_visible_version" ` + BoxType *evaluator.EvaluatorBoxType `thrift:"box_type,15,optional" frugal:"15,optional,string" json:"box_type" form:"box_type" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewUpdateEvaluatorRequest() *UpdateEvaluatorRequest { @@ -4059,6 +4060,18 @@ func (p *UpdateEvaluatorRequest) GetBuiltinVisibleVersion() (v string) { return *p.BuiltinVisibleVersion } +var UpdateEvaluatorRequest_BoxType_DEFAULT evaluator.EvaluatorBoxType + +func (p *UpdateEvaluatorRequest) GetBoxType() (v evaluator.EvaluatorBoxType) { + if p == nil { + return + } + if !p.IsSetBoxType() { + return UpdateEvaluatorRequest_BoxType_DEFAULT + } + return *p.BoxType +} + var UpdateEvaluatorRequest_Base_DEFAULT *base.Base func (p *UpdateEvaluatorRequest) GetBase() (v *base.Base) { @@ -4097,6 +4110,9 @@ func (p *UpdateEvaluatorRequest) SetVendor(val *string) { func (p *UpdateEvaluatorRequest) SetBuiltinVisibleVersion(val *string) { p.BuiltinVisibleVersion = val } +func (p *UpdateEvaluatorRequest) SetBoxType(val *evaluator.EvaluatorBoxType) { + p.BoxType = val +} func (p *UpdateEvaluatorRequest) SetBase(val *base.Base) { p.Base = val } @@ -4111,6 +4127,7 @@ var fieldIDToName_UpdateEvaluatorRequest = map[int16]string{ 12: "benchmark", 13: "vendor", 14: "builtin_visible_version", + 15: "box_type", 255: "Base", } @@ -4138,6 +4155,10 @@ func (p *UpdateEvaluatorRequest) IsSetBuiltinVisibleVersion() bool { return p.BuiltinVisibleVersion != nil } +func (p *UpdateEvaluatorRequest) IsSetBoxType() bool { + return p.BoxType != nil +} + func (p *UpdateEvaluatorRequest) IsSetBase() bool { return p.Base != nil } @@ -4238,6 +4259,14 @@ func (p *UpdateEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 15: + if fieldTypeId == thrift.STRING { + if err = p.ReadField15(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } case 255: if fieldTypeId == thrift.STRUCT { if err = p.ReadField255(iprot); err != nil { @@ -4390,6 +4419,17 @@ func (p *UpdateEvaluatorRequest) ReadField14(iprot thrift.TProtocol) error { p.BuiltinVisibleVersion = _field return nil } +func (p *UpdateEvaluatorRequest) ReadField15(iprot thrift.TProtocol) error { + + var _field *evaluator.EvaluatorBoxType + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.BoxType = _field + return nil +} func (p *UpdateEvaluatorRequest) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBase() if err := _field.Read(iprot); err != nil { @@ -4441,6 +4481,10 @@ func (p *UpdateEvaluatorRequest) Write(oprot thrift.TProtocol) (err error) { fieldId = 14 goto WriteFieldError } + if err = p.writeField15(oprot); err != nil { + fieldId = 15 + goto WriteFieldError + } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -4619,6 +4663,24 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 14 end error: ", p), err) } +func (p *UpdateEvaluatorRequest) writeField15(oprot thrift.TProtocol) (err error) { + if p.IsSetBoxType() { + if err = oprot.WriteFieldBegin("box_type", thrift.STRING, 15); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.BoxType); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 15 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 15 end error: ", p), err) +} func (p *UpdateEvaluatorRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { @@ -4679,6 +4741,9 @@ func (p *UpdateEvaluatorRequest) DeepEqual(ano *UpdateEvaluatorRequest) bool { if !p.Field14DeepEqual(ano.BuiltinVisibleVersion) { return false } + if !p.Field15DeepEqual(ano.BoxType) { + return false + } if !p.Field255DeepEqual(ano.Base) { return false } @@ -4778,6 +4843,18 @@ func (p *UpdateEvaluatorRequest) Field14DeepEqual(src *string) bool { } return true } +func (p *UpdateEvaluatorRequest) Field15DeepEqual(src *evaluator.EvaluatorBoxType) bool { + + if p.BoxType == src { + return true + } else if p.BoxType == nil || src == nil { + return false + } + if strings.Compare(*p.BoxType, *src) != 0 { + return false + } + return true +} func (p *UpdateEvaluatorRequest) Field255DeepEqual(src *base.Base) bool { if !p.Base.DeepEqual(src) { @@ -18925,99 +19002,92 @@ func (p *GetTemplateInfoV2Response) Field255DeepEqual(src *base.BaseResp) bool { return true } -type GetLatestEvaluatorVersionRequest struct { - EvaluatorID int64 `thrift:"evaluator_id,1,required" frugal:"1,required,i64" json:"evaluator_id" path:"evaluator_id,required" ` - WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" query:"workspace_id" ` - // 是否预置评估器 - Builtin *bool `thrift:"builtin,3,optional" frugal:"3,optional,bool" json:"builtin,omitempty" query:"builtin"` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` +type DebugBuiltinEvaluatorRequest struct { + EvaluatorID int64 `thrift:"evaluator_id,1,required" frugal:"1,required,i64" json:"evaluator_id" form:"evaluator_id,required" ` + InputData *evaluator.EvaluatorInputData `thrift:"input_data,2,required" frugal:"2,required,evaluator.EvaluatorInputData" form:"input_data,required" json:"input_data,required"` + // 空间 id + WorkspaceID int64 `thrift:"workspace_id,3,required" frugal:"3,required,i64" json:"workspace_id" form:"workspace_id,required" ` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } -func NewGetLatestEvaluatorVersionRequest() *GetLatestEvaluatorVersionRequest { - return &GetLatestEvaluatorVersionRequest{} +func NewDebugBuiltinEvaluatorRequest() *DebugBuiltinEvaluatorRequest { + return &DebugBuiltinEvaluatorRequest{} } -func (p *GetLatestEvaluatorVersionRequest) InitDefault() { +func (p *DebugBuiltinEvaluatorRequest) InitDefault() { } -func (p *GetLatestEvaluatorVersionRequest) GetEvaluatorID() (v int64) { +func (p *DebugBuiltinEvaluatorRequest) GetEvaluatorID() (v int64) { if p != nil { return p.EvaluatorID } return } -var GetLatestEvaluatorVersionRequest_WorkspaceID_DEFAULT int64 +var DebugBuiltinEvaluatorRequest_InputData_DEFAULT *evaluator.EvaluatorInputData -func (p *GetLatestEvaluatorVersionRequest) GetWorkspaceID() (v int64) { +func (p *DebugBuiltinEvaluatorRequest) GetInputData() (v *evaluator.EvaluatorInputData) { if p == nil { return } - if !p.IsSetWorkspaceID() { - return GetLatestEvaluatorVersionRequest_WorkspaceID_DEFAULT + if !p.IsSetInputData() { + return DebugBuiltinEvaluatorRequest_InputData_DEFAULT } - return *p.WorkspaceID + return p.InputData } -var GetLatestEvaluatorVersionRequest_Builtin_DEFAULT bool - -func (p *GetLatestEvaluatorVersionRequest) GetBuiltin() (v bool) { - if p == nil { - return - } - if !p.IsSetBuiltin() { - return GetLatestEvaluatorVersionRequest_Builtin_DEFAULT +func (p *DebugBuiltinEvaluatorRequest) GetWorkspaceID() (v int64) { + if p != nil { + return p.WorkspaceID } - return *p.Builtin + return } -var GetLatestEvaluatorVersionRequest_Base_DEFAULT *base.Base +var DebugBuiltinEvaluatorRequest_Base_DEFAULT *base.Base -func (p *GetLatestEvaluatorVersionRequest) GetBase() (v *base.Base) { +func (p *DebugBuiltinEvaluatorRequest) GetBase() (v *base.Base) { if p == nil { return } if !p.IsSetBase() { - return GetLatestEvaluatorVersionRequest_Base_DEFAULT + return DebugBuiltinEvaluatorRequest_Base_DEFAULT } return p.Base } -func (p *GetLatestEvaluatorVersionRequest) SetEvaluatorID(val int64) { +func (p *DebugBuiltinEvaluatorRequest) SetEvaluatorID(val int64) { p.EvaluatorID = val } -func (p *GetLatestEvaluatorVersionRequest) SetWorkspaceID(val *int64) { - p.WorkspaceID = val +func (p *DebugBuiltinEvaluatorRequest) SetInputData(val *evaluator.EvaluatorInputData) { + p.InputData = val } -func (p *GetLatestEvaluatorVersionRequest) SetBuiltin(val *bool) { - p.Builtin = val +func (p *DebugBuiltinEvaluatorRequest) SetWorkspaceID(val int64) { + p.WorkspaceID = val } -func (p *GetLatestEvaluatorVersionRequest) SetBase(val *base.Base) { +func (p *DebugBuiltinEvaluatorRequest) SetBase(val *base.Base) { p.Base = val } -var fieldIDToName_GetLatestEvaluatorVersionRequest = map[int16]string{ +var fieldIDToName_DebugBuiltinEvaluatorRequest = map[int16]string{ 1: "evaluator_id", - 2: "workspace_id", - 3: "builtin", + 2: "input_data", + 3: "workspace_id", 255: "Base", } -func (p *GetLatestEvaluatorVersionRequest) IsSetWorkspaceID() bool { - return p.WorkspaceID != nil -} - -func (p *GetLatestEvaluatorVersionRequest) IsSetBuiltin() bool { - return p.Builtin != nil +func (p *DebugBuiltinEvaluatorRequest) IsSetInputData() bool { + return p.InputData != nil } -func (p *GetLatestEvaluatorVersionRequest) IsSetBase() bool { +func (p *DebugBuiltinEvaluatorRequest) IsSetBase() bool { return p.Base != nil } -func (p *GetLatestEvaluatorVersionRequest) Read(iprot thrift.TProtocol) (err error) { +func (p *DebugBuiltinEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 var issetEvaluatorID bool = false + var issetInputData bool = false + var issetWorkspaceID bool = false if _, err = iprot.ReadStructBegin(); err != nil { goto ReadStructBeginError @@ -19043,18 +19113,20 @@ func (p *GetLatestEvaluatorVersionRequest) Read(iprot thrift.TProtocol) (err err goto SkipFieldError } case 2: - if fieldTypeId == thrift.I64 { + if fieldTypeId == thrift.STRUCT { if err = p.ReadField2(iprot); err != nil { goto ReadFieldError } + issetInputData = true } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } case 3: - if fieldTypeId == thrift.BOOL { + if fieldTypeId == thrift.I64 { if err = p.ReadField3(iprot); err != nil { goto ReadFieldError } + issetWorkspaceID = true } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } @@ -19083,13 +19155,23 @@ func (p *GetLatestEvaluatorVersionRequest) Read(iprot thrift.TProtocol) (err err fieldId = 1 goto RequiredFieldNotSetError } + + if !issetInputData { + fieldId = 2 + goto RequiredFieldNotSetError + } + + if !issetWorkspaceID { + fieldId = 3 + goto RequiredFieldNotSetError + } return nil ReadStructBeginError: return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetLatestEvaluatorVersionRequest[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_DebugBuiltinEvaluatorRequest[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -19098,10 +19180,10 @@ ReadFieldEndError: ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) RequiredFieldNotSetError: - return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_GetLatestEvaluatorVersionRequest[fieldId])) + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_DebugBuiltinEvaluatorRequest[fieldId])) } -func (p *GetLatestEvaluatorVersionRequest) ReadField1(iprot thrift.TProtocol) error { +func (p *DebugBuiltinEvaluatorRequest) ReadField1(iprot thrift.TProtocol) error { var _field int64 if v, err := iprot.ReadI64(); err != nil { @@ -19112,29 +19194,26 @@ func (p *GetLatestEvaluatorVersionRequest) ReadField1(iprot thrift.TProtocol) er p.EvaluatorID = _field return nil } -func (p *GetLatestEvaluatorVersionRequest) ReadField2(iprot thrift.TProtocol) error { - - var _field *int64 - if v, err := iprot.ReadI64(); err != nil { +func (p *DebugBuiltinEvaluatorRequest) ReadField2(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorInputData() + if err := _field.Read(iprot); err != nil { return err - } else { - _field = &v } - p.WorkspaceID = _field + p.InputData = _field return nil } -func (p *GetLatestEvaluatorVersionRequest) ReadField3(iprot thrift.TProtocol) error { +func (p *DebugBuiltinEvaluatorRequest) ReadField3(iprot thrift.TProtocol) error { - var _field *bool - if v, err := iprot.ReadBool(); err != nil { + var _field int64 + if v, err := iprot.ReadI64(); err != nil { return err } else { - _field = &v + _field = v } - p.Builtin = _field + p.WorkspaceID = _field return nil } -func (p *GetLatestEvaluatorVersionRequest) ReadField255(iprot thrift.TProtocol) error { +func (p *DebugBuiltinEvaluatorRequest) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBase() if err := _field.Read(iprot); err != nil { return err @@ -19143,9 +19222,9 @@ func (p *GetLatestEvaluatorVersionRequest) ReadField255(iprot thrift.TProtocol) return nil } -func (p *GetLatestEvaluatorVersionRequest) Write(oprot thrift.TProtocol) (err error) { +func (p *DebugBuiltinEvaluatorRequest) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetLatestEvaluatorVersionRequest"); err != nil { + if err = oprot.WriteStructBegin("DebugBuiltinEvaluatorRequest"); err != nil { goto WriteStructBeginError } if p != nil { @@ -19183,7 +19262,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *GetLatestEvaluatorVersionRequest) writeField1(oprot thrift.TProtocol) (err error) { +func (p *DebugBuiltinEvaluatorRequest) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("evaluator_id", thrift.I64, 1); err != nil { goto WriteFieldBeginError } @@ -19199,17 +19278,15 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *GetLatestEvaluatorVersionRequest) writeField2(oprot thrift.TProtocol) (err error) { - if p.IsSetWorkspaceID() { - if err = oprot.WriteFieldBegin("workspace_id", thrift.I64, 2); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteI64(*p.WorkspaceID); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } +func (p *DebugBuiltinEvaluatorRequest) writeField2(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("input_data", thrift.STRUCT, 2); err != nil { + goto WriteFieldBeginError + } + if err := p.InputData.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError } return nil WriteFieldBeginError: @@ -19217,17 +19294,15 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) } -func (p *GetLatestEvaluatorVersionRequest) writeField3(oprot thrift.TProtocol) (err error) { - if p.IsSetBuiltin() { - if err = oprot.WriteFieldBegin("builtin", thrift.BOOL, 3); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteBool(*p.Builtin); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } +func (p *DebugBuiltinEvaluatorRequest) writeField3(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("workspace_id", thrift.I64, 3); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(p.WorkspaceID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError } return nil WriteFieldBeginError: @@ -19235,7 +19310,7 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) } -func (p *GetLatestEvaluatorVersionRequest) writeField255(oprot thrift.TProtocol) (err error) { +func (p *DebugBuiltinEvaluatorRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { goto WriteFieldBeginError @@ -19254,15 +19329,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) } -func (p *GetLatestEvaluatorVersionRequest) String() string { +func (p *DebugBuiltinEvaluatorRequest) String() string { if p == nil { return "" } - return fmt.Sprintf("GetLatestEvaluatorVersionRequest(%+v)", *p) + return fmt.Sprintf("DebugBuiltinEvaluatorRequest(%+v)", *p) } -func (p *GetLatestEvaluatorVersionRequest) DeepEqual(ano *GetLatestEvaluatorVersionRequest) bool { +func (p *DebugBuiltinEvaluatorRequest) DeepEqual(ano *DebugBuiltinEvaluatorRequest) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -19271,10 +19346,10 @@ func (p *GetLatestEvaluatorVersionRequest) DeepEqual(ano *GetLatestEvaluatorVers if !p.Field1DeepEqual(ano.EvaluatorID) { return false } - if !p.Field2DeepEqual(ano.WorkspaceID) { + if !p.Field2DeepEqual(ano.InputData) { return false } - if !p.Field3DeepEqual(ano.Builtin) { + if !p.Field3DeepEqual(ano.WorkspaceID) { return false } if !p.Field255DeepEqual(ano.Base) { @@ -19283,595 +19358,23 @@ func (p *GetLatestEvaluatorVersionRequest) DeepEqual(ano *GetLatestEvaluatorVers return true } -func (p *GetLatestEvaluatorVersionRequest) Field1DeepEqual(src int64) bool { +func (p *DebugBuiltinEvaluatorRequest) Field1DeepEqual(src int64) bool { if p.EvaluatorID != src { return false } return true } -func (p *GetLatestEvaluatorVersionRequest) Field2DeepEqual(src *int64) bool { - - if p.WorkspaceID == src { - return true - } else if p.WorkspaceID == nil || src == nil { - return false - } - if *p.WorkspaceID != *src { - return false - } - return true -} -func (p *GetLatestEvaluatorVersionRequest) Field3DeepEqual(src *bool) bool { - - if p.Builtin == src { - return true - } else if p.Builtin == nil || src == nil { - return false - } - if *p.Builtin != *src { - return false - } - return true -} -func (p *GetLatestEvaluatorVersionRequest) Field255DeepEqual(src *base.Base) bool { +func (p *DebugBuiltinEvaluatorRequest) Field2DeepEqual(src *evaluator.EvaluatorInputData) bool { - if !p.Base.DeepEqual(src) { + if !p.InputData.DeepEqual(src) { return false } return true } +func (p *DebugBuiltinEvaluatorRequest) Field3DeepEqual(src int64) bool { -type GetLatestEvaluatorVersionResponse struct { - Version *evaluator.EvaluatorVersion `thrift:"version,1,required" frugal:"1,required,evaluator.EvaluatorVersion" form:"version,required" json:"version,required"` - BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` -} - -func NewGetLatestEvaluatorVersionResponse() *GetLatestEvaluatorVersionResponse { - return &GetLatestEvaluatorVersionResponse{} -} - -func (p *GetLatestEvaluatorVersionResponse) InitDefault() { -} - -var GetLatestEvaluatorVersionResponse_Version_DEFAULT *evaluator.EvaluatorVersion - -func (p *GetLatestEvaluatorVersionResponse) GetVersion() (v *evaluator.EvaluatorVersion) { - if p == nil { - return - } - if !p.IsSetVersion() { - return GetLatestEvaluatorVersionResponse_Version_DEFAULT - } - return p.Version -} - -var GetLatestEvaluatorVersionResponse_BaseResp_DEFAULT *base.BaseResp - -func (p *GetLatestEvaluatorVersionResponse) GetBaseResp() (v *base.BaseResp) { - if p == nil { - return - } - if !p.IsSetBaseResp() { - return GetLatestEvaluatorVersionResponse_BaseResp_DEFAULT - } - return p.BaseResp -} -func (p *GetLatestEvaluatorVersionResponse) SetVersion(val *evaluator.EvaluatorVersion) { - p.Version = val -} -func (p *GetLatestEvaluatorVersionResponse) SetBaseResp(val *base.BaseResp) { - p.BaseResp = val -} - -var fieldIDToName_GetLatestEvaluatorVersionResponse = map[int16]string{ - 1: "version", - 255: "BaseResp", -} - -func (p *GetLatestEvaluatorVersionResponse) IsSetVersion() bool { - return p.Version != nil -} - -func (p *GetLatestEvaluatorVersionResponse) IsSetBaseResp() bool { - return p.BaseResp != nil -} - -func (p *GetLatestEvaluatorVersionResponse) Read(iprot thrift.TProtocol) (err error) { - var fieldTypeId thrift.TType - var fieldId int16 - var issetVersion bool = false - - if _, err = iprot.ReadStructBegin(); err != nil { - goto ReadStructBeginError - } - - for { - _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() - if err != nil { - goto ReadFieldBeginError - } - if fieldTypeId == thrift.STOP { - break - } - - switch fieldId { - case 1: - if fieldTypeId == thrift.STRUCT { - if err = p.ReadField1(iprot); err != nil { - goto ReadFieldError - } - issetVersion = true - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } - case 255: - if fieldTypeId == thrift.STRUCT { - if err = p.ReadField255(iprot); err != nil { - goto ReadFieldError - } - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } - default: - if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } - } - if err = iprot.ReadFieldEnd(); err != nil { - goto ReadFieldEndError - } - } - if err = iprot.ReadStructEnd(); err != nil { - goto ReadStructEndError - } - - if !issetVersion { - fieldId = 1 - goto RequiredFieldNotSetError - } - return nil -ReadStructBeginError: - return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) -ReadFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) -ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetLatestEvaluatorVersionResponse[fieldId]), err) -SkipFieldError: - return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) - -ReadFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) -ReadStructEndError: - return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) -RequiredFieldNotSetError: - return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_GetLatestEvaluatorVersionResponse[fieldId])) -} - -func (p *GetLatestEvaluatorVersionResponse) ReadField1(iprot thrift.TProtocol) error { - _field := evaluator.NewEvaluatorVersion() - if err := _field.Read(iprot); err != nil { - return err - } - p.Version = _field - return nil -} -func (p *GetLatestEvaluatorVersionResponse) ReadField255(iprot thrift.TProtocol) error { - _field := base.NewBaseResp() - if err := _field.Read(iprot); err != nil { - return err - } - p.BaseResp = _field - return nil -} - -func (p *GetLatestEvaluatorVersionResponse) Write(oprot thrift.TProtocol) (err error) { - var fieldId int16 - if err = oprot.WriteStructBegin("GetLatestEvaluatorVersionResponse"); err != nil { - goto WriteStructBeginError - } - if p != nil { - if err = p.writeField1(oprot); err != nil { - fieldId = 1 - goto WriteFieldError - } - if err = p.writeField255(oprot); err != nil { - fieldId = 255 - goto WriteFieldError - } - } - if err = oprot.WriteFieldStop(); err != nil { - goto WriteFieldStopError - } - if err = oprot.WriteStructEnd(); err != nil { - goto WriteStructEndError - } - return nil -WriteStructBeginError: - return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) -WriteFieldError: - return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) -WriteFieldStopError: - return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) -WriteStructEndError: - return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) -} - -func (p *GetLatestEvaluatorVersionResponse) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("version", thrift.STRUCT, 1); err != nil { - goto WriteFieldBeginError - } - if err := p.Version.Write(oprot); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) -} -func (p *GetLatestEvaluatorVersionResponse) writeField255(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { - goto WriteFieldBeginError - } - if err := p.BaseResp.Write(oprot); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) -} - -func (p *GetLatestEvaluatorVersionResponse) String() string { - if p == nil { - return "" - } - return fmt.Sprintf("GetLatestEvaluatorVersionResponse(%+v)", *p) - -} - -func (p *GetLatestEvaluatorVersionResponse) DeepEqual(ano *GetLatestEvaluatorVersionResponse) bool { - if p == ano { - return true - } else if p == nil || ano == nil { - return false - } - if !p.Field1DeepEqual(ano.Version) { - return false - } - if !p.Field255DeepEqual(ano.BaseResp) { - return false - } - return true -} - -func (p *GetLatestEvaluatorVersionResponse) Field1DeepEqual(src *evaluator.EvaluatorVersion) bool { - - if !p.Version.DeepEqual(src) { - return false - } - return true -} -func (p *GetLatestEvaluatorVersionResponse) Field255DeepEqual(src *base.BaseResp) bool { - - if !p.BaseResp.DeepEqual(src) { - return false - } - return true -} - -type DebugBuiltinEvaluatorRequest struct { - EvaluatorID int64 `thrift:"evaluator_id,1,required" frugal:"1,required,i64" json:"evaluator_id" form:"evaluator_id,required" ` - InputData *evaluator.EvaluatorInputData `thrift:"input_data,2,required" frugal:"2,required,evaluator.EvaluatorInputData" form:"input_data,required" json:"input_data,required"` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` -} - -func NewDebugBuiltinEvaluatorRequest() *DebugBuiltinEvaluatorRequest { - return &DebugBuiltinEvaluatorRequest{} -} - -func (p *DebugBuiltinEvaluatorRequest) InitDefault() { -} - -func (p *DebugBuiltinEvaluatorRequest) GetEvaluatorID() (v int64) { - if p != nil { - return p.EvaluatorID - } - return -} - -var DebugBuiltinEvaluatorRequest_InputData_DEFAULT *evaluator.EvaluatorInputData - -func (p *DebugBuiltinEvaluatorRequest) GetInputData() (v *evaluator.EvaluatorInputData) { - if p == nil { - return - } - if !p.IsSetInputData() { - return DebugBuiltinEvaluatorRequest_InputData_DEFAULT - } - return p.InputData -} - -var DebugBuiltinEvaluatorRequest_Base_DEFAULT *base.Base - -func (p *DebugBuiltinEvaluatorRequest) GetBase() (v *base.Base) { - if p == nil { - return - } - if !p.IsSetBase() { - return DebugBuiltinEvaluatorRequest_Base_DEFAULT - } - return p.Base -} -func (p *DebugBuiltinEvaluatorRequest) SetEvaluatorID(val int64) { - p.EvaluatorID = val -} -func (p *DebugBuiltinEvaluatorRequest) SetInputData(val *evaluator.EvaluatorInputData) { - p.InputData = val -} -func (p *DebugBuiltinEvaluatorRequest) SetBase(val *base.Base) { - p.Base = val -} - -var fieldIDToName_DebugBuiltinEvaluatorRequest = map[int16]string{ - 1: "evaluator_id", - 2: "input_data", - 255: "Base", -} - -func (p *DebugBuiltinEvaluatorRequest) IsSetInputData() bool { - return p.InputData != nil -} - -func (p *DebugBuiltinEvaluatorRequest) IsSetBase() bool { - return p.Base != nil -} - -func (p *DebugBuiltinEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { - var fieldTypeId thrift.TType - var fieldId int16 - var issetEvaluatorID bool = false - var issetInputData bool = false - - if _, err = iprot.ReadStructBegin(); err != nil { - goto ReadStructBeginError - } - - for { - _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() - if err != nil { - goto ReadFieldBeginError - } - if fieldTypeId == thrift.STOP { - break - } - - switch fieldId { - case 1: - if fieldTypeId == thrift.I64 { - if err = p.ReadField1(iprot); err != nil { - goto ReadFieldError - } - issetEvaluatorID = true - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } - case 2: - if fieldTypeId == thrift.STRUCT { - if err = p.ReadField2(iprot); err != nil { - goto ReadFieldError - } - issetInputData = true - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } - case 255: - if fieldTypeId == thrift.STRUCT { - if err = p.ReadField255(iprot); err != nil { - goto ReadFieldError - } - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } - default: - if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } - } - if err = iprot.ReadFieldEnd(); err != nil { - goto ReadFieldEndError - } - } - if err = iprot.ReadStructEnd(); err != nil { - goto ReadStructEndError - } - - if !issetEvaluatorID { - fieldId = 1 - goto RequiredFieldNotSetError - } - - if !issetInputData { - fieldId = 2 - goto RequiredFieldNotSetError - } - return nil -ReadStructBeginError: - return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) -ReadFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) -ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_DebugBuiltinEvaluatorRequest[fieldId]), err) -SkipFieldError: - return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) - -ReadFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) -ReadStructEndError: - return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) -RequiredFieldNotSetError: - return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_DebugBuiltinEvaluatorRequest[fieldId])) -} - -func (p *DebugBuiltinEvaluatorRequest) ReadField1(iprot thrift.TProtocol) error { - - var _field int64 - if v, err := iprot.ReadI64(); err != nil { - return err - } else { - _field = v - } - p.EvaluatorID = _field - return nil -} -func (p *DebugBuiltinEvaluatorRequest) ReadField2(iprot thrift.TProtocol) error { - _field := evaluator.NewEvaluatorInputData() - if err := _field.Read(iprot); err != nil { - return err - } - p.InputData = _field - return nil -} -func (p *DebugBuiltinEvaluatorRequest) ReadField255(iprot thrift.TProtocol) error { - _field := base.NewBase() - if err := _field.Read(iprot); err != nil { - return err - } - p.Base = _field - return nil -} - -func (p *DebugBuiltinEvaluatorRequest) Write(oprot thrift.TProtocol) (err error) { - var fieldId int16 - if err = oprot.WriteStructBegin("DebugBuiltinEvaluatorRequest"); err != nil { - goto WriteStructBeginError - } - if p != nil { - if err = p.writeField1(oprot); err != nil { - fieldId = 1 - goto WriteFieldError - } - if err = p.writeField2(oprot); err != nil { - fieldId = 2 - goto WriteFieldError - } - if err = p.writeField255(oprot); err != nil { - fieldId = 255 - goto WriteFieldError - } - } - if err = oprot.WriteFieldStop(); err != nil { - goto WriteFieldStopError - } - if err = oprot.WriteStructEnd(); err != nil { - goto WriteStructEndError - } - return nil -WriteStructBeginError: - return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) -WriteFieldError: - return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) -WriteFieldStopError: - return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) -WriteStructEndError: - return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) -} - -func (p *DebugBuiltinEvaluatorRequest) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("evaluator_id", thrift.I64, 1); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteI64(p.EvaluatorID); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) -} -func (p *DebugBuiltinEvaluatorRequest) writeField2(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("input_data", thrift.STRUCT, 2); err != nil { - goto WriteFieldBeginError - } - if err := p.InputData.Write(oprot); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) -} -func (p *DebugBuiltinEvaluatorRequest) writeField255(oprot thrift.TProtocol) (err error) { - if p.IsSetBase() { - if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { - goto WriteFieldBeginError - } - if err := p.Base.Write(oprot); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 255 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) -} - -func (p *DebugBuiltinEvaluatorRequest) String() string { - if p == nil { - return "" - } - return fmt.Sprintf("DebugBuiltinEvaluatorRequest(%+v)", *p) - -} - -func (p *DebugBuiltinEvaluatorRequest) DeepEqual(ano *DebugBuiltinEvaluatorRequest) bool { - if p == ano { - return true - } else if p == nil || ano == nil { - return false - } - if !p.Field1DeepEqual(ano.EvaluatorID) { - return false - } - if !p.Field2DeepEqual(ano.InputData) { - return false - } - if !p.Field255DeepEqual(ano.Base) { - return false - } - return true -} - -func (p *DebugBuiltinEvaluatorRequest) Field1DeepEqual(src int64) bool { - - if p.EvaluatorID != src { - return false - } - return true -} -func (p *DebugBuiltinEvaluatorRequest) Field2DeepEqual(src *evaluator.EvaluatorInputData) bool { - - if !p.InputData.DeepEqual(src) { + if p.WorkspaceID != src { return false } return true diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go index 0a8773cd4..09a748729 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go @@ -585,27 +585,6 @@ func (p *GetTemplateInfoV2Response) IsValid() error { } return nil } -func (p *GetLatestEvaluatorVersionRequest) IsValid() error { - if p.Base != nil { - if err := p.Base.IsValid(); err != nil { - return fmt.Errorf("field Base not valid, %w", err) - } - } - return nil -} -func (p *GetLatestEvaluatorVersionResponse) IsValid() error { - if p.Version != nil { - if err := p.Version.IsValid(); err != nil { - return fmt.Errorf("field Version not valid, %w", err) - } - } - if p.BaseResp != nil { - if err := p.BaseResp.IsValid(); err != nil { - return fmt.Errorf("field BaseResp not valid, %w", err) - } - } - return nil -} func (p *DebugBuiltinEvaluatorRequest) IsValid() error { if p.InputData != nil { if err := p.InputData.IsValid(); err != nil { diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go index 22be1040d..39b8e6656 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go @@ -3030,6 +3030,20 @@ func (p *UpdateEvaluatorRequest) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 15: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField15(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 255: if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField255(buf[offset:]) @@ -3205,6 +3219,20 @@ func (p *UpdateEvaluatorRequest) FastReadField14(buf []byte) (int, error) { return offset, nil } +func (p *UpdateEvaluatorRequest) FastReadField15(buf []byte) (int, error) { + offset := 0 + + var _field *evaluator.EvaluatorBoxType + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.BoxType = _field + return offset, nil +} + func (p *UpdateEvaluatorRequest) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBase() @@ -3233,6 +3261,7 @@ func (p *UpdateEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWrit offset += p.fastWriteField12(buf[offset:], w) offset += p.fastWriteField13(buf[offset:], w) offset += p.fastWriteField14(buf[offset:], w) + offset += p.fastWriteField15(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -3251,6 +3280,7 @@ func (p *UpdateEvaluatorRequest) BLength() int { l += p.field12Length() l += p.field13Length() l += p.field14Length() + l += p.field15Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -3332,6 +3362,15 @@ func (p *UpdateEvaluatorRequest) fastWriteField14(buf []byte, w thrift.NocopyWri return offset } +func (p *UpdateEvaluatorRequest) fastWriteField15(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBoxType() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 15) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.BoxType) + } + return offset +} + func (p *UpdateEvaluatorRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBase() { @@ -3416,6 +3455,15 @@ func (p *UpdateEvaluatorRequest) field14Length() int { return l } +func (p *UpdateEvaluatorRequest) field15Length() int { + l := 0 + if p.IsSetBoxType() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.BoxType) + } + return l +} + func (p *UpdateEvaluatorRequest) field255Length() int { l := 0 if p.IsSetBase() { @@ -3482,6 +3530,11 @@ func (p *UpdateEvaluatorRequest) DeepCopy(s interface{}) error { p.BuiltinVisibleVersion = &tmp } + if src.BoxType != nil { + tmp := *src.BoxType + p.BoxType = &tmp + } + var _base *base.Base if src.Base != nil { _base = &base.Base{} @@ -13780,7 +13833,7 @@ func (p *GetTemplateInfoV2Response) DeepCopy(s interface{}) error { return nil } -func (p *GetLatestEvaluatorVersionRequest) FastRead(buf []byte) (int, error) { +func (p *DebugBuiltinEvaluatorRequest) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13788,6 +13841,8 @@ func (p *GetLatestEvaluatorVersionRequest) FastRead(buf []byte) (int, error) { var fieldTypeId thrift.TType var fieldId int16 var issetEvaluatorID bool = false + var issetInputData bool = false + var issetWorkspaceID bool = false for { fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) offset += l @@ -13814,12 +13869,13 @@ func (p *GetLatestEvaluatorVersionRequest) FastRead(buf []byte) (int, error) { } } case 2: - if fieldTypeId == thrift.I64 { + if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField2(buf[offset:]) offset += l if err != nil { goto ReadFieldError } + issetInputData = true } else { l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -13828,12 +13884,13 @@ func (p *GetLatestEvaluatorVersionRequest) FastRead(buf []byte) (int, error) { } } case 3: - if fieldTypeId == thrift.BOOL { + if fieldTypeId == thrift.I64 { l, err = p.FastReadField3(buf[offset:]) offset += l if err != nil { goto ReadFieldError } + issetWorkspaceID = true } else { l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -13868,450 +13925,14 @@ func (p *GetLatestEvaluatorVersionRequest) FastRead(buf []byte) (int, error) { fieldId = 1 goto RequiredFieldNotSetError } - return offset, nil -ReadFieldBeginError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) -ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetLatestEvaluatorVersionRequest[fieldId]), err) -SkipFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) -RequiredFieldNotSetError: - return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_GetLatestEvaluatorVersionRequest[fieldId])) -} - -func (p *GetLatestEvaluatorVersionRequest) FastReadField1(buf []byte) (int, error) { - offset := 0 - - var _field int64 - if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _field = v - } - p.EvaluatorID = _field - return offset, nil -} - -func (p *GetLatestEvaluatorVersionRequest) FastReadField2(buf []byte) (int, error) { - offset := 0 - - var _field *int64 - if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _field = &v - } - p.WorkspaceID = _field - return offset, nil -} - -func (p *GetLatestEvaluatorVersionRequest) FastReadField3(buf []byte) (int, error) { - offset := 0 - - var _field *bool - if v, l, err := thrift.Binary.ReadBool(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _field = &v - } - p.Builtin = _field - return offset, nil -} - -func (p *GetLatestEvaluatorVersionRequest) FastReadField255(buf []byte) (int, error) { - offset := 0 - _field := base.NewBase() - if l, err := _field.FastRead(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - } - p.Base = _field - return offset, nil -} - -func (p *GetLatestEvaluatorVersionRequest) FastWrite(buf []byte) int { - return p.FastWriteNocopy(buf, nil) -} - -func (p *GetLatestEvaluatorVersionRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p != nil { - offset += p.fastWriteField1(buf[offset:], w) - offset += p.fastWriteField2(buf[offset:], w) - offset += p.fastWriteField3(buf[offset:], w) - offset += p.fastWriteField255(buf[offset:], w) - } - offset += thrift.Binary.WriteFieldStop(buf[offset:]) - return offset -} - -func (p *GetLatestEvaluatorVersionRequest) BLength() int { - l := 0 - if p != nil { - l += p.field1Length() - l += p.field2Length() - l += p.field3Length() - l += p.field255Length() - } - l += thrift.Binary.FieldStopLength() - return l -} - -func (p *GetLatestEvaluatorVersionRequest) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) - offset += thrift.Binary.WriteI64(buf[offset:], p.EvaluatorID) - return offset -} - -func (p *GetLatestEvaluatorVersionRequest) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p.IsSetWorkspaceID() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 2) - offset += thrift.Binary.WriteI64(buf[offset:], *p.WorkspaceID) - } - return offset -} - -func (p *GetLatestEvaluatorVersionRequest) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p.IsSetBuiltin() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.BOOL, 3) - offset += thrift.Binary.WriteBool(buf[offset:], *p.Builtin) - } - return offset -} - -func (p *GetLatestEvaluatorVersionRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p.IsSetBase() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) - offset += p.Base.FastWriteNocopy(buf[offset:], w) - } - return offset -} - -func (p *GetLatestEvaluatorVersionRequest) field1Length() int { - l := 0 - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.I64Length() - return l -} - -func (p *GetLatestEvaluatorVersionRequest) field2Length() int { - l := 0 - if p.IsSetWorkspaceID() { - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.I64Length() - } - return l -} - -func (p *GetLatestEvaluatorVersionRequest) field3Length() int { - l := 0 - if p.IsSetBuiltin() { - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.BoolLength() - } - return l -} - -func (p *GetLatestEvaluatorVersionRequest) field255Length() int { - l := 0 - if p.IsSetBase() { - l += thrift.Binary.FieldBeginLength() - l += p.Base.BLength() - } - return l -} - -func (p *GetLatestEvaluatorVersionRequest) DeepCopy(s interface{}) error { - src, ok := s.(*GetLatestEvaluatorVersionRequest) - if !ok { - return fmt.Errorf("%T's type not matched %T", s, p) - } - - p.EvaluatorID = src.EvaluatorID - - if src.WorkspaceID != nil { - tmp := *src.WorkspaceID - p.WorkspaceID = &tmp - } - - if src.Builtin != nil { - tmp := *src.Builtin - p.Builtin = &tmp - } - - var _base *base.Base - if src.Base != nil { - _base = &base.Base{} - if err := _base.DeepCopy(src.Base); err != nil { - return err - } - } - p.Base = _base - - return nil -} - -func (p *GetLatestEvaluatorVersionResponse) FastRead(buf []byte) (int, error) { - - var err error - var offset int - var l int - var fieldTypeId thrift.TType - var fieldId int16 - var issetVersion bool = false - for { - fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) - offset += l - if err != nil { - goto ReadFieldBeginError - } - if fieldTypeId == thrift.STOP { - break - } - switch fieldId { - case 1: - if fieldTypeId == thrift.STRUCT { - l, err = p.FastReadField1(buf[offset:]) - offset += l - if err != nil { - goto ReadFieldError - } - issetVersion = true - } else { - l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) - offset += l - if err != nil { - goto SkipFieldError - } - } - case 255: - if fieldTypeId == thrift.STRUCT { - l, err = p.FastReadField255(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 - } - } - default: - l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) - offset += l - if err != nil { - goto SkipFieldError - } - } - } - - if !issetVersion { - fieldId = 1 - goto RequiredFieldNotSetError - } - return offset, nil -ReadFieldBeginError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) -ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetLatestEvaluatorVersionResponse[fieldId]), err) -SkipFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) -RequiredFieldNotSetError: - return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_GetLatestEvaluatorVersionResponse[fieldId])) -} - -func (p *GetLatestEvaluatorVersionResponse) FastReadField1(buf []byte) (int, error) { - offset := 0 - _field := evaluator.NewEvaluatorVersion() - if l, err := _field.FastRead(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - } - p.Version = _field - return offset, nil -} - -func (p *GetLatestEvaluatorVersionResponse) FastReadField255(buf []byte) (int, error) { - offset := 0 - _field := base.NewBaseResp() - if l, err := _field.FastRead(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - } - p.BaseResp = _field - return offset, nil -} - -func (p *GetLatestEvaluatorVersionResponse) FastWrite(buf []byte) int { - return p.FastWriteNocopy(buf, nil) -} - -func (p *GetLatestEvaluatorVersionResponse) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p != nil { - offset += p.fastWriteField1(buf[offset:], w) - offset += p.fastWriteField255(buf[offset:], w) - } - offset += thrift.Binary.WriteFieldStop(buf[offset:]) - return offset -} - -func (p *GetLatestEvaluatorVersionResponse) BLength() int { - l := 0 - if p != nil { - l += p.field1Length() - l += p.field255Length() - } - l += thrift.Binary.FieldStopLength() - return l -} - -func (p *GetLatestEvaluatorVersionResponse) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) - offset += p.Version.FastWriteNocopy(buf[offset:], w) - return offset -} - -func (p *GetLatestEvaluatorVersionResponse) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) - offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) - return offset -} - -func (p *GetLatestEvaluatorVersionResponse) field1Length() int { - l := 0 - l += thrift.Binary.FieldBeginLength() - l += p.Version.BLength() - return l -} - -func (p *GetLatestEvaluatorVersionResponse) field255Length() int { - l := 0 - l += thrift.Binary.FieldBeginLength() - l += p.BaseResp.BLength() - return l -} - -func (p *GetLatestEvaluatorVersionResponse) DeepCopy(s interface{}) error { - src, ok := s.(*GetLatestEvaluatorVersionResponse) - if !ok { - return fmt.Errorf("%T's type not matched %T", s, p) - } - - var _version *evaluator.EvaluatorVersion - if src.Version != nil { - _version = &evaluator.EvaluatorVersion{} - if err := _version.DeepCopy(src.Version); err != nil { - return err - } - } - p.Version = _version - - var _baseResp *base.BaseResp - if src.BaseResp != nil { - _baseResp = &base.BaseResp{} - if err := _baseResp.DeepCopy(src.BaseResp); err != nil { - return err - } - } - p.BaseResp = _baseResp - return nil -} - -func (p *DebugBuiltinEvaluatorRequest) FastRead(buf []byte) (int, error) { - - var err error - var offset int - var l int - var fieldTypeId thrift.TType - var fieldId int16 - var issetEvaluatorID bool = false - var issetInputData bool = false - for { - fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) - offset += l - if err != nil { - goto ReadFieldBeginError - } - if fieldTypeId == thrift.STOP { - break - } - switch fieldId { - case 1: - if fieldTypeId == thrift.I64 { - l, err = p.FastReadField1(buf[offset:]) - offset += l - if err != nil { - goto ReadFieldError - } - issetEvaluatorID = true - } else { - l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) - offset += l - if err != nil { - goto SkipFieldError - } - } - case 2: - if fieldTypeId == thrift.STRUCT { - l, err = p.FastReadField2(buf[offset:]) - offset += l - if err != nil { - goto ReadFieldError - } - issetInputData = true - } else { - l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) - offset += l - if err != nil { - goto SkipFieldError - } - } - case 255: - if fieldTypeId == thrift.STRUCT { - l, err = p.FastReadField255(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 - } - } - default: - l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) - offset += l - if err != nil { - goto SkipFieldError - } - } - } - - if !issetEvaluatorID { - fieldId = 1 + if !issetInputData { + fieldId = 2 goto RequiredFieldNotSetError } - if !issetInputData { - fieldId = 2 + if !issetWorkspaceID { + fieldId = 3 goto RequiredFieldNotSetError } return offset, nil @@ -14351,6 +13972,20 @@ func (p *DebugBuiltinEvaluatorRequest) FastReadField2(buf []byte) (int, error) { return offset, nil } +func (p *DebugBuiltinEvaluatorRequest) FastReadField3(buf []byte) (int, error) { + offset := 0 + + var _field int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = v + } + p.WorkspaceID = _field + return offset, nil +} + func (p *DebugBuiltinEvaluatorRequest) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBase() @@ -14371,6 +14006,7 @@ func (p *DebugBuiltinEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.Noco offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } @@ -14383,6 +14019,7 @@ func (p *DebugBuiltinEvaluatorRequest) BLength() int { if p != nil { l += p.field1Length() l += p.field2Length() + l += p.field3Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -14403,6 +14040,13 @@ func (p *DebugBuiltinEvaluatorRequest) fastWriteField2(buf []byte, w thrift.Noco return offset } +func (p *DebugBuiltinEvaluatorRequest) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 3) + offset += thrift.Binary.WriteI64(buf[offset:], p.WorkspaceID) + return offset +} + func (p *DebugBuiltinEvaluatorRequest) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBase() { @@ -14426,6 +14070,13 @@ func (p *DebugBuiltinEvaluatorRequest) field2Length() int { return l } +func (p *DebugBuiltinEvaluatorRequest) field3Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + return l +} + func (p *DebugBuiltinEvaluatorRequest) field255Length() int { l := 0 if p.IsSetBase() { @@ -14452,6 +14103,8 @@ func (p *DebugBuiltinEvaluatorRequest) DeepCopy(s interface{}) error { } p.InputData = _inputData + p.WorkspaceID = src.WorkspaceID + var _base *base.Base if src.Base != nil { _base = &base.Base{} diff --git a/backend/modules/evaluation/application/convertor/common/common.go b/backend/modules/evaluation/application/convertor/common/common.go index ad6b5f310..e0bf5f55d 100644 --- a/backend/modules/evaluation/application/convertor/common/common.go +++ b/backend/modules/evaluation/application/convertor/common/common.go @@ -221,11 +221,12 @@ func ConvertArgsSchemaDTO2DO(schema *commondto.ArgsSchema) *commonentity.ArgsSch for _, ct := range schema.SupportContentTypes { contentTypes = append(contentTypes, commonentity.ContentType(ct)) } - return &commonentity.ArgsSchema{ - Key: schema.Key, - SupportContentTypes: contentTypes, - JsonSchema: schema.JSONSchema, - } + return &commonentity.ArgsSchema{ + Key: schema.Key, + SupportContentTypes: contentTypes, + JsonSchema: schema.JSONSchema, + DefaultValue: ConvertContentDTO2DO(schema.DefaultValue), + } } func ConvertArgsSchemaListDTO2DO(schemas []*commondto.ArgsSchema) []*commonentity.ArgsSchema { @@ -248,11 +249,12 @@ func ConvertArgsSchemaDO2DTO(schema *commonentity.ArgsSchema) *commondto.ArgsSch for _, ct := range schema.SupportContentTypes { contentTypes = append(contentTypes, string(ct)) } - return &commondto.ArgsSchema{ - Key: schema.Key, - SupportContentTypes: contentTypes, - JSONSchema: schema.JsonSchema, - } + return &commondto.ArgsSchema{ + Key: schema.Key, + SupportContentTypes: contentTypes, + JSONSchema: schema.JsonSchema, + DefaultValue: ConvertContentDO2DTO(schema.DefaultValue), + } } func ConvertArgsSchemaListDO2DTO(schemas []*commonentity.ArgsSchema) []*commondto.ArgsSchema { diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go index da630ea9c..ac955ff9b 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go @@ -28,6 +28,7 @@ func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.E LatestVersion: evaluatorDTO.GetLatestVersion(), Builtin: evaluatorDTO.GetBuiltin(), BuiltinVisibleVersion: evaluatorDTO.GetBuiltinVisibleVersion(), + BoxType: convertBoxTypeDTO2DO(evaluatorDTO.GetBoxType()), PromptEvaluatorVersion: nil, BaseInfo: commonconvertor.ConvertBaseInfoDTO2DO(evaluatorDTO.GetBaseInfo()), Tags: ConvertEvaluatorLangTagsDTO2DO(evaluatorDTO.GetTags()), @@ -71,6 +72,11 @@ func ConvertEvaluatorDO2DTO(do *evaluatordo.Evaluator) *evaluatordto.Evaluator { BaseInfo: commonconvertor.ConvertBaseInfoDO2DTO(do.BaseInfo), Tags: ConvertEvaluatorLangTagsDO2DTO(do.Tags), } + // 设置 BoxType + { + val := convertBoxTypeDO2DTO(do.BoxType) + dto.SetBoxType(&val) + } switch do.EvaluatorType { case evaluatordo.EvaluatorTypePrompt: @@ -92,6 +98,31 @@ func ConvertEvaluatorDO2DTO(do *evaluatordo.Evaluator) *evaluatordto.Evaluator { return dto } +// convertBoxTypeDTO2DO 将 DTO 的 BoxType(字符串) 转换为 DO 的 BoxType(数值枚举) +func convertBoxTypeDTO2DO(dtoType string) evaluatordo.EvaluatorBoxType { + switch dtoType { + case "White": + return evaluatordo.EvaluatorBoxTypeWhite + case "Black": + return evaluatordo.EvaluatorBoxTypeBlack + default: + // 默认回退白盒 + return evaluatordo.EvaluatorBoxTypeWhite + } +} + +// convertBoxTypeDO2DTO 将 DO 的 BoxType(数值枚举) 转换为 DTO 的 BoxType(字符串) +func convertBoxTypeDO2DTO(doType evaluatordo.EvaluatorBoxType) string { + switch doType { + case evaluatordo.EvaluatorBoxTypeWhite: + return "White" + case evaluatordo.EvaluatorBoxTypeBlack: + return "Black" + default: + return "White" + } +} + // normalizeLanguageType 标准化语言类型（转换为标准格式） func normalizeLanguageType(langType evaluatordo.LanguageType) evaluatordo.LanguageType { switch strings.ToLower(string(langType)) { @@ -247,6 +278,22 @@ func ConvertEvaluatorContent2DO(content *evaluatordto.EvaluatorContent, evaluato Timeout: content.CustomRPCEvaluator.Timeout, } + // 转换输入模式 + if len(content.InputSchemas) > 0 { + customRPCVersion.InputSchemas = make([]*evaluatordo.ArgsSchema, 0, len(content.InputSchemas)) + for _, schema := range content.InputSchemas { + customRPCVersion.InputSchemas = append(customRPCVersion.InputSchemas, commonconvertor.ConvertArgsSchemaDTO2DO(schema)) + } + } + + // 转换输出模式 + if len(content.OutputSchemas) > 0 { + customRPCVersion.OutputSchemas = make([]*evaluatordo.ArgsSchema, 0, len(content.OutputSchemas)) + for _, schema := range content.OutputSchemas { + customRPCVersion.OutputSchemas = append(customRPCVersion.OutputSchemas, commonconvertor.ConvertArgsSchemaDTO2DO(schema)) + } + } + evaluator.CustomRPCEvaluatorVersion = customRPCVersion default: @@ -387,8 +434,6 @@ func ConvertEvaluatorTagKeyDO2DTO(doKey evaluatordo.EvaluatorTagKey) evaluatordt return evaluatordto.EvaluatorTagKeyObjective case evaluatordo.EvaluatorTagKey_BusinessScenario: return evaluatordto.EvaluatorTagKeyBusinessScenario - case evaluatordo.EvaluatorTagKey_BoxType: - return evaluatordto.EvaluatorTagKeyBoxType case evaluatordo.EvaluatorTagKey_Name: return evaluatordto.EvaluatorTagKeyName default: diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go index bce86697c..15b9e2034 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go @@ -19,8 +19,6 @@ func ConvertEvaluatorTagKeyDTO2DO(dtoKey evaluatordto.EvaluatorTagKey) evaluator return evaluatordo.EvaluatorTagKey_Objective case evaluatordto.EvaluatorTagKeyBusinessScenario: return evaluatordo.EvaluatorTagKey_BusinessScenario - case evaluatordto.EvaluatorTagKeyBoxType: - return evaluatordo.EvaluatorTagKey_BoxType case evaluatordto.EvaluatorTagKeyName: return evaluatordo.EvaluatorTagKey_Name default: diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go index ed1df3264..16bcf08a1 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag_test.go @@ -6,9 +6,10 @@ package evaluator import ( "testing" + "github.com/stretchr/testify/assert" + evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" - "github.com/stretchr/testify/assert" ) func TestConvertEvaluatorFilterOptionDTO2DO(t *testing.T) { @@ -78,7 +79,6 @@ func TestConvertEvaluatorTagKeyDTO2DO(t *testing.T) { {evaluatordto.EvaluatorTagKeyTargetType, evaluatordo.EvaluatorTagKey_TargetType}, {evaluatordto.EvaluatorTagKeyObjective, evaluatordo.EvaluatorTagKey_Objective}, {evaluatordto.EvaluatorTagKeyBusinessScenario, evaluatordo.EvaluatorTagKey_BusinessScenario}, - {evaluatordto.EvaluatorTagKeyBoxType, evaluatordo.EvaluatorTagKey_BoxType}, {evaluatordto.EvaluatorTagKeyName, evaluatordo.EvaluatorTagKey_Name}, } diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go index 2a4b3702f..d02443c24 100755 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go @@ -34,9 +34,11 @@ func TestConvertEvaluatorDTO2DO(t *testing.T) { DraftSubmitted: gptr.Of(true), EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), LatestVersion: gptr.Of("1"), - Tags: map[evaluatordto.EvaluatorTagKey][]string{ - evaluatordto.EvaluatorTagKeyCategory: {"LLM", "Code"}, - evaluatordto.EvaluatorTagKeyObjective: {"Quality"}, + Tags: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{ + evaluatordto.EvaluatorTagLangTypeEn: { + evaluatordto.EvaluatorTagKeyCategory: {"LLM", "Code"}, + evaluatordto.EvaluatorTagKeyObjective: {"Quality"}, + }, }, }, expected: &evaluatordo.Evaluator{ @@ -47,9 +49,11 @@ func TestConvertEvaluatorDTO2DO(t *testing.T) { DraftSubmitted: true, EvaluatorType: evaluatordo.EvaluatorTypePrompt, LatestVersion: "1", - Tags: map[evaluatordo.EvaluatorTagKey][]string{ - evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, - evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, + Tags: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{ + evaluatordo.EvaluatorTagLangType_En: { + evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, + evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, + }, }, }, }, @@ -111,9 +115,11 @@ func TestConvertEvaluatorDO2DTO(t *testing.T) { DraftSubmitted: true, EvaluatorType: evaluatordo.EvaluatorTypePrompt, LatestVersion: "1", - Tags: map[evaluatordo.EvaluatorTagKey][]string{ - evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, - evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, + Tags: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{ + evaluatordo.EvaluatorTagLangType_En: { + evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, + evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, + }, }, }, expectedType: evaluatordto.EvaluatorType_Prompt, @@ -925,20 +931,24 @@ func TestConvertEvaluatorTagsDTO2DO(t *testing.T) { tests := []struct { name string - dtoTags map[evaluatordto.EvaluatorTagKey][]string - expected map[evaluatordo.EvaluatorTagKey][]string + dtoTags map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string + expected map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string }{ { name: "正常转换", - dtoTags: map[evaluatordto.EvaluatorTagKey][]string{ - evaluatordto.EvaluatorTagKeyCategory: {"LLM", "Code"}, - evaluatordto.EvaluatorTagKeyObjective: {"Quality"}, - evaluatordto.EvaluatorTagKeyBusinessScenario: {"AI Coding"}, + dtoTags: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{ + evaluatordto.EvaluatorTagLangTypeEn: { + evaluatordto.EvaluatorTagKeyCategory: {"LLM", "Code"}, + evaluatordto.EvaluatorTagKeyObjective: {"Quality"}, + evaluatordto.EvaluatorTagKeyBusinessScenario: {"AI Coding"}, + }, }, - expected: map[evaluatordo.EvaluatorTagKey][]string{ - evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, - evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, - evaluatordo.EvaluatorTagKey_BusinessScenario: {"AI Coding"}, + expected: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{ + evaluatordo.EvaluatorTagLangType_En: { + evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, + evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, + evaluatordo.EvaluatorTagKey_BusinessScenario: {"AI Coding"}, + }, }, }, { @@ -948,14 +958,14 @@ func TestConvertEvaluatorTagsDTO2DO(t *testing.T) { }, { name: "空map", - dtoTags: map[evaluatordto.EvaluatorTagKey][]string{}, - expected: map[evaluatordo.EvaluatorTagKey][]string{}, + dtoTags: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{}, + expected: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{}, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - result := ConvertEvaluatorTagsDTO2DO(tt.dtoTags) + result := ConvertEvaluatorLangTagsDTO2DO(tt.dtoTags) assert.Equal(t, tt.expected, result) }) } @@ -966,20 +976,24 @@ func TestConvertEvaluatorTagsDO2DTO(t *testing.T) { tests := []struct { name string - doTags map[evaluatordo.EvaluatorTagKey][]string - expected map[evaluatordto.EvaluatorTagKey][]string + doTags map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string + expected map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string }{ { name: "正常转换", - doTags: map[evaluatordo.EvaluatorTagKey][]string{ - evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, - evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, - evaluatordo.EvaluatorTagKey_BusinessScenario: {"AI Coding"}, + doTags: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{ + evaluatordo.EvaluatorTagLangType_En: { + evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, + evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, + evaluatordo.EvaluatorTagKey_BusinessScenario: {"AI Coding"}, + }, }, - expected: map[evaluatordto.EvaluatorTagKey][]string{ - evaluatordto.EvaluatorTagKeyCategory: {"LLM", "Code"}, - evaluatordto.EvaluatorTagKeyObjective: {"Quality"}, - evaluatordto.EvaluatorTagKeyBusinessScenario: {"AI Coding"}, + expected: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{ + evaluatordto.EvaluatorTagLangTypeEn: { + evaluatordto.EvaluatorTagKeyCategory: {"LLM", "Code"}, + evaluatordto.EvaluatorTagKeyObjective: {"Quality"}, + evaluatordto.EvaluatorTagKeyBusinessScenario: {"AI Coding"}, + }, }, }, { @@ -989,14 +1003,14 @@ func TestConvertEvaluatorTagsDO2DTO(t *testing.T) { }, { name: "空map", - doTags: map[evaluatordo.EvaluatorTagKey][]string{}, - expected: map[evaluatordto.EvaluatorTagKey][]string{}, + doTags: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{}, + expected: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{}, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - result := ConvertEvaluatorTagsDO2DTO(tt.doTags) + result := ConvertEvaluatorLangTagsDO2DTO(tt.doTags) assert.Equal(t, tt.expected, result) }) } @@ -1033,7 +1047,7 @@ func TestConvertEvaluatorTagKeyDO2DTO(t *testing.T) { { name: "BoxType", doKey: evaluatordo.EvaluatorTagKey_BoxType, - expected: evaluatordto.EvaluatorTagKeyBoxType, + expected: "BoxType", }, { name: "Name", diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index e9f9d002f..3044fcd36 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -360,9 +360,20 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluator(ctx context.Context, request *eva Builtin: request.Builtin, Benchmark: request.Benchmark, Vendor: request.Vendor, - BuiltinVisibleVersion: request.BuiltinVisibleVersion, // 后续 Service/Repo/DAO 层补充更新逻辑 + BuiltinVisibleVersion: request.BuiltinVisibleVersion, UpdatedBy: userIDInContext, } + // box_type 映射（White/Black -> 1/2） + if request.IsSetBoxType() { + bt := entity.EvaluatorBoxTypeWhite + switch request.GetBoxType() { + case "Black": + bt = entity.EvaluatorBoxTypeBlack + case "White": + bt = entity.EvaluatorBoxTypeWhite + } + req.BoxType = &bt + } if err = e.evaluatorService.UpdateEvaluatorMeta(ctx, req); err != nil { return nil, err @@ -545,7 +556,11 @@ func buildListEvaluatorVersionRequest(request *evaluatorservice.ListEvaluatorVer // GetEvaluatorVersion 按 id 和版本号单个查询 evaluator_version version func (e *EvaluatorHandlerImpl) GetEvaluatorVersion(ctx context.Context, request *evaluatorservice.GetEvaluatorVersionRequest) (resp *evaluatorservice.GetEvaluatorVersionResponse, err error) { - evaluatorDO, err := e.evaluatorService.GetEvaluatorVersion(ctx, gptr.Of(request.WorkspaceID), request.GetEvaluatorVersionID(), request.GetIncludeDeleted(), request.GetBuiltin()) + var spaceID *int64 + if !request.GetBuiltin() { + spaceID = gptr.Of(request.WorkspaceID) + } + evaluatorDO, err := e.evaluatorService.GetEvaluatorVersion(ctx, spaceID, request.GetEvaluatorVersionID(), request.GetIncludeDeleted(), request.GetBuiltin()) if err != nil { return nil, err } @@ -558,6 +573,15 @@ func (e *EvaluatorHandlerImpl) GetEvaluatorVersion(ctx context.Context, request if err != nil { return nil, err } + // 预置评估器复用空间下列表查询鉴权 + err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(request.WorkspaceID, 10), + SpaceID: request.WorkspaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, + }) + if err != nil { + return nil, err + } } else { err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ ObjectID: strconv.FormatInt(evaluatorDO.ID, 10), @@ -847,14 +871,17 @@ func (e *EvaluatorHandlerImpl) RunEvaluator(ctx context.Context, request *evalua if evaluatorDO == nil { return nil, errorx.NewByCode(errno.EvaluatorNotExistCode) } - // 鉴权 - err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ - ObjectID: strconv.FormatInt(evaluatorDO.ID, 10), - SpaceID: evaluatorDO.SpaceID, - ActionObjects: []*rpc.ActionObject{{Action: gptr.Of(consts.Run), EntityType: gptr.Of(rpc.AuthEntityType_Evaluator)}}, - }) - if err != nil { - return nil, err + // 若为预置评估器则跳过鉴权 + if !evaluatorDO.Builtin { + // 鉴权 + err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(evaluatorDO.ID, 10), + SpaceID: evaluatorDO.SpaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of(consts.Run), EntityType: gptr.Of(rpc.AuthEntityType_Evaluator)}}, + }) + if err != nil { + return nil, err + } } recordDO, err := e.evaluatorService.RunEvaluator(ctx, buildRunEvaluatorRequest(evaluatorDO.Name, request)) if err != nil { @@ -1327,7 +1354,6 @@ func (e *EvaluatorHandlerImpl) batchDebugWithConcurrency(ctx context.Context, ev // ListTemplatesV2 查询评估器模板列表 func (e *EvaluatorHandlerImpl) ListTemplatesV2(ctx context.Context, request *evaluatorservice.ListTemplatesV2Request) (resp *evaluatorservice.ListTemplatesV2Response, err error) { - // List接口无需鉴权 // 构建service层请求 serviceReq := &entity.ListEvaluatorTemplateRequest{ @@ -1371,7 +1397,6 @@ func (e *EvaluatorHandlerImpl) ListTemplatesV2(ctx context.Context, request *eva // GetTemplateInfoV2 获取评估器模板详情 func (e *EvaluatorHandlerImpl) GetTemplateInfoV2(ctx context.Context, request *evaluatorservice.GetTemplateInfoV2Request) (resp *evaluatorservice.GetTemplateInfoV2Response, err error) { - // get接口无需鉴权 // 构建service层请求 serviceReq := &entity.GetEvaluatorTemplateRequest{ ID: request.GetEvaluatorTemplateID(), @@ -1528,11 +1553,11 @@ func (e *EvaluatorHandlerImpl) DeleteEvaluatorTemplate(ctx context.Context, requ // DebugBuiltinEvaluator 调试预置评估器 func (e *EvaluatorHandlerImpl) DebugBuiltinEvaluator(ctx context.Context, request *evaluator.DebugBuiltinEvaluatorRequest) (resp *evaluator.DebugBuiltinEvaluatorResponse, err error) { - // 鉴权 + // 预置评估器复用空间下列表查询鉴权 err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ - ObjectID: strconv.FormatInt(request.GetEvaluatorID(), 10), - SpaceID: 0, // 预置评估器不需要空间权限 - ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("debugLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, + ObjectID: strconv.FormatInt(request.WorkspaceID, 10), + SpaceID: request.WorkspaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, }) if err != nil { return nil, err diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index 3c989eacc..99627bf30 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -696,8 +696,8 @@ func TestEvaluatorHandlerImpl_ComplexBusinessScenarios(t *testing.T) { // 第一次调用失败，第二次成功（模拟重试机制） callCount := 0 mockEvaluatorService.EXPECT(). - GetEvaluatorVersion(gomock.Any(), int64(123), false). - DoAndReturn(func(ctx context.Context, id int64, includeDeleted bool) (*entity.Evaluator, error) { + GetEvaluatorVersion(gomock.Any(), gomock.Any(), int64(123), false, gomock.Any()). + DoAndReturn(func(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, withTags bool) (*entity.Evaluator, error) { callCount++ if callCount == 1 { return nil, errors.New("temporary database error") @@ -923,7 +923,7 @@ func TestEvaluatorHandlerImpl_ComplexBusinessScenarios(t *testing.T) { Times(1) mockEvaluatorService.EXPECT(). - UpdateEvaluatorMeta(gomock.Any(), evaluatorID, spaceID, "更新后的评估器", "更新后的描述", gomock.Any()). + UpdateEvaluatorMeta(gomock.Any(), gomock.Any()). Return(nil). Times(1) diff --git a/backend/modules/evaluation/domain/entity/common.go b/backend/modules/evaluation/domain/entity/common.go index 90635b05c..12fe6a46f 100644 --- a/backend/modules/evaluation/domain/entity/common.go +++ b/backend/modules/evaluation/domain/entity/common.go @@ -117,6 +117,7 @@ type ArgsSchema struct { Key *string `json:"key,omitempty"` SupportContentTypes []ContentType `json:"support_content_types,omitempty"` JsonSchema *string `json:"json_schema,omitempty"` + DefaultValue *Content `json:"default_value,omitempty"` } // UserInfo 用户信息结构体 diff --git a/backend/modules/evaluation/domain/entity/evaluator.go b/backend/modules/evaluation/domain/entity/evaluator.go index a0698dd3f..3f5dd8c14 100644 --- a/backend/modules/evaluation/domain/entity/evaluator.go +++ b/backend/modules/evaluation/domain/entity/evaluator.go @@ -17,13 +17,21 @@ type Evaluator struct { Benchmark string Vendor string BuiltinVisibleVersion string + BoxType EvaluatorBoxType `json:"box_type"` Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `json:"tags"` - PromptEvaluatorVersion *PromptEvaluatorVersion - CodeEvaluatorVersion *CodeEvaluatorVersion + PromptEvaluatorVersion *PromptEvaluatorVersion + CodeEvaluatorVersion *CodeEvaluatorVersion CustomRPCEvaluatorVersion *CustomRPCEvaluatorVersion } +type EvaluatorBoxType int64 + +const ( + EvaluatorBoxTypeWhite EvaluatorBoxType = 1 + EvaluatorBoxTypeBlack EvaluatorBoxType = 2 +) + type EvaluatorType int64 const ( @@ -40,15 +48,15 @@ var EvaluatorTypeSet = map[EvaluatorType]struct{}{ // UpdateEvaluatorMetaRequest 用于更新评估器元信息的参数 type UpdateEvaluatorMetaRequest struct { - ID int64 - SpaceID int64 - Name *string - Description *string - Builtin *bool - Benchmark *string - Vendor *string - // BuiltinVisibleVersion 预置评估器的对外可见版本（后续在 Service/Repo/DAO 层补充更新逻辑） + ID int64 + SpaceID int64 + Name *string + Description *string + Builtin *bool + Benchmark *string + Vendor *string BuiltinVisibleVersion *string + BoxType *EvaluatorBoxType UpdatedBy string } diff --git a/backend/modules/evaluation/domain/repo/evaluator.go b/backend/modules/evaluation/domain/repo/evaluator.go index 5eb8977e6..74d6f13be 100644 --- a/backend/modules/evaluation/domain/repo/evaluator.go +++ b/backend/modules/evaluation/domain/repo/evaluator.go @@ -24,7 +24,7 @@ type IEvaluatorRepo interface { UpdateEvaluatorTags(ctx context.Context, evaluatorID int64, tags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string) error BatchGetEvaluatorMetaByID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) - BatchGetEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) + BatchGetEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool, withTags bool) ([]*entity.Evaluator, error) BatchGetEvaluatorDraftByEvaluatorID(ctx context.Context, spaceID int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) BatchGetEvaluatorVersionsByEvaluatorIDs(ctx context.Context, evaluatorIDs []int64, includeDeleted bool) ([]*entity.Evaluator, error) ListEvaluator(ctx context.Context, req *ListEvaluatorRequest) (*ListEvaluatorResponse, error) @@ -38,8 +38,6 @@ type IEvaluatorRepo interface { // ListBuiltinEvaluator 根据筛选条件查询内置评估器列表，支持tag筛选和分页 ListBuiltinEvaluator(ctx context.Context, req *ListBuiltinEvaluatorRequest) (*ListBuiltinEvaluatorResponse, error) - // BatchGetBuiltinEvaluatorByVersionID 批量根据版本ID获取内置评估器，包含tag信息 - BatchGetBuiltinEvaluatorByVersionID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) } type ListEvaluatorRequest struct { diff --git a/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go b/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go index 378626653..31fe3dc2a 100644 --- a/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go +++ b/backend/modules/evaluation/domain/repo/mocks/evaluator_mock.go @@ -56,34 +56,19 @@ func (mr *MockIEvaluatorRepoMockRecorder) BatchDeleteEvaluator(ctx, ids, userID return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchDeleteEvaluator", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchDeleteEvaluator), ctx, ids, userID) } -// BatchGetBuiltinEvaluatorByVersionID mocks base method. -func (m *MockIEvaluatorRepo) BatchGetBuiltinEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BatchGetBuiltinEvaluatorByVersionID", ctx, spaceID, ids, includeDeleted) - ret0, _ := ret[0].([]*entity.Evaluator) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// BatchGetBuiltinEvaluatorByVersionID indicates an expected call of BatchGetBuiltinEvaluatorByVersionID. -func (mr *MockIEvaluatorRepoMockRecorder) BatchGetBuiltinEvaluatorByVersionID(ctx, spaceID, ids, includeDeleted any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetBuiltinEvaluatorByVersionID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetBuiltinEvaluatorByVersionID), ctx, spaceID, ids, includeDeleted) -} - // BatchGetEvaluatorByVersionID mocks base method. -func (m *MockIEvaluatorRepo) BatchGetEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { +func (m *MockIEvaluatorRepo) BatchGetEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted, withTags bool) ([]*entity.Evaluator, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BatchGetEvaluatorByVersionID", ctx, spaceID, ids, includeDeleted) + ret := m.ctrl.Call(m, "BatchGetEvaluatorByVersionID", ctx, spaceID, ids, includeDeleted, withTags) ret0, _ := ret[0].([]*entity.Evaluator) ret1, _ := ret[1].(error) return ret0, ret1 } // BatchGetEvaluatorByVersionID indicates an expected call of BatchGetEvaluatorByVersionID. -func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorByVersionID(ctx, spaceID, ids, includeDeleted any) *gomock.Call { +func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorByVersionID(ctx, spaceID, ids, includeDeleted, withTags any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorByVersionID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorByVersionID), ctx, spaceID, ids, includeDeleted) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorByVersionID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorByVersionID), ctx, spaceID, ids, includeDeleted, withTags) } // BatchGetEvaluatorDraftByEvaluatorID mocks base method. @@ -116,6 +101,21 @@ func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorMetaByID(ctx, ids, in return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorMetaByID", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorMetaByID), ctx, ids, includeDeleted) } +// BatchGetEvaluatorVersionsByEvaluatorIDAndVersions mocks base method. +func (m *MockIEvaluatorRepo) BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx context.Context, pairs [][2]any) ([]*entity.Evaluator, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "BatchGetEvaluatorVersionsByEvaluatorIDAndVersions", ctx, pairs) + ret0, _ := ret[0].([]*entity.Evaluator) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// BatchGetEvaluatorVersionsByEvaluatorIDAndVersions indicates an expected call of BatchGetEvaluatorVersionsByEvaluatorIDAndVersions. +func (mr *MockIEvaluatorRepoMockRecorder) BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorVersionsByEvaluatorIDAndVersions", reflect.TypeOf((*MockIEvaluatorRepo)(nil).BatchGetEvaluatorVersionsByEvaluatorIDAndVersions), ctx, pairs) +} + // BatchGetEvaluatorVersionsByEvaluatorIDs mocks base method. func (m *MockIEvaluatorRepo) BatchGetEvaluatorVersionsByEvaluatorIDs(ctx context.Context, evaluatorIDs []int64, includeDeleted bool) ([]*entity.Evaluator, error) { m.ctrl.T.Helper() @@ -235,20 +235,6 @@ func (mr *MockIEvaluatorRepoMockRecorder) SubmitEvaluatorVersion(ctx, evaluatorV return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitEvaluatorVersion", reflect.TypeOf((*MockIEvaluatorRepo)(nil).SubmitEvaluatorVersion), ctx, evaluatorVersionDO) } -// UpdateBuiltinEvaluatorDraft mocks base method. -func (m *MockIEvaluatorRepo) UpdateBuiltinEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateBuiltinEvaluatorDraft", ctx, version) - ret0, _ := ret[0].(error) - return ret0 -} - -// UpdateBuiltinEvaluatorDraft indicates an expected call of UpdateBuiltinEvaluatorDraft. -func (mr *MockIEvaluatorRepoMockRecorder) UpdateBuiltinEvaluatorDraft(ctx, version any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateBuiltinEvaluatorDraft", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateBuiltinEvaluatorDraft), ctx, version) -} - // UpdateEvaluatorDraft mocks base method. func (m *MockIEvaluatorRepo) UpdateEvaluatorDraft(ctx context.Context, version *entity.Evaluator) error { m.ctrl.T.Helper() @@ -276,3 +262,17 @@ func (mr *MockIEvaluatorRepoMockRecorder) UpdateEvaluatorMeta(ctx, req any) *gom mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorMeta", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateEvaluatorMeta), ctx, req) } + +// UpdateEvaluatorTags mocks base method. +func (m *MockIEvaluatorRepo) UpdateEvaluatorTags(ctx context.Context, evaluatorID int64, tags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "UpdateEvaluatorTags", ctx, evaluatorID, tags) + ret0, _ := ret[0].(error) + return ret0 +} + +// UpdateEvaluatorTags indicates an expected call of UpdateEvaluatorTags. +func (mr *MockIEvaluatorRepoMockRecorder) UpdateEvaluatorTags(ctx, evaluatorID, tags any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateEvaluatorTags", reflect.TypeOf((*MockIEvaluatorRepo)(nil).UpdateEvaluatorTags), ctx, evaluatorID, tags) +} diff --git a/backend/modules/evaluation/domain/repo/mocks/evaluator_template_mock.go b/backend/modules/evaluation/domain/repo/mocks/evaluator_template_mock.go index 2480e19ff..ee753a686 100644 --- a/backend/modules/evaluation/domain/repo/mocks/evaluator_template_mock.go +++ b/backend/modules/evaluation/domain/repo/mocks/evaluator_template_mock.go @@ -86,6 +86,20 @@ func (mr *MockEvaluatorTemplateRepoMockRecorder) GetEvaluatorTemplate(ctx, id, i return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateRepo)(nil).GetEvaluatorTemplate), ctx, id, includeDeleted) } +// IncrPopularityByID mocks base method. +func (m *MockEvaluatorTemplateRepo) IncrPopularityByID(ctx context.Context, id int64) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "IncrPopularityByID", ctx, id) + ret0, _ := ret[0].(error) + return ret0 +} + +// IncrPopularityByID indicates an expected call of IncrPopularityByID. +func (mr *MockEvaluatorTemplateRepoMockRecorder) IncrPopularityByID(ctx, id any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IncrPopularityByID", reflect.TypeOf((*MockEvaluatorTemplateRepo)(nil).IncrPopularityByID), ctx, id) +} + // ListEvaluatorTemplate mocks base method. func (m *MockEvaluatorTemplateRepo) ListEvaluatorTemplate(ctx context.Context, req *repo.ListEvaluatorTemplateRequest) (*repo.ListEvaluatorTemplateResponse, error) { m.ctrl.T.Helper() diff --git a/backend/modules/evaluation/domain/service/evaluator.go b/backend/modules/evaluation/domain/service/evaluator.go index 3faf103db..d80a98ca6 100644 --- a/backend/modules/evaluation/domain/service/evaluator.go +++ b/backend/modules/evaluation/domain/service/evaluator.go @@ -37,8 +37,8 @@ type EvaluatorService interface { // 非预置评估器则返回nil GetBuiltinEvaluator(ctx context.Context, evaluatorID int64) (*entity.Evaluator, error) // GetEvaluatorVersion 按 version id 单个查询 evaluator_version version - // builtin=true 时查询内置评估器，需传入 spaceID；否则查询普通评估器 - GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, builtin bool) (*entity.Evaluator, error) + // withTags=true 时查询并回填标签（用于内置评估器），需传入 spaceID；否则查询普通评估器 + GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, withTags bool) (*entity.Evaluator, error) // BatchGetEvaluatorVersion 按 version id 批量查询 evaluator_version version BatchGetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionIDs []int64, includeDeleted bool) ([]*entity.Evaluator, error) // ListEvaluatorVersion 按条件查询 evaluator_version version diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index 6565bf0e4..e17c0af72 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -22,7 +22,6 @@ import ( "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/conf" "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/errno" "github.com/coze-dev/coze-loop/backend/pkg/errorx" - "github.com/coze-dev/coze-loop/backend/pkg/lang/ptr" "github.com/coze-dev/coze-loop/backend/pkg/logs" ) @@ -358,15 +357,9 @@ func buildListEvaluatorVersionRequest(ctx context.Context, request *entity.ListE } // GetEvaluatorVersion 按 id 和版本号单个查询 evaluator_version version -func (e *EvaluatorServiceImpl) GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, builtin bool) (*entity.Evaluator, error) { - // 根据 builtin 分流 - var evaluatorDOList []*entity.Evaluator - var err error - if builtin { - evaluatorDOList, err = e.evaluatorRepo.BatchGetBuiltinEvaluatorByVersionID(ctx, []int64{evaluatorVersionID}, includeDeleted) - } else { - evaluatorDOList, err = e.evaluatorRepo.BatchGetEvaluatorByVersionID(ctx, spaceID, []int64{evaluatorVersionID}, includeDeleted) - } +func (e *EvaluatorServiceImpl) GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, withTags bool) (*entity.Evaluator, error) { + // 合并调用，根据 withTags 控制是否回填 tags + evaluatorDOList, err := e.evaluatorRepo.BatchGetEvaluatorByVersionID(ctx, spaceID, []int64{evaluatorVersionID}, includeDeleted, withTags) if err != nil { return nil, err } @@ -377,7 +370,8 @@ func (e *EvaluatorServiceImpl) GetEvaluatorVersion(ctx context.Context, spaceID } func (e *EvaluatorServiceImpl) BatchGetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionIDs []int64, includeDeleted bool) ([]*entity.Evaluator, error) { - return e.evaluatorRepo.BatchGetEvaluatorByVersionID(ctx, spaceID, evaluatorVersionIDs, includeDeleted) + // 非builtin场景 + return e.evaluatorRepo.BatchGetEvaluatorByVersionID(ctx, spaceID, evaluatorVersionIDs, includeDeleted, false) } // SubmitEvaluatorVersion 提交 evaluator_version 版本 @@ -444,7 +438,8 @@ func (e *EvaluatorServiceImpl) makeSubmitIdemKey(cid string) string { // RunEvaluator evaluator_version 运行 func (e *EvaluatorServiceImpl) RunEvaluator(ctx context.Context, request *entity.RunEvaluatorRequest) (*entity.EvaluatorRecord, error) { - evaluatorDOList, err := e.evaluatorRepo.BatchGetEvaluatorByVersionID(ctx, ptr.Of(request.SpaceID), []int64{request.EvaluatorVersionID}, false) + // 使用 BatchGetEvaluatorByVersionID 查询，不传 spaceID，允许查询所有空间的 evaluator + evaluatorDOList, err := e.evaluatorRepo.BatchGetEvaluatorByVersionID(ctx, nil, []int64{request.EvaluatorVersionID}, false, false) if err != nil { return nil, err } @@ -452,6 +447,13 @@ func (e *EvaluatorServiceImpl) RunEvaluator(ctx context.Context, request *entity return nil, errorx.NewByCode(errno.EvaluatorVersionNotFoundCode, errorx.WithExtraMsg("evaluator_version version not found")) } evaluatorDO := evaluatorDOList[0] + // 如果是预置评估器（Builtin），直接执行后续流程 + // 如果不是预置评估器，则根据 space_id 判断是否当前空间的 Evaluator + if !evaluatorDO.Builtin { + if evaluatorDO.SpaceID != request.SpaceID { + return nil, errorx.NewByCode(errno.EvaluatorVersionNotFoundCode, errorx.WithExtraMsg("evaluator_version not found in current space")) + } + } allow := e.limiter.AllowInvoke(ctx, request.SpaceID) if !allow { return nil, errorx.NewByCode(errno.EvaluatorQPSLimitCode) diff --git a/backend/modules/evaluation/domain/service/evaluator_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_impl_test.go index 2f6a71f73..13418f6d5 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl_test.go @@ -29,34 +29,6 @@ import ( "github.com/coze-dev/coze-loop/backend/pkg/lang/ptr" ) -// MockEvaluatorSourceService 简单的mock实现 -type MockEvaluatorSourceService struct { - ctrl *gomock.Controller -} - -func NewMockEvaluatorSourceService(ctrl *gomock.Controller) *MockEvaluatorSourceService { - return &MockEvaluatorSourceService{ctrl: ctrl} -} - -func (m *MockEvaluatorSourceService) EvaluatorType() entity.EvaluatorType { - return entity.EvaluatorTypeLLM -} - -func (m *MockEvaluatorSourceService) Run(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, disableTracing bool) (output *entity.EvaluatorOutputData, runStatus entity.EvaluatorRunStatus, traceID string) { - return &entity.EvaluatorOutputData{}, entity.EvaluatorRunStatusSuccess, "trace-id" -} - -func (m *MockEvaluatorSourceService) Debug(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData) (output *entity.EvaluatorOutputData, err error) { - return &entity.EvaluatorOutputData{}, nil -} - -func (m *MockEvaluatorSourceService) PreHandle(ctx context.Context, evaluator *entity.Evaluator) error { - return nil -} - -func (m *MockEvaluatorSourceService) Validate(ctx context.Context, evaluator *entity.Evaluator) error { - return nil -} func TestNewEvaluatorServiceImpl(t *testing.T) { ctrl := gomock.NewController(t) @@ -69,7 +41,7 @@ func TestNewEvaluatorServiceImpl(t *testing.T) { mockEvaluatorRecordRepo := repomocks.NewMockIEvaluatorRecordRepo(ctrl) mockIdem := idemmocks.NewMockIdempotentService(ctrl) mockConfiger := confmocks.NewMockIConfiger(ctrl) - mockSourceService := NewMockEvaluatorSourceService(ctrl) + mockSourceService := mocks.NewMockEvaluatorSourceService(ctrl) // 这里需要传递一个 EvaluatorSourceService 的 slice service := NewEvaluatorServiceImpl( @@ -691,7 +663,7 @@ func TestEvaluatorServiceImpl_UpdateEvaluatorMeta(t *testing.T) { userID: "user123", setupMock: func(repoMock *repomocks.MockIEvaluatorRepo) { // CheckNameExist 不应该被调用 - repoMock.EXPECT().UpdateEvaluatorMeta(gomock.Any(), int64(1), "", "new description", "user123").Return(nil) + repoMock.EXPECT().UpdateEvaluatorMeta(gomock.Any(), gomock.Any()).Return(nil) }, wantErr: false, }, @@ -704,7 +676,7 @@ func TestEvaluatorServiceImpl_UpdateEvaluatorMeta(t *testing.T) { userID: "user456", setupMock: func(repoMock *repomocks.MockIEvaluatorRepo) { repoMock.EXPECT().CheckNameExist(gomock.Any(), int64(101), int64(2), "newName").Return(false, nil) - repoMock.EXPECT().UpdateEvaluatorMeta(gomock.Any(), int64(2), "newName", "another description", "user456").Return(nil) + repoMock.EXPECT().UpdateEvaluatorMeta(gomock.Any(), gomock.Any()).Return(nil) }, wantErr: false, }, @@ -745,7 +717,7 @@ func TestEvaluatorServiceImpl_UpdateEvaluatorMeta(t *testing.T) { userID: "userDEF", setupMock: func(repoMock *repomocks.MockIEvaluatorRepo) { // CheckNameExist 不应该被调用 - repoMock.EXPECT().UpdateEvaluatorMeta(gomock.Any(), int64(5), "", "update fail desc", "userDEF").Return(errors.New("db update error")) + repoMock.EXPECT().UpdateEvaluatorMeta(gomock.Any(), gomock.Any()).Return(errors.New("db update error")) }, wantErr: true, expectedErr: errors.New("db update error"), @@ -759,7 +731,7 @@ func TestEvaluatorServiceImpl_UpdateEvaluatorMeta(t *testing.T) { userID: "userGHI", setupMock: func(repoMock *repomocks.MockIEvaluatorRepo) { repoMock.EXPECT().CheckNameExist(gomock.Any(), int64(105), int64(6), "validNameButFailUpdate").Return(false, nil) - repoMock.EXPECT().UpdateEvaluatorMeta(gomock.Any(), int64(6), "validNameButFailUpdate", "desc", "userGHI").Return(errors.New("db update error after check")) + repoMock.EXPECT().UpdateEvaluatorMeta(gomock.Any(), gomock.Any()).Return(errors.New("db update error after check")) }, wantErr: true, expectedErr: errors.New("db update error after check"), @@ -773,7 +745,13 @@ func TestEvaluatorServiceImpl_UpdateEvaluatorMeta(t *testing.T) { tt.setupMock(mockEvaluatorRepo) } - err := s.UpdateEvaluatorMeta(ctx, tt.id, tt.spaceID, tt.evalName, tt.description, tt.userID) + err := s.UpdateEvaluatorMeta(ctx, &entity.UpdateEvaluatorMetaRequest{ + ID: tt.id, + SpaceID: tt.spaceID, + Name: &tt.evalName, + Description: &tt.description, + UpdatedBy: tt.userID, + }) if tt.wantErr { assert.Error(t, err, "期望得到一个错误") @@ -862,9 +840,11 @@ func TestEvaluatorServiceImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { ID: 1, SpaceID: 100, Name: "Test Builtin Evaluator", - Tags: map[entity.EvaluatorTagKey][]string{ - entity.EvaluatorTagKey_Category: {"LLM", "Code"}, - entity.EvaluatorTagKey_Objective: {"Quality"}, + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM", "Code"}, + entity.EvaluatorTagKey_Objective: {"Quality"}, + }, }, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ ID: 10, @@ -883,7 +863,7 @@ func TestEvaluatorServiceImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { name: "成功更新内置评估器草稿", evaluatorDO: testEvaluator, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { - mockRepo.EXPECT().UpdateBuiltinEvaluatorDraft(gomock.Any(), gomock.Any()).Return(nil) + mockRepo.EXPECT().UpdateEvaluatorDraft(gomock.Any(), gomock.Any()).Return(nil) }, expectedError: nil, }, @@ -891,7 +871,7 @@ func TestEvaluatorServiceImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { name: "更新内置评估器草稿失败 - repo返回错误", evaluatorDO: testEvaluator, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { - mockRepo.EXPECT().UpdateBuiltinEvaluatorDraft(gomock.Any(), testEvaluator).Return(errors.New("repo error")) + mockRepo.EXPECT().UpdateEvaluatorDraft(gomock.Any(), testEvaluator).Return(errors.New("repo error")) }, expectedError: errors.New("repo error"), }, @@ -900,7 +880,7 @@ func TestEvaluatorServiceImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { tt.setupMock(mockEvaluatorRepo) - err := s.UpdateBuiltinEvaluatorDraft(ctx, tt.evaluatorDO) + err := s.UpdateEvaluatorDraft(ctx, tt.evaluatorDO) if tt.expectedError != nil { assert.Error(t, err) @@ -1202,7 +1182,7 @@ func TestEvaluatorServiceImpl_GetEvaluatorVersion(t *testing.T) { // 期望 evaluatorRepo.BatchGetEvaluatorByVersionID 被调用一次 // 参数为：任意上下文, ID切片, 是否包含删除 // 返回预设的评估器列表和nil错误 - mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq([]int64{args.evaluatorVersionID}), args.includeDeleted). + mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq([]int64{args.evaluatorVersionID}), args.includeDeleted, gomock.Any()). Return([]*entity.Evaluator{{ID: 1, Name: "Test Evaluator Version 1"}}, nil) }, want: &entity.Evaluator{ID: 1, Name: "Test Evaluator Version 1"}, @@ -1212,7 +1192,7 @@ func TestEvaluatorServiceImpl_GetEvaluatorVersion(t *testing.T) { name: "成功 - 未找到评估器版本 (repo返回空列表)", args: args{evaluatorVersionID: 2, includeDeleted: false}, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo, args args) { - mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq([]int64{args.evaluatorVersionID}), args.includeDeleted). + mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq([]int64{args.evaluatorVersionID}), args.includeDeleted, gomock.Any()). Return([]*entity.Evaluator{}, nil) // Repo返回空列表表示未找到 }, want: nil, // 期望返回nil实体 @@ -1222,7 +1202,7 @@ func TestEvaluatorServiceImpl_GetEvaluatorVersion(t *testing.T) { name: "失败 - evaluatorRepo.BatchGetEvaluatorByVersionID 返回错误", args: args{evaluatorVersionID: 3, includeDeleted: true}, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo, args args) { - mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq([]int64{args.evaluatorVersionID}), args.includeDeleted). + mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq([]int64{args.evaluatorVersionID}), args.includeDeleted, gomock.Any()). Return(nil, errors.New("repo database error")) // Repo返回错误 }, want: nil, @@ -1232,7 +1212,7 @@ func TestEvaluatorServiceImpl_GetEvaluatorVersion(t *testing.T) { name: "成功 - repo返回多个评估器版本 (应返回第一个)", args: args{evaluatorVersionID: 4, includeDeleted: false}, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo, args args) { - mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq([]int64{args.evaluatorVersionID}), args.includeDeleted). + mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq([]int64{args.evaluatorVersionID}), args.includeDeleted, gomock.Any()). Return([]*entity.Evaluator{ {ID: 4, Name: "First Evaluator Version"}, {ID: 5, Name: "Second Evaluator Version"}, // 即使返回多个，方法也只取第一个 @@ -1248,7 +1228,7 @@ func TestEvaluatorServiceImpl_GetEvaluatorVersion(t *testing.T) { t.Run(tc.name, func(t *testing.T) { tc.setupMock(mockEvaluatorRepo, tc.args) - got, err := s.GetEvaluatorVersion(ctx, tc.args.evaluatorVersionID, tc.args.includeDeleted) + got, err := s.GetEvaluatorVersion(ctx, nil, tc.args.evaluatorVersionID, tc.args.includeDeleted, false) // 断言错误 if tc.wantErr != nil { @@ -1289,7 +1269,7 @@ func TestEvaluatorServiceImpl_BatchGetEvaluatorVersion(t *testing.T) { name: "成功 - 找到多个评估器版本", args: args{evaluatorVersionIDs: []int64{10, 20}, includeDeleted: false}, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo, args args) { - mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq(args.evaluatorVersionIDs), args.includeDeleted). + mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq(args.evaluatorVersionIDs), args.includeDeleted, gomock.Any()). Return([]*entity.Evaluator{ {ID: 10, Name: "Evaluator Version 10"}, {ID: 20, Name: "Evaluator Version 20"}, @@ -1305,7 +1285,7 @@ func TestEvaluatorServiceImpl_BatchGetEvaluatorVersion(t *testing.T) { name: "成功 - 传入空ID列表 (repo应返回空列表)", args: args{evaluatorVersionIDs: []int64{}, includeDeleted: false}, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo, args args) { - mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq(args.evaluatorVersionIDs), args.includeDeleted). + mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq(args.evaluatorVersionIDs), args.includeDeleted, gomock.Any()). Return([]*entity.Evaluator{}, nil) // 期望repo对于空ID列表返回空列表 }, want: []*entity.Evaluator{}, @@ -1315,7 +1295,7 @@ func TestEvaluatorServiceImpl_BatchGetEvaluatorVersion(t *testing.T) { name: "成功 - 未找到任何评估器版本 (repo返回空列表)", args: args{evaluatorVersionIDs: []int64{999}, includeDeleted: true}, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo, args args) { - mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq(args.evaluatorVersionIDs), args.includeDeleted). + mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq(args.evaluatorVersionIDs), args.includeDeleted, gomock.Any()). Return([]*entity.Evaluator{}, nil) }, want: []*entity.Evaluator{}, @@ -1325,7 +1305,7 @@ func TestEvaluatorServiceImpl_BatchGetEvaluatorVersion(t *testing.T) { name: "失败 - evaluatorRepo.BatchGetEvaluatorByVersionID 返回错误", args: args{evaluatorVersionIDs: []int64{30}, includeDeleted: false}, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo, args args) { - mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq(args.evaluatorVersionIDs), args.includeDeleted). + mockRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), gomock.Eq(args.evaluatorVersionIDs), args.includeDeleted, gomock.Any()). Return(nil, errors.New("batch repo database error")) }, want: nil, @@ -1507,7 +1487,7 @@ func TestEvaluatorServiceImpl_RunEvaluator(t *testing.T) { mockLimiter := repomocks.NewMockRateLimiter(ctrl) mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) mockEvaluatorRecordRepo := repomocks.NewMockIEvaluatorRecordRepo(ctrl) - mockEvaluatorSourceService := NewMockEvaluatorSourceService(ctrl) + mockEvaluatorSourceService := mocks.NewMockEvaluatorSourceService(ctrl) s := &EvaluatorServiceImpl{ evaluatorRepo: mockEvaluatorRepo, limiter: mockLimiter, @@ -1515,7 +1495,7 @@ func TestEvaluatorServiceImpl_RunEvaluator(t *testing.T) { evaluatorRecordRepo: mockEvaluatorRecordRepo, // mqFactory, idem, configer 可以为 nil 或根据需要 mock evaluatorSourceServices: map[entity.EvaluatorType]EvaluatorSourceService{ - entity.EvaluatorTypePrompt: mockEvaluatorSourceService, // 假设这是一个 mock 的 PromptEvaluatorSourceService + entity.EvaluatorTypePrompt: mockEvaluatorSourceService, // 使用生成的 mock }, } @@ -1586,10 +1566,9 @@ func TestEvaluatorServiceImpl_RunEvaluator(t *testing.T) { name: "成功运行评估器", request: defaultRequest, setupMocks: func(mockEvaluatorSourceService *mocks.MockEvaluatorSourceService) { - mockEvaluatorRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), []int64{defaultRequest.EvaluatorVersionID}, false).Return([]*entity.Evaluator{defaultEvaluatorDO}, nil) + mockEvaluatorRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), nil, []int64{defaultRequest.EvaluatorVersionID}, false, false).Return([]*entity.Evaluator{defaultEvaluatorDO}, nil) mockLimiter.EXPECT().AllowInvoke(gomock.Any(), defaultRequest.SpaceID).Return(true) mockIDGen.EXPECT().GenID(gomock.Any()).Return(defaultRecordID, nil) - session.WithCtxUser(ctx, &session.User{ID: defaultUserID}) mockEvaluatorSourceService.EXPECT().PreHandle(gomock.Any(), defaultEvaluatorDO).Return(nil) mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, defaultRequest.InputData, defaultRequest.DisableTracing).Return(defaultOutputData, defaultRunStatus, "trace-id-123") @@ -1634,7 +1613,7 @@ func TestEvaluatorServiceImpl_RunEvaluator(t *testing.T) { DisableTracing: true, }, setupMocks: func(mockEvaluatorSourceService *mocks.MockEvaluatorSourceService) { - mockEvaluatorRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), []int64{101}, false).Return([]*entity.Evaluator{defaultEvaluatorDO}, nil) + mockEvaluatorRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), nil, []int64{101}, false, false).Return([]*entity.Evaluator{defaultEvaluatorDO}, nil) mockLimiter.EXPECT().AllowInvoke(gomock.Any(), int64(1)).Return(true) mockIDGen.EXPECT().GenID(gomock.Any()).Return(defaultRecordID, nil) session.WithCtxUser(ctx, &session.User{ID: defaultUserID}) @@ -1683,7 +1662,7 @@ func TestEvaluatorServiceImpl_RunEvaluator(t *testing.T) { DisableTracing: false, }, setupMocks: func(mockEvaluatorSourceService *mocks.MockEvaluatorSourceService) { - mockEvaluatorRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), []int64{101}, false).Return([]*entity.Evaluator{defaultEvaluatorDO}, nil) + mockEvaluatorRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), nil, []int64{101}, false, false).Return([]*entity.Evaluator{defaultEvaluatorDO}, nil) mockLimiter.EXPECT().AllowInvoke(gomock.Any(), int64(1)).Return(true) mockIDGen.EXPECT().GenID(gomock.Any()).Return(defaultRecordID, nil) session.WithCtxUser(ctx, &session.User{ID: defaultUserID}) @@ -1754,7 +1733,7 @@ func Test_EvaluatorServiceImpl_DebugEvaluator(t *testing.T) { mockLimiter := repomocks.NewMockRateLimiter(ctrl) mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) mockEvaluatorRecordRepo := repomocks.NewMockIEvaluatorRecordRepo(ctrl) - mockEvaluatorSourceService := NewMockEvaluatorSourceService(ctrl) + mockEvaluatorSourceService := mocks.NewMockEvaluatorSourceService(ctrl) mockService := &EvaluatorServiceImpl{ evaluatorRepo: mockEvaluatorRepo, limiter: mockLimiter, @@ -1853,7 +1832,7 @@ func Test_EvaluatorServiceImpl_injectUserInfo(t *testing.T) { mockLimiter := repomocks.NewMockRateLimiter(ctrl) mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) mockEvaluatorRecordRepo := repomocks.NewMockIEvaluatorRecordRepo(ctrl) - mockEvaluatorSourceService := NewMockEvaluatorSourceService(ctrl) + mockEvaluatorSourceService := mocks.NewMockEvaluatorSourceService(ctrl) mockService := &EvaluatorServiceImpl{ evaluatorRepo: mockEvaluatorRepo, limiter: mockLimiter, @@ -1892,7 +1871,7 @@ func TestEvaluatorServiceImpl_RunEvaluator_DisableTracing(t *testing.T) { mockLimiter := repomocks.NewMockRateLimiter(ctrl) mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) mockEvaluatorRecordRepo := repomocks.NewMockIEvaluatorRecordRepo(ctrl) - mockEvaluatorSourceService := NewMockEvaluatorSourceService(ctrl) + mockEvaluatorSourceService := mocks.NewMockEvaluatorSourceService(ctrl) s := &EvaluatorServiceImpl{ evaluatorRepo: mockEvaluatorRepo, @@ -1943,7 +1922,7 @@ func TestEvaluatorServiceImpl_RunEvaluator_DisableTracing(t *testing.T) { name: "DisableTracing为true时正确传递给EvaluatorSourceService.Run", disableTracing: true, setupMocks: func() { - mockEvaluatorRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), []int64{101}, false).Return([]*entity.Evaluator{defaultEvaluatorDO}, nil) + mockEvaluatorRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), nil, []int64{101}, false, false).Return([]*entity.Evaluator{defaultEvaluatorDO}, nil) mockLimiter.EXPECT().AllowInvoke(gomock.Any(), int64(1)).Return(true) mockIDGen.EXPECT().GenID(gomock.Any()).Return(defaultRecordID, nil) mockEvaluatorSourceService.EXPECT().PreHandle(gomock.Any(), defaultEvaluatorDO).Return(nil) @@ -1956,7 +1935,7 @@ func TestEvaluatorServiceImpl_RunEvaluator_DisableTracing(t *testing.T) { name: "DisableTracing为false时正确传递给EvaluatorSourceService.Run", disableTracing: false, setupMocks: func() { - mockEvaluatorRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), gomock.Any(), []int64{101}, false).Return([]*entity.Evaluator{defaultEvaluatorDO}, nil) + mockEvaluatorRepo.EXPECT().BatchGetEvaluatorByVersionID(gomock.Any(), nil, []int64{101}, false, false).Return([]*entity.Evaluator{defaultEvaluatorDO}, nil) mockLimiter.EXPECT().AllowInvoke(gomock.Any(), int64(1)).Return(true) mockIDGen.EXPECT().GenID(gomock.Any()).Return(defaultRecordID, nil) mockEvaluatorSourceService.EXPECT().PreHandle(gomock.Any(), defaultEvaluatorDO).Return(nil) @@ -2012,14 +1991,12 @@ func TestEvaluatorServiceImpl_ListBuiltinEvaluator(t *testing.T) { { name: "成功 - 不带版本信息 (WithVersion = false)", request: &entity.ListBuiltinEvaluatorRequest{ - SpaceID: 1, PageSize: 10, PageNum: 1, WithVersion: false, }, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ - SpaceID: 1, PageSize: 10, PageNum: 1, IncludeDeleted: false, @@ -2044,14 +2021,12 @@ func TestEvaluatorServiceImpl_ListBuiltinEvaluator(t *testing.T) { { name: "成功 - 带版本信息 (WithVersion = true)", request: &entity.ListBuiltinEvaluatorRequest{ - SpaceID: 1, PageSize: 10, PageNum: 1, WithVersion: true, }, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ - SpaceID: 1, PageSize: 10, PageNum: 1, IncludeDeleted: false, @@ -2064,12 +2039,6 @@ func TestEvaluatorServiceImpl_ListBuiltinEvaluator(t *testing.T) { }, TotalCount: 1, }, nil) - - // 模拟版本查询 - mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDs(gomock.Any(), []int64{1}, false).Return( - []*entity.Evaluator{ - {ID: 1, Name: "BuiltinEval1", SpaceID: 1, Description: "Builtin Desc1"}, - }, nil) }, expectedList: []*entity.Evaluator{ {ID: 1, Name: "BuiltinEval1", SpaceID: 1, Description: "Builtin Desc1"}, @@ -2080,14 +2049,12 @@ func TestEvaluatorServiceImpl_ListBuiltinEvaluator(t *testing.T) { { name: "失败 - repo返回错误", request: &entity.ListBuiltinEvaluatorRequest{ - SpaceID: 1, PageSize: 10, PageNum: 1, WithVersion: false, }, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ - SpaceID: 1, PageSize: 10, PageNum: 1, IncludeDeleted: false, diff --git a/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go index 42040cf21..40cae0617 100644 --- a/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go @@ -36,6 +36,11 @@ func (m *MockEvaluatorTemplateRepo) DeleteEvaluatorTemplate(ctx context.Context, return args.Error(0) } +func (m *MockEvaluatorTemplateRepo) IncrPopularityByID(ctx context.Context, id int64) error { + args := m.Called(ctx, id) + return args.Error(0) +} + func (m *MockEvaluatorTemplateRepo) GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool) (*entity.EvaluatorTemplate, error) { args := m.Called(ctx, id, includeDeleted) if args.Get(0) == nil { @@ -438,16 +443,6 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { expectedError: false, description: "成功查询评估器模板列表", }, - { - name: "invalid space ID", - req: &entity.ListEvaluatorTemplateRequest{ - SpaceID: 0, - PageSize: 10, - PageNum: 1, - }, - expectedError: true, - description: "无效的空间ID应该返回错误", - }, { name: "invalid page size", req: &entity.ListEvaluatorTemplateRequest{ @@ -477,6 +472,14 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { if !tt.expectedError { mockRepo.On("ListEvaluatorTemplate", mock.Anything, mock.Anything).Return(tt.mockResponse, tt.mockError) + } else { + // For error cases, we still need to mock the call or handle the validation error + if tt.name == "invalid page size" || tt.name == "invalid page num" { + // These are validation errors that should happen before the repo call + // So we don't need to mock the repo call + } else { + mockRepo.On("ListEvaluatorTemplate", mock.Anything, mock.Anything).Return(tt.mockResponse, tt.mockError) + } } result, err := service.ListEvaluatorTemplate(context.Background(), tt.req) diff --git a/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go b/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go index c979045cc..cfa0a29fa 100644 --- a/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go +++ b/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go @@ -130,6 +130,21 @@ func (mr *MockEvaluatorServiceMockRecorder) DeleteEvaluator(ctx, evaluatorIDs, u return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteEvaluator", reflect.TypeOf((*MockEvaluatorService)(nil).DeleteEvaluator), ctx, evaluatorIDs, userID) } +// GetBuiltinEvaluator mocks base method. +func (m *MockEvaluatorService) GetBuiltinEvaluator(ctx context.Context, evaluatorID int64) (*entity.Evaluator, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetBuiltinEvaluator", ctx, evaluatorID) + ret0, _ := ret[0].(*entity.Evaluator) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetBuiltinEvaluator indicates an expected call of GetBuiltinEvaluator. +func (mr *MockEvaluatorServiceMockRecorder) GetBuiltinEvaluator(ctx, evaluatorID any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBuiltinEvaluator", reflect.TypeOf((*MockEvaluatorService)(nil).GetBuiltinEvaluator), ctx, evaluatorID) +} + // GetEvaluator mocks base method. func (m *MockEvaluatorService) GetEvaluator(ctx context.Context, spaceID, evaluatorID int64, includeDeleted bool) (*entity.Evaluator, error) { m.ctrl.T.Helper() @@ -146,18 +161,18 @@ func (mr *MockEvaluatorServiceMockRecorder) GetEvaluator(ctx, spaceID, evaluator } // GetEvaluatorVersion mocks base method. -func (m *MockEvaluatorService) GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, builtin bool) (*entity.Evaluator, error) { +func (m *MockEvaluatorService) GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted, withTags bool) (*entity.Evaluator, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetEvaluatorVersion", ctx, spaceID, evaluatorVersionID, includeDeleted, builtin) + ret := m.ctrl.Call(m, "GetEvaluatorVersion", ctx, spaceID, evaluatorVersionID, includeDeleted, withTags) ret0, _ := ret[0].(*entity.Evaluator) ret1, _ := ret[1].(error) return ret0, ret1 } // GetEvaluatorVersion indicates an expected call of GetEvaluatorVersion. -func (mr *MockEvaluatorServiceMockRecorder) GetEvaluatorVersion(ctx, spaceID, evaluatorVersionID, includeDeleted, builtin any) *gomock.Call { +func (mr *MockEvaluatorServiceMockRecorder) GetEvaluatorVersion(ctx, spaceID, evaluatorVersionID, includeDeleted, withTags any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorVersion", reflect.TypeOf((*MockEvaluatorService)(nil).GetEvaluatorVersion), ctx, spaceID, evaluatorVersionID, includeDeleted, builtin) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorVersion", reflect.TypeOf((*MockEvaluatorService)(nil).GetEvaluatorVersion), ctx, spaceID, evaluatorVersionID, includeDeleted, withTags) } // ListBuiltinEvaluator mocks base method. @@ -238,6 +253,20 @@ func (mr *MockEvaluatorServiceMockRecorder) SubmitEvaluatorVersion(ctx, evaluato return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitEvaluatorVersion", reflect.TypeOf((*MockEvaluatorService)(nil).SubmitEvaluatorVersion), ctx, evaluatorVersionDO, version, description, cid) } +// UpdateBuiltinEvaluatorTags mocks base method. +func (m *MockEvaluatorService) UpdateBuiltinEvaluatorTags(ctx context.Context, evaluatorID int64, tags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "UpdateBuiltinEvaluatorTags", ctx, evaluatorID, tags) + ret0, _ := ret[0].(error) + return ret0 +} + +// UpdateBuiltinEvaluatorTags indicates an expected call of UpdateBuiltinEvaluatorTags. +func (mr *MockEvaluatorServiceMockRecorder) UpdateBuiltinEvaluatorTags(ctx, evaluatorID, tags any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateBuiltinEvaluatorTags", reflect.TypeOf((*MockEvaluatorService)(nil).UpdateBuiltinEvaluatorTags), ctx, evaluatorID, tags) +} + // UpdateEvaluatorDraft mocks base method. func (m *MockEvaluatorService) UpdateEvaluatorDraft(ctx context.Context, versionDO *entity.Evaluator) error { m.ctrl.T.Helper() diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 5683d4ad2..43ee6c118 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -207,7 +207,7 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorMetaByID(ctx context.Context, ids [ return evaluatorDOs, nil } -func (r *EvaluatorRepoImpl) BatchGetEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { +func (r *EvaluatorRepoImpl) BatchGetEvaluatorByVersionID(ctx context.Context, spaceID *int64, ids []int64, includeDeleted bool, withTags bool) ([]*entity.Evaluator, error) { evaluatorVersionPOS, err := r.evaluatorVersionDao.BatchGetEvaluatorVersionByID(ctx, spaceID, ids, includeDeleted) if err != nil { return nil, err @@ -223,38 +223,71 @@ func (r *EvaluatorRepoImpl) BatchGetEvaluatorByVersionID(ctx context.Context, sp for _, evaluatorPO := range evaluatorPOS { evaluatorMap[evaluatorPO.ID] = evaluatorPO } + // 当 withTags=true 时，准备 tags 映射（按 evaluatorID 聚合） + var tagsBySourceID map[int64][]*model.EvaluatorTag + if withTags { + evaluatorIDs := make([]int64, 0, len(evaluatorVersionPOS)) + for _, ev := range evaluatorVersionPOS { + evaluatorIDs = append(evaluatorIDs, ev.EvaluatorID) + } + var allTags []*model.EvaluatorTag + if len(evaluatorIDs) > 0 { + allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, evaluatorIDs, int32(entity.EvaluatorTagKeyType_Evaluator), contexts.CtxLocale(ctx)) + if err != nil { + allTags = []*model.EvaluatorTag{} + } + } + tagsBySourceID = make(map[int64][]*model.EvaluatorTag) + for _, tag := range allTags { + tagsBySourceID[tag.SourceID] = append(tagsBySourceID[tag.SourceID], tag) + } + } + evaluatorDOList := make([]*entity.Evaluator, 0, len(evaluatorVersionPOS)) for _, evaluatorVersionPO := range evaluatorVersionPOS { if evaluatorVersionPO.EvaluatorType == nil { continue } + evaluatorPO, exists := evaluatorMap[evaluatorVersionPO.EvaluatorID] + if !exists { + continue + } switch *evaluatorVersionPO.EvaluatorType { case int32(entity.EvaluatorTypePrompt): evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) if err != nil { return nil, err } - evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorMap[evaluatorVersionPO.EvaluatorID]) + evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorPO) evaluatorDO.PromptEvaluatorVersion = evaluatorVersionDO.PromptEvaluatorVersion evaluatorDO.EvaluatorType = entity.EvaluatorTypePrompt + if withTags { + r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.EvaluatorID, tagsBySourceID) + } evaluatorDOList = append(evaluatorDOList, evaluatorDO) case int32(entity.EvaluatorTypeCode): evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) if err != nil { return nil, err } - evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorMap[evaluatorVersionPO.EvaluatorID]) + evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorPO) evaluatorDO.CodeEvaluatorVersion = evaluatorVersionDO.CodeEvaluatorVersion evaluatorDO.EvaluatorType = entity.EvaluatorTypeCode + if withTags { + r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.EvaluatorID, tagsBySourceID) + } evaluatorDOList = append(evaluatorDOList, evaluatorDO) case int32(entity.EvaluatorTypeCustomRPC): evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) if err != nil { return nil, err } - evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorMap[evaluatorVersionPO.EvaluatorID]) + evaluatorDO := convertor.ConvertEvaluatorPO2DO(evaluatorPO) evaluatorDO.CustomRPCEvaluatorVersion = evaluatorVersionDO.CustomRPCEvaluatorVersion evaluatorDO.EvaluatorType = entity.EvaluatorTypeCustomRPC + if withTags { + r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.EvaluatorID, tagsBySourceID) + } evaluatorDOList = append(evaluatorDOList, evaluatorDO) default: continue @@ -473,6 +506,9 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorMeta(ctx context.Context, req *entity if req.Description != nil { po.Description = req.Description } + if req.BoxType != nil { + po.BoxType = int32(*req.BoxType) + } if req.Benchmark != nil { po.Benchmark = req.Benchmark } @@ -721,103 +757,7 @@ func (r *EvaluatorRepoImpl) ListBuiltinEvaluator(ctx context.Context, req *repo. return &repo.ListBuiltinEvaluatorResponse{TotalCount: daoResp.TotalCount, Evaluators: evaluators}, nil } -// BatchGetBuiltinEvaluatorByVersionID 批量根据版本ID获取内置评估器，包含tag信息 -func (r *EvaluatorRepoImpl) BatchGetBuiltinEvaluatorByVersionID(ctx context.Context, ids []int64, includeDeleted bool) ([]*entity.Evaluator, error) { - // 先获取evaluator版本信息 - evaluatorVersionPOS, err := r.evaluatorVersionDao.BatchGetEvaluatorVersionByID(ctx, nil, ids, includeDeleted) - if err != nil { - return nil, err - } - - // 获取evaluator基本信息 - evaluatorPOS, err := r.evaluatorDao.BatchGetEvaluatorByID(ctx, gslice.Map(evaluatorVersionPOS, func(t *model.EvaluatorVersion) int64 { - return t.EvaluatorID - }), includeDeleted) - if err != nil { - return nil, err - } - - // 构建evaluator映射 - evaluatorMap := make(map[int64]*model.Evaluator) - for _, evaluatorPO := range evaluatorPOS { - evaluatorMap[evaluatorPO.ID] = evaluatorPO - } - - // 收集所有 evaluator 的ID用于查询tags（以evaluator ID为source_id） - evaluatorIDs := make([]int64, 0, len(evaluatorVersionPOS)) - for _, ev := range evaluatorVersionPOS { - evaluatorIDs = append(evaluatorIDs, ev.EvaluatorID) - } - - // 批量查询所有tags（以版本ID为source_id） - var allTags []*model.EvaluatorTag - if len(evaluatorIDs) > 0 { - allTags, err = r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, evaluatorIDs, int32(entity.EvaluatorTagKeyType_Evaluator), contexts.CtxLocale(ctx)) - if err != nil { - // 如果批量查询tags失败，记录错误但继续处理 - allTags = []*model.EvaluatorTag{} - } - } - - // 将tags按sourceID分组 - tagsBySourceID := make(map[int64][]*model.EvaluatorTag) - for _, tag := range allTags { - tagsBySourceID[tag.SourceID] = append(tagsBySourceID[tag.SourceID], tag) - } - - // 构建结果 - evaluatorDOList := make([]*entity.Evaluator, 0, len(evaluatorVersionPOS)) - for _, evaluatorVersionPO := range evaluatorVersionPOS { - if evaluatorVersionPO.EvaluatorType == nil { - continue - } - - evaluatorPO, exists := evaluatorMap[evaluatorVersionPO.EvaluatorID] - if !exists { - continue - } - - var evaluatorDO *entity.Evaluator - switch *evaluatorVersionPO.EvaluatorType { - case int32(entity.EvaluatorTypePrompt): - evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) - if err != nil { - return nil, err - } - evaluatorDO = convertor.ConvertEvaluatorPO2DO(evaluatorPO) - evaluatorDO.PromptEvaluatorVersion = evaluatorVersionDO.PromptEvaluatorVersion - evaluatorDO.EvaluatorType = entity.EvaluatorTypePrompt - - case int32(entity.EvaluatorTypeCode): - evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) - if err != nil { - return nil, err - } - evaluatorDO = convertor.ConvertEvaluatorPO2DO(evaluatorPO) - evaluatorDO.CodeEvaluatorVersion = evaluatorVersionDO.CodeEvaluatorVersion - evaluatorDO.EvaluatorType = entity.EvaluatorTypeCode - - case int32(entity.EvaluatorTypeCustomRPC): - evaluatorVersionDO, err := convertor.ConvertEvaluatorVersionPO2DO(evaluatorVersionPO) - if err != nil { - return nil, err - } - evaluatorDO = convertor.ConvertEvaluatorPO2DO(evaluatorPO) - evaluatorDO.CustomRPCEvaluatorVersion = evaluatorVersionDO.CustomRPCEvaluatorVersion - evaluatorDO.EvaluatorType = entity.EvaluatorTypeCustomRPC - - default: - continue - } - - // 设置tags信息（以版本ID为source_id） - r.setEvaluatorTags(evaluatorDO, evaluatorVersionPO.EvaluatorID, tagsBySourceID) - - evaluatorDOList = append(evaluatorDOList, evaluatorDO) - } - - return evaluatorDOList, nil -} +// 已合并内置与普通查询至 BatchGetEvaluatorByVersionID(builtin) // setEvaluatorTags 设置评估器的tag信息 func (r *EvaluatorRepoImpl) setEvaluatorTags(evaluatorDO *entity.Evaluator, evaluatorID int64, tagsBySourceID map[int64][]*model.EvaluatorTag) { diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index caa37e2b0..cf2fee989 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -485,7 +485,7 @@ func TestEvaluatorRepoImpl_BatchGetEvaluatorByVersionID(t *testing.T) { lwt: mockLWT, } - result, err := repo.BatchGetEvaluatorByVersionID(context.Background(), nil, tt.ids, tt.includeDeleted) + result, err := repo.BatchGetEvaluatorByVersionID(context.Background(), nil, tt.ids, tt.includeDeleted, false) assert.Equal(t, tt.expectedError, err) if err == nil { assert.Equal(t, len(tt.expectedResult), len(result)) @@ -737,7 +737,8 @@ func TestEvaluatorRepoImpl_ListEvaluatorVersion(t *testing.T) { mockLWT := platestwritemocks.NewMockILatestWriteTracker(ctrl) mockTagDAO := evaluatormocks.NewMockEvaluatorTagDAO(ctrl) - evaluatorRepo := NewEvaluatorRepo(mockIDGen, mockDBProvider, mockEvaluatorDAO, mockEvaluatorVersionDAO, mockTagDAO, mockLWT) + mockTemplateDAO := evaluatormocks.NewMockEvaluatorTemplateDAO(ctrl) + evaluatorRepo := NewEvaluatorRepo(mockIDGen, mockDBProvider, mockEvaluatorDAO, mockEvaluatorVersionDAO, mockTagDAO, mockLWT, mockTemplateDAO) tests := []struct { name string @@ -1224,7 +1225,13 @@ func TestEvaluatorRepoImpl_UpdateEvaluatorMeta(t *testing.T) { lwt: mockLWT, } - err := repo.UpdateEvaluatorMeta(context.Background(), tt.id, tt.evaluatorName, tt.description, tt.userID) + err := repo.UpdateEvaluatorMeta(context.Background(), &entity.UpdateEvaluatorMetaRequest{ + ID: tt.id, + SpaceID: 100, // 使用测试用的spaceID + Name: &tt.evaluatorName, + Description: &tt.description, + UpdatedBy: tt.userID, + }) assert.Equal(t, tt.expectedError, err) }) } @@ -1523,8 +1530,9 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { mockTagDAO := evaluatormocks.NewMockEvaluatorTagDAO(ctrl) mockDBProvider := dbmocks.NewMockProvider(ctrl) mockLWT := platestwritemocks.NewMockILatestWriteTracker(ctrl) + mockTemplateDAO := evaluatormocks.NewMockEvaluatorTemplateDAO(ctrl) - repo := NewEvaluatorRepo(mockIDGen, mockDBProvider, mockEvaluatorDAO, mockEvaluatorVersionDAO, mockTagDAO, mockLWT) + repo := NewEvaluatorRepo(mockIDGen, mockDBProvider, mockEvaluatorDAO, mockEvaluatorVersionDAO, mockTagDAO, mockLWT, mockTemplateDAO) tests := []struct { name string @@ -1542,9 +1550,11 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { UserID: gptr.Of("test_user"), }, }, - Tags: map[entity.EvaluatorTagKey][]string{ - entity.EvaluatorTagKey_Category: {"LLM", "Code"}, - entity.EvaluatorTagKey_Objective: {"Quality"}, + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM", "Code"}, + entity.EvaluatorTagKey_Objective: {"Quality"}, + }, }, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ Version: "1.0.0", @@ -1573,45 +1583,6 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { mockEvaluatorVersionDAO.EXPECT(). UpdateEvaluatorDraft(gomock.Any(), gomock.Any(), gomock.Any()). Return(nil) - - // 设置获取草稿版本的期望 - mockEvaluatorVersionDAO.EXPECT(). - BatchGetEvaluatorDraftByEvaluatorID(gomock.Any(), []int64{1}, false, gomock.Any()). - Return([]*model.EvaluatorVersion{ - { - ID: 100, // 草稿版本ID - EvaluatorID: 1, - Version: "draft", - }, - }, nil) - - // 设置获取现有tags的期望 - mockTagDAO.EXPECT(). - BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{100}, int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any(), gomock.Any()). - Return([]*model.EvaluatorTag{ - { - ID: 1, - SourceID: 100, - TagKey: "Category", - TagValue: "LLM", - }, - { - ID: 2, - SourceID: 100, - TagKey: "Objective", - TagValue: "Performance", - }, - }, nil) - - // 设置删除不需要的tags的期望 - mockTagDAO.EXPECT(). - DeleteEvaluatorTagsByConditions(gomock.Any(), int64(100), int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any(), gomock.Any(), gomock.Any()). - Return(nil) - - // 设置新增tags的期望 - mockTagDAO.EXPECT(). - BatchCreateEvaluatorTags(gomock.Any(), gomock.Any(), gomock.Any()). - Return(nil) }, expectedError: nil, }, @@ -1656,7 +1627,7 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { expectedError: nil, }, { - name: "失败 - 草稿版本不存在", + name: "成功 - 草稿版本不存在时也能更新", evaluator: &entity.Evaluator{ ID: 1, EvaluatorType: entity.EvaluatorTypePrompt, @@ -1665,8 +1636,10 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { UserID: gptr.Of("test_user"), }, }, - Tags: map[entity.EvaluatorTagKey][]string{ - entity.EvaluatorTagKey_Category: {"LLM"}, + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, }, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ Version: "1.0.0", @@ -1695,20 +1668,15 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorDraft(t *testing.T) { mockEvaluatorVersionDAO.EXPECT(). UpdateEvaluatorDraft(gomock.Any(), gomock.Any(), gomock.Any()). Return(nil) - - // 设置获取草稿版本的期望 - 返回空列表 - mockEvaluatorVersionDAO.EXPECT(). - BatchGetEvaluatorDraftByEvaluatorID(gomock.Any(), []int64{1}, false, gomock.Any()). - Return([]*model.EvaluatorVersion{}, nil) }, - expectedError: assert.AnError, // 期望返回错误 + expectedError: nil, // 实际实现不验证草稿是否存在，所以不应期望错误 }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { tt.mockSetup() - err := repo.UpdateBuiltinEvaluatorDraft(context.Background(), tt.evaluator) + err := repo.UpdateEvaluatorDraft(context.Background(), tt.evaluator) if tt.expectedError != nil { assert.Error(t, err) } else { @@ -1780,17 +1748,19 @@ func TestEvaluatorRepoImpl_BatchGetBuiltinEvaluatorByVersionID(t *testing.T) { // 设置获取tag信息的期望 mockTagDAO.EXPECT(). - BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{1, 2}, int32(entity.EvaluatorTagKeyType_Evaluator)). + BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{1, 2}, int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any()). Return([]*model.EvaluatorTag{ { SourceID: 1, TagKey: "category", TagValue: "test", + LangType: "en-US", }, { SourceID: 2, TagKey: "category", TagValue: "production", + LangType: "en-US", }, }, nil) }, @@ -1799,16 +1769,20 @@ func TestEvaluatorRepoImpl_BatchGetBuiltinEvaluatorByVersionID(t *testing.T) { ID: 1, Name: "Test Evaluator 1", EvaluatorType: entity.EvaluatorTypePrompt, - Tags: map[entity.EvaluatorTagKey][]string{ - "category": {"test"}, + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + "category": {"test"}, + }, }, }, { ID: 2, Name: "Test Evaluator 2", EvaluatorType: entity.EvaluatorTypeCode, - Tags: map[entity.EvaluatorTagKey][]string{ - "category": {"production"}, + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + "category": {"production"}, + }, }, }, }, @@ -1856,7 +1830,7 @@ func TestEvaluatorRepoImpl_BatchGetBuiltinEvaluatorByVersionID(t *testing.T) { // tag查询失败，但方法应该继续处理 mockTagDAO.EXPECT(). - BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{1}, int32(entity.EvaluatorTagKeyType_Evaluator)). + BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{1}, int32(entity.EvaluatorTagKeyType_Evaluator), gomock.Any()). Return(nil, assert.AnError) }, expectedResult: []*entity.Evaluator{ @@ -1884,7 +1858,7 @@ func TestEvaluatorRepoImpl_BatchGetBuiltinEvaluatorByVersionID(t *testing.T) { lwt: mockLWT, } - result, err := repo.BatchGetBuiltinEvaluatorByVersionID(context.Background(), tt.spaceID, tt.ids, tt.includeDeleted) + result, err := repo.BatchGetEvaluatorByVersionID(context.Background(), tt.spaceID, tt.ids, tt.includeDeleted, true) if tt.expectedError != nil { assert.Error(t, err) assert.Equal(t, tt.expectedError, err) @@ -1930,7 +1904,7 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorMeta(t *testing.T) { userID: "test_user", mockSetup: func() { mockEvaluatorDAO.EXPECT(). - UpdateBuiltinEvaluatorMeta(gomock.Any(), gomock.Any()). + UpdateEvaluatorMeta(gomock.Any(), gomock.Any()). Return(nil) }, expectedError: nil, @@ -1943,7 +1917,7 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorMeta(t *testing.T) { userID: "test_user", mockSetup: func() { mockEvaluatorDAO.EXPECT(). - UpdateBuiltinEvaluatorMeta(gomock.Any(), gomock.Any()). + UpdateEvaluatorMeta(gomock.Any(), gomock.Any()). Return(assert.AnError) }, expectedError: assert.AnError, @@ -1963,7 +1937,15 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorMeta(t *testing.T) { lwt: mockLWT, } - err := repo.UpdateBuiltinEvaluatorMeta(context.Background(), tt.id, "", "", tt.benchmark, tt.vendor, tt.userID) + err := repo.UpdateEvaluatorMeta(context.Background(), &entity.UpdateEvaluatorMetaRequest{ + ID: tt.id, + SpaceID: 100, // 使用测试用的spaceID + Name: gptr.Of(""), + Description: gptr.Of(""), + Benchmark: &tt.benchmark, + Vendor: &tt.vendor, + UpdatedBy: tt.userID, + }) if tt.expectedError != nil { assert.Error(t, err) assert.Equal(t, tt.expectedError, err) diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go index 3917e4b1b..c3f3711e5 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go @@ -396,6 +396,15 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { mockTagDAO.On("GetSourceIDsByFilterConditions", mock.Anything, int32(2), tt.request.FilterOption, int32(0), int32(0), mock.Anything, mock.Anything).Return(tt.mockTagIDs, int64(len(tt.mockTagIDs)), tt.mockTagError) } + // Set up mock for BatchGetTagsBySourceIDsAndType - this is always called when there are template IDs + if tt.mockTemplates != nil && len(tt.mockTemplates.Templates) > 0 { + templateIDs := make([]int64, len(tt.mockTemplates.Templates)) + for i, template := range tt.mockTemplates.Templates { + templateIDs[i] = template.ID + } + mockTagDAO.On("BatchGetTagsBySourceIDsAndType", mock.Anything, templateIDs, int32(2), "en-US", mock.Anything).Return([]*model.EvaluatorTag{}, nil) + } + // 设置templateDAO的期望 // 只有在tag查询有错误或筛选条件命中数为0时才不设置templateDAO的期望 if tt.mockTagError == nil && !(hasValidFilters && len(tt.mockTagIDs) == 0) { diff --git a/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go b/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go index e7a73ac27..de557b7bf 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go @@ -32,7 +32,6 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { { name: "successful query without filters", request: &repo.ListBuiltinEvaluatorRequest{ - SpaceID: 123, FilterOption: nil, PageSize: 10, PageNum: 1, @@ -57,7 +56,6 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { { name: "successful query with tags", request: &repo.ListBuiltinEvaluatorRequest{ - SpaceID: 123, FilterOption: nil, PageSize: 10, PageNum: 1, diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go index 8f4790230..29e1198a5 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go @@ -36,6 +36,7 @@ func ConvertEvaluatorDO2PO(do *evaluatordo.Evaluator) *model.Evaluator { LatestVersion: do.LatestVersion, BuiltinVisibleVersion: do.BuiltinVisibleVersion, Builtin: builtinVal, + BoxType: int32(do.BoxType), Benchmark: ptr.Of(do.Benchmark), Vendor: ptr.Of(do.Vendor), } @@ -71,6 +72,7 @@ func ConvertEvaluatorPO2DO(po *model.Evaluator) *evaluatordo.Evaluator { LatestVersion: po.LatestVersion, BuiltinVisibleVersion: po.BuiltinVisibleVersion, Builtin: po.Builtin == 1, + BoxType: evaluatordo.EvaluatorBoxType(po.BoxType), Benchmark: gptr.Indirect(po.Benchmark), Vendor: gptr.Indirect(po.Vendor), } @@ -235,6 +237,20 @@ func ConvertEvaluatorVersionPO2DO(po *model.EvaluatorVersion) (*evaluatordo.Eval return nil, err } } + // 反序列化InputSchema + if po.InputSchema != nil { + var inputSchemas []*evaluatordo.ArgsSchema + if err := json.Unmarshal(*po.InputSchema, &inputSchemas); err == nil { + do.CustomRPCEvaluatorVersion.InputSchemas = inputSchemas + } + } + // 反序列化OutputSchema + if po.OutputSchema != nil { + var outputSchemas []*evaluatordo.ArgsSchema + if err := json.Unmarshal(*po.OutputSchema, &outputSchemas); err == nil { + do.CustomRPCEvaluatorVersion.OutputSchemas = outputSchemas + } + } } do.SetEvaluatorVersionID(po.ID) do.SetVersion(po.Version) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go index cc76c934b..c7bb8d30f 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go @@ -136,6 +136,9 @@ func (dao *EvaluatorDAOImpl) UpdateEvaluatorMeta(ctx context.Context, po *model. if po.BuiltinVisibleVersion != "" { updateMap["builtin_visible_version"] = po.BuiltinVisibleVersion } + if po.BoxType != 0 { + updateMap["box_type"] = po.BoxType + } return dbsession.WithContext(ctx).Model(&model.Evaluator{}). Where("id = ?", po.ID). // 添加ID筛选条件 Where("deleted_at IS NULL"). // 添加软删除筛选条件 diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go index dcbc4d282..2064347a4 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go @@ -7,29 +7,16 @@ import ( "context" "testing" + "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" + "go.uber.org/mock/gomock" + "gorm.io/driver/mysql" "gorm.io/gorm" - "github.com/coze-dev/coze-loop/backend/infra/db" + dbmock "github.com/coze-dev/coze-loop/backend/infra/db/mocks" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" ) -// MockProvider 模拟数据库提供者 -type MockProvider struct { - mock.Mock -} - -func (m *MockProvider) NewSession(ctx context.Context, opts ...db.Option) *gorm.DB { - args := m.Called(ctx, opts) - return args.Get(0).(*gorm.DB) -} - -func (m *MockProvider) Transaction(ctx context.Context, fc func(tx *gorm.DB) error, opts ...db.Option) error { - args := m.Called(ctx, fc, opts) - return args.Error(0) -} - func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { t.Parallel() @@ -233,18 +220,51 @@ func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + // 创建sqlmock连接 + sqlDB, mock, err := sqlmock.New() + if err != nil { + t.Fatalf("failed to create sqlmock: %v", err) + } + defer sqlDB.Close() + + // 创建真实的GORM数据库连接 + gormDB, err := gorm.Open(mysql.New(mysql.Config{ + Conn: sqlDB, + SkipInitializeWithVersion: true, + }), &gorm.Config{}) + if err != nil { + t.Fatalf("failed to open gorm db: %v", err) + } + // 创建mock provider - mockProvider := &MockProvider{} + mockProvider := dbmock.NewMockProvider(ctrl) + + // 对于nil的filterOption，方法会直接返回，不需要数据库调用 + if tt.filterOption == nil { + // 这种情况下方法直接返回，不需要设置mock期望 + } else { + // 对于非nil的filterOption，方法会调用NewSession并执行查询 + mockProvider.EXPECT().NewSession(gomock.Any(), gomock.Any()).Return(gormDB).Times(1) + + // Mock COUNT查询 - 总是会执行 + // 实际SQL格式: SELECT COUNT(DISTINCT(`source_id`)) FROM `evaluator_tag` WHERE ... + countRows := sqlmock.NewRows([]string{"count"}).AddRow(0) + mock.ExpectQuery("^SELECT COUNT\\(DISTINCT\\(`source_id`\\)\\) FROM `evaluator_tag`").WillReturnRows(countRows) + + // Mock SELECT查询 - 总是会执行Pluck查询 + // 实际SQL格式: SELECT DISTINCT source_id FROM `evaluator_tag` WHERE ... + selectRows := sqlmock.NewRows([]string{"source_id"}) + mock.ExpectQuery("^SELECT DISTINCT source_id FROM `evaluator_tag`").WillReturnRows(selectRows) + } // 创建DAO实例 dao := &EvaluatorTagDAOImpl{ provider: mockProvider, } - // 模拟数据库会话 - mockSession := &gorm.DB{} - mockProvider.On("NewSession", mock.Anything, mock.Anything).Return(mockSession) - // 执行测试 ctx := context.Background() result, total, err := dao.GetSourceIDsByFilterConditions(ctx, tt.tagType, tt.filterOption, 0, 0, "") @@ -262,8 +282,10 @@ func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { } } - // 验证mock调用 - mockProvider.AssertExpectations(t) + // 验证所有期望的SQL查询都被执行 + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("there were unfulfilled expectations: %s", err) + } }) } } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go index 9adee5164..9eb81f7e1 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go @@ -29,6 +29,7 @@ type Evaluator struct { Benchmark *string `gorm:"column:benchmark;type:varchar(255);comment:benchmark" json:"benchmark"` // benchmark Vendor *string `gorm:"column:vendor;type:varchar(255);comment:vendor" json:"vendor"` // vendor Builtin int32 `gorm:"column:builtin;type:int(11) unsigned;not null;default:2;comment:是否预置，1:是；2:否" json:"builtin"` // 是否预置，1:是；2:否 + BoxType int32 `gorm:"column:box_type;type:int(11) unsigned;not null;default:1;comment:黑白盒类型，1:白盒；2:黑盒" json:"box_type"` // 黑白盒类型，1:白盒；2:黑盒 BuiltinVisibleVersion string `gorm:"column:builtin_visible_version;type:varchar(128) character set utf8mb4;not null;comment:预置评估器最新可见版本号" json:"builtin_visible_version"` // 预置评估器最新可见版本号 } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go index 98cd91c63..22fa9a385 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go @@ -42,6 +42,7 @@ func newEvaluator(db *gorm.DB, opts ...gen.DOOption) evaluator { _evaluator.Benchmark = field.NewString(tableName, "benchmark") _evaluator.Vendor = field.NewString(tableName, "vendor") _evaluator.Builtin = field.NewInt32(tableName, "builtin") + _evaluator.BoxType = field.NewInt32(tableName, "box_type") _evaluator.BuiltinVisibleVersion = field.NewString(tableName, "builtin_visible_version") _evaluator.fillFieldMap() @@ -69,6 +70,7 @@ type evaluator struct { Benchmark field.String // benchmark Vendor field.String // vendor Builtin field.Int32 // 是否预置，1:是；2:否 + BoxType field.Int32 // 黑白盒类型，1:白盒；2:黑盒 BuiltinVisibleVersion field.String // 预置评估器最新可见版本号 fieldMap map[string]field.Expr @@ -101,6 +103,7 @@ func (e *evaluator) updateTableName(table string) *evaluator { e.Benchmark = field.NewString(table, "benchmark") e.Vendor = field.NewString(table, "vendor") e.Builtin = field.NewInt32(table, "builtin") + e.BoxType = field.NewInt32(table, "box_type") e.BuiltinVisibleVersion = field.NewString(table, "builtin_visible_version") e.fillFieldMap() @@ -128,7 +131,7 @@ func (e *evaluator) GetFieldByName(fieldName string) (field.OrderExpr, bool) { } func (e *evaluator) fillFieldMap() { - e.fieldMap = make(map[string]field.Expr, 16) + e.fieldMap = make(map[string]field.Expr, 17) e.fieldMap["id"] = e.ID e.fieldMap["space_id"] = e.SpaceID e.fieldMap["evaluator_type"] = e.EvaluatorType @@ -144,6 +147,7 @@ func (e *evaluator) fillFieldMap() { e.fieldMap["benchmark"] = e.Benchmark e.fieldMap["vendor"] = e.Vendor e.fieldMap["builtin"] = e.Builtin + e.fieldMap["box_type"] = e.BoxType e.fieldMap["builtin_visible_version"] = e.BuiltinVisibleVersion } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go index e194d1732..ed4470b2e 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_mock.go @@ -141,44 +141,44 @@ func (mr *MockEvaluatorDAOMockRecorder) GetEvaluatorByID(ctx, id, includeDeleted return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorByID", reflect.TypeOf((*MockEvaluatorDAO)(nil).GetEvaluatorByID), varargs...) } -// ListEvaluator mocks base method. -func (m *MockEvaluatorDAO) ListEvaluator(ctx context.Context, req *mysql.ListEvaluatorRequest, opts ...db.Option) (*mysql.ListEvaluatorResponse, error) { +// ListBuiltinEvaluator mocks base method. +func (m *MockEvaluatorDAO) ListBuiltinEvaluator(ctx context.Context, req *mysql.ListBuiltinEvaluatorRequest, opts ...db.Option) (*mysql.ListEvaluatorResponse, error) { m.ctrl.T.Helper() varargs := []any{ctx, req} for _, a := range opts { varargs = append(varargs, a) } - ret := m.ctrl.Call(m, "ListEvaluator", varargs...) + ret := m.ctrl.Call(m, "ListBuiltinEvaluator", varargs...) ret0, _ := ret[0].(*mysql.ListEvaluatorResponse) ret1, _ := ret[1].(error) return ret0, ret1 } -// ListEvaluator indicates an expected call of ListEvaluator. -func (mr *MockEvaluatorDAOMockRecorder) ListEvaluator(ctx, req any, opts ...any) *gomock.Call { +// ListBuiltinEvaluator indicates an expected call of ListBuiltinEvaluator. +func (mr *MockEvaluatorDAOMockRecorder) ListBuiltinEvaluator(ctx, req any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]any{ctx, req}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluator", reflect.TypeOf((*MockEvaluatorDAO)(nil).ListEvaluator), varargs...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBuiltinEvaluator", reflect.TypeOf((*MockEvaluatorDAO)(nil).ListBuiltinEvaluator), varargs...) } -// ListBuiltinEvaluator mocks base method. -func (m *MockEvaluatorDAO) ListBuiltinEvaluator(ctx context.Context, req *mysql.ListBuiltinEvaluatorRequest, opts ...db.Option) (*mysql.ListEvaluatorResponse, error) { +// ListEvaluator mocks base method. +func (m *MockEvaluatorDAO) ListEvaluator(ctx context.Context, req *mysql.ListEvaluatorRequest, opts ...db.Option) (*mysql.ListEvaluatorResponse, error) { m.ctrl.T.Helper() varargs := []any{ctx, req} for _, a := range opts { varargs = append(varargs, a) } - ret := m.ctrl.Call(m, "ListBuiltinEvaluator", varargs...) + ret := m.ctrl.Call(m, "ListEvaluator", varargs...) ret0, _ := ret[0].(*mysql.ListEvaluatorResponse) ret1, _ := ret[1].(error) return ret0, ret1 } -// ListBuiltinEvaluator indicates an expected call of ListBuiltinEvaluator. -func (mr *MockEvaluatorDAOMockRecorder) ListBuiltinEvaluator(ctx, req any, opts ...any) *gomock.Call { +// ListEvaluator indicates an expected call of ListEvaluator. +func (mr *MockEvaluatorDAOMockRecorder) ListEvaluator(ctx, req any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]any{ctx, req}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBuiltinEvaluator", reflect.TypeOf((*MockEvaluatorDAO)(nil).ListBuiltinEvaluator), varargs...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListEvaluator", reflect.TypeOf((*MockEvaluatorDAO)(nil).ListEvaluator), varargs...) } // UpdateEvaluatorDraftSubmitted mocks base method. diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_template_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_template_mock.go index fa32a2506..834c1b626 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_template_mock.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_template_mock.go @@ -102,6 +102,25 @@ func (mr *MockEvaluatorTemplateDAOMockRecorder) GetEvaluatorTemplate(ctx, id, in return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorTemplate", reflect.TypeOf((*MockEvaluatorTemplateDAO)(nil).GetEvaluatorTemplate), varargs...) } +// IncrPopularityByID mocks base method. +func (m *MockEvaluatorTemplateDAO) IncrPopularityByID(ctx context.Context, id int64, opts ...db.Option) error { + m.ctrl.T.Helper() + varargs := []any{ctx, id} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "IncrPopularityByID", varargs...) + ret0, _ := ret[0].(error) + return ret0 +} + +// IncrPopularityByID indicates an expected call of IncrPopularityByID. +func (mr *MockEvaluatorTemplateDAOMockRecorder) IncrPopularityByID(ctx, id any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, id}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IncrPopularityByID", reflect.TypeOf((*MockEvaluatorTemplateDAO)(nil).IncrPopularityByID), varargs...) +} + // ListEvaluatorTemplate mocks base method. func (m *MockEvaluatorTemplateDAO) ListEvaluatorTemplate(ctx context.Context, req *mysql.ListEvaluatorTemplateRequest, opts ...db.Option) (*mysql.ListEvaluatorTemplateResponse, error) { m.ctrl.T.Helper() diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_version_mock.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_version_mock.go index a0d7965eb..0fcd20f81 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_version_mock.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks/evaluator_version_mock.go @@ -102,6 +102,26 @@ func (mr *MockEvaluatorVersionDAOMockRecorder) BatchGetEvaluatorVersionByID(ctx, return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorVersionByID", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).BatchGetEvaluatorVersionByID), varargs...) } +// BatchGetEvaluatorVersionsByEvaluatorIDAndVersions mocks base method. +func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx context.Context, pairs [][2]any, opts ...db.Option) ([]*model.EvaluatorVersion, error) { + m.ctrl.T.Helper() + varargs := []any{ctx, pairs} + for _, a := range opts { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "BatchGetEvaluatorVersionsByEvaluatorIDAndVersions", varargs...) + ret0, _ := ret[0].([]*model.EvaluatorVersion) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// BatchGetEvaluatorVersionsByEvaluatorIDAndVersions indicates an expected call of BatchGetEvaluatorVersionsByEvaluatorIDAndVersions. +func (mr *MockEvaluatorVersionDAOMockRecorder) BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs any, opts ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]any{ctx, pairs}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorVersionsByEvaluatorIDAndVersions", reflect.TypeOf((*MockEvaluatorVersionDAO)(nil).BatchGetEvaluatorVersionsByEvaluatorIDAndVersions), varargs...) +} + // BatchGetEvaluatorVersionsByEvaluatorIDs mocks base method. func (m *MockEvaluatorVersionDAO) BatchGetEvaluatorVersionsByEvaluatorIDs(ctx context.Context, evaluatorIDs []int64, includeDeleted bool, opts ...db.Option) ([]*model.EvaluatorVersion, error) { m.ctrl.T.Helper() diff --git a/backend/modules/evaluation/pkg/conf/evaluator_template_space_test.go b/backend/modules/evaluation/pkg/conf/evaluator_template_space_test.go deleted file mode 100644 index 3826f2df1..000000000 --- a/backend/modules/evaluation/pkg/conf/evaluator_template_space_test.go +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) 2025 coze-dev Authors -// SPDX-License-Identifier: Apache-2.0 - -package conf - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "go.uber.org/mock/gomock" - - "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/conf/mocks" -) - -func TestGetEvaluatorTemplateSpaceConf(t *testing.T) { - tests := []struct { - name string - configData map[string]interface{} - expectedResult []string - }{ - { - name: "valid config with space IDs", - configData: map[string]interface{}{ - "evaluator_template_space": map[string]interface{}{ - "evaluator_template_space": []string{"7565071389755228204", "1234567890123456789"}, - }, - }, - expectedResult: []string{"7565071389755228204", "1234567890123456789"}, - }, - { - name: "empty config", - configData: map[string]interface{}{ - "evaluator_template_space": map[string]interface{}{ - "evaluator_template_space": []string{}, - }, - }, - expectedResult: []string{}, - }, - { - name: "missing config", - configData: map[string]interface{}{}, - expectedResult: []string{}, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // 创建mock configer - ctrl := gomock.NewController(t) - defer ctrl.Finish() - mockConfiger := mocks.NewMockIConfiger(ctrl) - - // 设置mock期望 - mockConfiger.EXPECT().GetEvaluatorTemplateSpaceConf(gomock.Any()).Return(tt.expectedResult) - - // 调用方法 - result := mockConfiger.GetEvaluatorTemplateSpaceConf(context.Background()) - - // 验证结果 - assert.Equal(t, tt.expectedResult, result) - }) - } -} - -func TestDefaultEvaluatorTemplateSpaceConf(t *testing.T) { - result := DefaultEvaluatorTemplateSpaceConf() - assert.NotNil(t, result) - assert.Equal(t, 0, len(result)) -} diff --git a/backend/modules/evaluation/pkg/conf/evaluator_test.go b/backend/modules/evaluation/pkg/conf/evaluator_test.go index f0fc74109..7f9e5f822 100644 --- a/backend/modules/evaluation/pkg/conf/evaluator_test.go +++ b/backend/modules/evaluation/pkg/conf/evaluator_test.go @@ -14,6 +14,7 @@ import ( "github.com/bytedance/gg/gptr" evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/conf/mocks" "github.com/coze-dev/coze-loop/backend/pkg/conf" mock_conf "github.com/coze-dev/coze-loop/backend/pkg/conf/mocks" "github.com/coze-dev/coze-loop/backend/pkg/contexts" @@ -468,3 +469,59 @@ func TestConfiger_GetCustomCodeEvaluatorTemplateConf(t *testing.T) { }) } } + +func TestGetEvaluatorTemplateSpaceConf(t *testing.T) { + tests := []struct { + name string + configData map[string]interface{} + expectedResult []string + }{ + { + name: "valid config with space IDs", + configData: map[string]interface{}{ + "evaluator_template_space": map[string]interface{}{ + "evaluator_template_space": []string{"7565071389755228204", "1234567890123456789"}, + }, + }, + expectedResult: []string{"7565071389755228204", "1234567890123456789"}, + }, + { + name: "empty config", + configData: map[string]interface{}{ + "evaluator_template_space": map[string]interface{}{ + "evaluator_template_space": []string{}, + }, + }, + expectedResult: []string{}, + }, + { + name: "missing config", + configData: map[string]interface{}{}, + expectedResult: []string{}, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + // 创建mock configer + ctrl := gomock.NewController(t) + defer ctrl.Finish() + mockConfiger := mocks.NewMockIConfiger(ctrl) + + // 设置mock期望 + mockConfiger.EXPECT().GetEvaluatorTemplateSpaceConf(gomock.Any()).Return(tt.expectedResult) + + // 调用方法 + result := mockConfiger.GetEvaluatorTemplateSpaceConf(context.Background()) + + // 验证结果 + assert.Equal(t, tt.expectedResult, result) + }) + } +} + +func TestDefaultEvaluatorTemplateSpaceConf(t *testing.T) { + result := DefaultEvaluatorTemplateSpaceConf() + assert.NotNil(t, result) + assert.Equal(t, 0, len(result)) +} diff --git a/backend/modules/evaluation/pkg/conf/mocks/evaluator_configer.go b/backend/modules/evaluation/pkg/conf/mocks/evaluator_configer.go index e13f3ea79..080c3796a 100644 --- a/backend/modules/evaluation/pkg/conf/mocks/evaluator_configer.go +++ b/backend/modules/evaluation/pkg/conf/mocks/evaluator_configer.go @@ -42,6 +42,20 @@ func (m *MockIConfiger) EXPECT() *MockIConfigerMockRecorder { return m.recorder } +// GetBuiltinEvaluatorSpaceConf mocks base method. +func (m *MockIConfiger) GetBuiltinEvaluatorSpaceConf(ctx context.Context) []string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetBuiltinEvaluatorSpaceConf", ctx) + ret0, _ := ret[0].([]string) + return ret0 +} + +// GetBuiltinEvaluatorSpaceConf indicates an expected call of GetBuiltinEvaluatorSpaceConf. +func (mr *MockIConfigerMockRecorder) GetBuiltinEvaluatorSpaceConf(ctx any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBuiltinEvaluatorSpaceConf", reflect.TypeOf((*MockIConfiger)(nil).GetBuiltinEvaluatorSpaceConf), ctx) +} + // GetCodeEvaluatorTemplateConf mocks base method. func (m *MockIConfiger) GetCodeEvaluatorTemplateConf(ctx context.Context) map[string]map[string]*evaluator.EvaluatorContent { m.ctrl.T.Helper() @@ -98,6 +112,20 @@ func (mr *MockIConfigerMockRecorder) GetEvaluatorPromptSuffixMapping(ctx any) *g return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorPromptSuffixMapping", reflect.TypeOf((*MockIConfiger)(nil).GetEvaluatorPromptSuffixMapping), ctx) } +// GetEvaluatorTagConf mocks base method. +func (m *MockIConfiger) GetEvaluatorTagConf(ctx context.Context) map[evaluator.EvaluatorTagKey][]string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetEvaluatorTagConf", ctx) + ret0, _ := ret[0].(map[evaluator.EvaluatorTagKey][]string) + return ret0 +} + +// GetEvaluatorTagConf indicates an expected call of GetEvaluatorTagConf. +func (mr *MockIConfigerMockRecorder) GetEvaluatorTagConf(ctx any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEvaluatorTagConf", reflect.TypeOf((*MockIConfiger)(nil).GetEvaluatorTagConf), ctx) +} + // GetEvaluatorTemplateConf mocks base method. func (m *MockIConfiger) GetEvaluatorTemplateConf(ctx context.Context) map[string]map[string]*evaluator.EvaluatorContent { m.ctrl.T.Helper() diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift index bf6ba993f..0b3bc0ba8 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift @@ -94,6 +94,7 @@ struct UpdateEvaluatorRequest { 12: optional string benchmark (api.body='benchmark', go.tag = 'json:"benchmark"') 13: optional string vendor (api.body='vendor', go.tag = 'json:"vendor"') 14: optional string builtin_visible_version (api.body='builtin_visible_version', go.tag = 'json:"builtin_visible_version"') + 15: optional evaluator.EvaluatorBoxType box_type (api.body='box_type', go.tag = 'json:"box_type"') 255: optional base.Base Base } @@ -392,23 +393,10 @@ struct GetTemplateInfoV2Response { 255: base.BaseResp BaseResp } -struct GetLatestEvaluatorVersionRequest { - 1: required i64 evaluator_id (api.path='evaluator_id', api.js_conv='true', go.tag='json:"evaluator_id"') - 2: optional i64 workspace_id (api.query='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') - 3: optional bool builtin (api.query='builtin') // 是否预置评估器 - - 255: optional base.Base Base -} - -struct GetLatestEvaluatorVersionResponse { - 1: required evaluator.EvaluatorVersion version (api.body='version') - - 255: base.BaseResp BaseResp -} - struct DebugBuiltinEvaluatorRequest { 1: required i64 evaluator_id (api.body='evaluator_id', api.js_conv='true', go.tag='json:"evaluator_id"') 2: required evaluator.EvaluatorInputData input_data (api.body='input_data') + 3: required i64 workspace_id (api.body='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') // 空间 id 255: optional base.Base Base } @@ -466,7 +454,6 @@ struct DeleteEvaluatorTemplateResponse { } struct ListEvaluatorTagsRequest { - 255: optional base.Base Base } diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index 0043bcab9..ee04b76b2 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -45,9 +45,12 @@ const EvaluatorTagKey EvaluatorTagKey_Category = "Category" // 类型 const EvaluatorTagKey EvaluatorTagKey_TargetType = "TargetType" // 评估对象 (文本/图片/视频等) const EvaluatorTagKey EvaluatorTagKey_Objective = "Objective" // 评估目标 (任务完成/内容质量等) const EvaluatorTagKey EvaluatorTagKey_BusinessScenario = "BusinessScenario" // 业务场景 (安全风控/AI Coding等) -const EvaluatorTagKey EvaluatorTagKey_BoxType = "BoxType" // 黑白盒类型 const EvaluatorTagKey EvaluatorTagKey_Name = "Name" // 评估器名称 +typedef string EvaluatorBoxType(ts.enum="true") +const EvaluatorBoxType EvaluatorBoxType_White = "White" // 白盒 +const EvaluatorBoxType EvaluatorBoxType_Black = "Black" // 黑盒 + typedef string AccessProtocol const AccessProtocol AccessProtocol_RPC = "rpc" @@ -121,6 +124,7 @@ struct Evaluator { 21: optional string benchmark (go.tag = 'json:"benchmark"') 22: optional string vendor (go.tag = 'json:"vendor"') 23: optional string builtin_visible_version (go.tag = 'json:"builtin_visible_version"') + 24: optional EvaluatorBoxType box_type (go.tag = 'json:"box_type"') // 默认白盒 100: optional map>> tags (go.tag = 'json:"tags"') } diff --git a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql index b2b59da7b..11c85e181 100644 --- a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql +++ b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql @@ -15,6 +15,7 @@ CREATE TABLE IF NOT EXISTS `evaluator` `benchmark` varchar(255) DEFAULT NULL COMMENT 'benchmark', `vendor` varchar(255) DEFAULT NULL COMMENT 'vendor', `builtin` int unsigned NOT NULL DEFAULT '2' COMMENT '是否预置，1:是；2:否', + `box_type` int unsigned NOT NULL DEFAULT '1' COMMENT '黑白盒类型，1:白盒；2:黑盒', `builtin_visible_version` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '预置评估器最新可见版本号', PRIMARY KEY (`id`), KEY `idx_space_id_evaluator_type` (`space_id`, `evaluator_type`), From 44b0eab30902beef4342b652644b6a1ecf9068e7 Mon Sep 17 00:00:00 2001 From: tpfz Date: Sat, 1 Nov 2025 17:54:50 +0800 Subject: [PATCH 09/42] add ut --- .../application/evaluator_app_test.go | 1182 +++++++++++++++++ 1 file changed, 1182 insertions(+) diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index 99627bf30..8418eec67 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -23,6 +23,7 @@ import ( "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" evaluatorservice "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" + evaluatorapi "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" "github.com/coze-dev/coze-loop/backend/modules/evaluation/application/convertor/evaluator" "github.com/coze-dev/coze-loop/backend/modules/evaluation/consts" metricsmock "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/component/metrics/mocks" @@ -2297,3 +2298,1184 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { }) } } + +// TestEvaluatorHandlerImpl_ListTemplatesV2 测试 ListTemplatesV2 方法 +func TestEvaluatorHandlerImpl_ListTemplatesV2(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockTemplateService := mocks.NewMockEvaluatorTemplateService(ctrl) + + app := &EvaluatorHandlerImpl{ + evaluatorTemplateService: mockTemplateService, + } + + tests := []struct { + name string + req *evaluatorservice.ListTemplatesV2Request + mockSetup func() + wantResp *evaluatorservice.ListTemplatesV2Response + wantErr bool + wantErrCode int32 + }{ + { + name: "success - normal request", + req: &evaluatorservice.ListTemplatesV2Request{ + PageSize: gptr.Of(int32(20)), + PageNumber: gptr.Of(int32(1)), + }, + mockSetup: func() { + mockTemplateService.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(&entity.ListEvaluatorTemplateResponse{ + Templates: []*entity.EvaluatorTemplate{ + { + ID: 1, + Name: "template1", + Description: "test template 1", + }, + { + ID: 2, + Name: "template2", + Description: "test template 2", + }, + }, + TotalCount: 2, + }, nil) + }, + wantResp: &evaluatorservice.ListTemplatesV2Response{ + Total: gptr.Of(int64(2)), + }, + wantErr: false, + }, + { + name: "success - with pagination", + req: &evaluatorservice.ListTemplatesV2Request{ + PageSize: gptr.Of(int32(10)), + PageNumber: gptr.Of(int32(2)), + }, + mockSetup: func() { + mockTemplateService.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(&entity.ListEvaluatorTemplateResponse{ + Templates: []*entity.EvaluatorTemplate{}, + TotalCount: 25, + }, nil) + }, + wantResp: &evaluatorservice.ListTemplatesV2Response{ + Total: gptr.Of(int64(25)), + }, + wantErr: false, + }, + { + name: "success - with filter option", + req: &evaluatorservice.ListTemplatesV2Request{ + PageSize: gptr.Of(int32(20)), + PageNumber: gptr.Of(int32(1)), + FilterOption: &evaluatordto.EvaluatorFilterOption{}, + }, + mockSetup: func() { + mockTemplateService.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(&entity.ListEvaluatorTemplateResponse{ + Templates: []*entity.EvaluatorTemplate{}, + TotalCount: 0, + }, nil) + }, + wantResp: &evaluatorservice.ListTemplatesV2Response{ + Total: gptr.Of(int64(0)), + }, + wantErr: false, + }, + { + name: "error - service failure", + req: &evaluatorservice.ListTemplatesV2Request{ + PageSize: gptr.Of(int32(20)), + PageNumber: gptr.Of(int32(1)), + }, + mockSetup: func() { + mockTemplateService.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(nil, errorx.NewByCode(errno.CommonInternalErrorCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonInternalErrorCode, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + resp, err := app.ListTemplatesV2(context.Background(), tt.req) + + if tt.wantErr { + assert.Error(t, err) + if tt.wantErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.wantErrCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + assert.NotNil(t, resp) + if tt.wantResp.Total != nil { + assert.Equal(t, *tt.wantResp.Total, *resp.Total) + } + } + }) + } +} + +// TestEvaluatorHandlerImpl_GetTemplateInfoV2 测试 GetTemplateInfoV2 方法 +func TestEvaluatorHandlerImpl_GetTemplateInfoV2(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockTemplateService := mocks.NewMockEvaluatorTemplateService(ctrl) + + app := &EvaluatorHandlerImpl{ + evaluatorTemplateService: mockTemplateService, + } + + templateID := int64(123) + template := &entity.EvaluatorTemplate{ + ID: templateID, + Name: "test template", + Description: "test description", + } + + tests := []struct { + name string + req *evaluatorservice.GetTemplateInfoV2Request + mockSetup func() + wantResp *evaluatorservice.GetTemplateInfoV2Response + wantErr bool + wantErrCode int32 + }{ + { + name: "success - normal request", + req: &evaluatorservice.GetTemplateInfoV2Request{ + EvaluatorTemplateID: templateID, + }, + mockSetup: func() { + mockTemplateService.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), &entity.GetEvaluatorTemplateRequest{ + ID: templateID, + IncludeDeleted: false, + }). + Return(&entity.GetEvaluatorTemplateResponse{ + Template: template, + }, nil) + }, + wantResp: &evaluatorservice.GetTemplateInfoV2Response{ + EvaluatorTemplate: evaluator.ConvertEvaluatorTemplateDO2DTO(template), + }, + wantErr: false, + }, + { + name: "success - template not found", + req: &evaluatorservice.GetTemplateInfoV2Request{ + EvaluatorTemplateID: templateID, + }, + mockSetup: func() { + mockTemplateService.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(&entity.GetEvaluatorTemplateResponse{ + Template: nil, + }, nil) + }, + wantResp: &evaluatorservice.GetTemplateInfoV2Response{}, + wantErr: false, + }, + { + name: "error - service failure", + req: &evaluatorservice.GetTemplateInfoV2Request{ + EvaluatorTemplateID: templateID, + }, + mockSetup: func() { + mockTemplateService.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(nil, errorx.NewByCode(errno.CommonInternalErrorCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonInternalErrorCode, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + resp, err := app.GetTemplateInfoV2(context.Background(), tt.req) + + if tt.wantErr { + assert.Error(t, err) + if tt.wantErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.wantErrCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + assert.NotNil(t, resp) + if tt.wantResp.EvaluatorTemplate != nil { + assert.Equal(t, templateID, resp.GetEvaluatorTemplate().GetID()) + } + } + }) + } +} + +// TestEvaluatorHandlerImpl_CreateEvaluatorTemplate 测试 CreateEvaluatorTemplate 方法 +func TestEvaluatorHandlerImpl_CreateEvaluatorTemplate(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockTemplateService := mocks.NewMockEvaluatorTemplateService(ctrl) + mockConfiger := confmocks.NewMockIConfiger(ctrl) + mockAuth := rpcmocks.NewMockIAuthProvider(ctrl) + + app := &EvaluatorHandlerImpl{ + evaluatorTemplateService: mockTemplateService, + configer: mockConfiger, + auth: mockAuth, + } + + workspaceID := int64(123) + templateDTO := &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(workspaceID), + Name: gptr.Of("test template"), + Description: gptr.Of("test description"), + } + + tests := []struct { + name string + req *evaluatorapi.CreateEvaluatorTemplateRequest + mockSetup func() + wantResp *evaluatorapi.CreateEvaluatorTemplateResponse + wantErr bool + wantErrCode int32 + }{ + { + name: "success - normal request", + req: &evaluatorapi.CreateEvaluatorTemplateRequest{ + EvaluatorTemplate: templateDTO, + }, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTemplateSpaceConf(gomock.Any()). + Return([]string{"123"}) + + mockTemplateService.EXPECT(). + CreateEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(&entity.CreateEvaluatorTemplateResponse{ + Template: evaluator.ConvertEvaluatorTemplateDTO2DO(templateDTO), + }, nil) + }, + wantResp: &evaluatorapi.CreateEvaluatorTemplateResponse{ + EvaluatorTemplate: templateDTO, + }, + wantErr: false, + }, + { + name: "error - nil template", + req: &evaluatorapi.CreateEvaluatorTemplateRequest{ + EvaluatorTemplate: nil, + }, + mockSetup: func() {}, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonInvalidParamCode, + }, + { + name: "error - auth failed", + req: &evaluatorapi.CreateEvaluatorTemplateRequest{ + EvaluatorTemplate: &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(int64(789)), // 不在允许列表中 + Name: gptr.Of("test template"), + Description: gptr.Of("test description"), + }, + }, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTemplateSpaceConf(gomock.Any()). + Return([]string{"123"}) + + mockAuth.EXPECT(). + Authorization(gomock.Any(), gomock.Any()). + Return(errorx.NewByCode(errno.CommonNoPermissionCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonNoPermissionCode, + }, + { + name: "error - service failure", + req: &evaluatorapi.CreateEvaluatorTemplateRequest{ + EvaluatorTemplate: templateDTO, + }, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTemplateSpaceConf(gomock.Any()). + Return([]string{"123"}) + + mockTemplateService.EXPECT(). + CreateEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(nil, errorx.NewByCode(errno.CommonInternalErrorCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonInternalErrorCode, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + resp, err := app.CreateEvaluatorTemplate(context.Background(), tt.req) + + if tt.wantErr { + assert.Error(t, err) + if tt.wantErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.wantErrCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + assert.NotNil(t, resp) + assert.NotNil(t, resp.EvaluatorTemplate) + } + }) + } +} + +// TestEvaluatorHandlerImpl_UpdateEvaluatorTemplate 测试 UpdateEvaluatorTemplate 方法 +func TestEvaluatorHandlerImpl_UpdateEvaluatorTemplate(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockTemplateService := mocks.NewMockEvaluatorTemplateService(ctrl) + mockConfiger := confmocks.NewMockIConfiger(ctrl) + mockAuth := rpcmocks.NewMockIAuthProvider(ctrl) + + app := &EvaluatorHandlerImpl{ + evaluatorTemplateService: mockTemplateService, + configer: mockConfiger, + auth: mockAuth, + } + + templateID := int64(123) + workspaceID := int64(456) + templateDTO := &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(templateID), + WorkspaceID: gptr.Of(workspaceID), + Name: gptr.Of("updated template"), + Description: gptr.Of("updated description"), + } + + tests := []struct { + name string + req *evaluatorapi.UpdateEvaluatorTemplateRequest + mockSetup func() + wantResp *evaluatorapi.UpdateEvaluatorTemplateResponse + wantErr bool + wantErrCode int32 + }{ + { + name: "success - normal request", + req: &evaluatorapi.UpdateEvaluatorTemplateRequest{ + EvaluatorTemplateID: templateID, + EvaluatorTemplate: templateDTO, + }, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTemplateSpaceConf(gomock.Any()). + Return([]string{"456"}) + + mockTemplateService.EXPECT(). + UpdateEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(&entity.UpdateEvaluatorTemplateResponse{ + Template: evaluator.ConvertEvaluatorTemplateDTO2DO(templateDTO), + }, nil) + }, + wantResp: &evaluatorapi.UpdateEvaluatorTemplateResponse{ + EvaluatorTemplate: templateDTO, + }, + wantErr: false, + }, + { + name: "error - nil template", + req: &evaluatorapi.UpdateEvaluatorTemplateRequest{ + EvaluatorTemplateID: templateID, + EvaluatorTemplate: nil, + }, + mockSetup: func() {}, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonInvalidParamCode, + }, + { + name: "error - auth failed", + req: &evaluatorapi.UpdateEvaluatorTemplateRequest{ + EvaluatorTemplateID: templateID, + EvaluatorTemplate: &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(templateID), + WorkspaceID: gptr.Of(int64(789)), // 不在允许列表中 + Name: gptr.Of("updated template"), + Description: gptr.Of("updated description"), + }, + }, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTemplateSpaceConf(gomock.Any()). + Return([]string{"456"}) + + mockAuth.EXPECT(). + Authorization(gomock.Any(), gomock.Any()). + Return(errorx.NewByCode(errno.CommonNoPermissionCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonNoPermissionCode, + }, + { + name: "error - service failure", + req: &evaluatorapi.UpdateEvaluatorTemplateRequest{ + EvaluatorTemplateID: templateID, + EvaluatorTemplate: templateDTO, + }, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTemplateSpaceConf(gomock.Any()). + Return([]string{"456"}) + + mockTemplateService.EXPECT(). + UpdateEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(nil, errorx.NewByCode(errno.CommonInternalErrorCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonInternalErrorCode, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + resp, err := app.UpdateEvaluatorTemplate(context.Background(), tt.req) + + if tt.wantErr { + assert.Error(t, err) + if tt.wantErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.wantErrCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + assert.NotNil(t, resp) + assert.NotNil(t, resp.EvaluatorTemplate) + } + }) + } +} + +// TestEvaluatorHandlerImpl_DeleteEvaluatorTemplate 测试 DeleteEvaluatorTemplate 方法 +func TestEvaluatorHandlerImpl_DeleteEvaluatorTemplate(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockTemplateService := mocks.NewMockEvaluatorTemplateService(ctrl) + mockConfiger := confmocks.NewMockIConfiger(ctrl) + mockAuth := rpcmocks.NewMockIAuthProvider(ctrl) + + app := &EvaluatorHandlerImpl{ + evaluatorTemplateService: mockTemplateService, + configer: mockConfiger, + auth: mockAuth, + } + + templateID := int64(123) + workspaceID := int64(456) + template := &entity.EvaluatorTemplate{ + ID: templateID, + SpaceID: workspaceID, + Name: "test template", + } + + tests := []struct { + name string + req *evaluatorapi.DeleteEvaluatorTemplateRequest + mockSetup func() + wantResp *evaluatorapi.DeleteEvaluatorTemplateResponse + wantErr bool + wantErrCode int32 + }{ + { + name: "success - normal request", + req: &evaluatorapi.DeleteEvaluatorTemplateRequest{ + EvaluatorTemplateID: templateID, + }, + mockSetup: func() { + mockTemplateService.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), &entity.GetEvaluatorTemplateRequest{ + ID: templateID, + IncludeDeleted: false, + }). + Return(&entity.GetEvaluatorTemplateResponse{ + Template: template, + }, nil) + + mockConfiger.EXPECT(). + GetEvaluatorTemplateSpaceConf(gomock.Any()). + Return([]string{"456"}) + + mockTemplateService.EXPECT(). + DeleteEvaluatorTemplate(gomock.Any(), &entity.DeleteEvaluatorTemplateRequest{ + ID: templateID, + }). + Return(&entity.DeleteEvaluatorTemplateResponse{}, nil) + }, + wantResp: &evaluatorapi.DeleteEvaluatorTemplateResponse{}, + wantErr: false, + }, + { + name: "error - template id is 0", + req: &evaluatorapi.DeleteEvaluatorTemplateRequest{ + EvaluatorTemplateID: 0, + }, + mockSetup: func() {}, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonInvalidParamCode, + }, + { + name: "error - template not found", + req: &evaluatorapi.DeleteEvaluatorTemplateRequest{ + EvaluatorTemplateID: templateID, + }, + mockSetup: func() { + mockTemplateService.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(&entity.GetEvaluatorTemplateResponse{ + Template: nil, + }, nil) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.ResourceNotFoundCode, + }, + { + name: "error - auth failed", + req: &evaluatorapi.DeleteEvaluatorTemplateRequest{ + EvaluatorTemplateID: templateID, + }, + mockSetup: func() { + // 使用不在允许列表中的workspaceID的template + testTemplate := &entity.EvaluatorTemplate{ + ID: templateID, + SpaceID: 789, // 不在允许列表中 + Name: "test template", + } + mockTemplateService.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(&entity.GetEvaluatorTemplateResponse{ + Template: testTemplate, + }, nil) + + mockConfiger.EXPECT(). + GetEvaluatorTemplateSpaceConf(gomock.Any()). + Return([]string{"456"}) + + mockAuth.EXPECT(). + Authorization(gomock.Any(), gomock.Any()). + Return(errorx.NewByCode(errno.CommonNoPermissionCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonNoPermissionCode, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + resp, err := app.DeleteEvaluatorTemplate(context.Background(), tt.req) + + if tt.wantErr { + assert.Error(t, err) + if tt.wantErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.wantErrCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + assert.NotNil(t, resp) + } + }) + } +} + +// TestEvaluatorHandlerImpl_DebugBuiltinEvaluator 测试 DebugBuiltinEvaluator 方法 +func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockEvaluatorService := mocks.NewMockEvaluatorService(ctrl) + mockAuth := rpcmocks.NewMockIAuthProvider(ctrl) + + app := &EvaluatorHandlerImpl{ + evaluatorService: mockEvaluatorService, + auth: mockAuth, + } + + evaluatorID := int64(123) + workspaceID := int64(456) + builtinEvaluator := &entity.Evaluator{ + ID: evaluatorID, + SpaceID: workspaceID, + Name: "builtin evaluator", + Builtin: true, + } + + inputData := &evaluatordto.EvaluatorInputData{ + InputFields: map[string]*common.Content{ + "input": { + ContentType: gptr.Of(common.ContentTypeText), + Text: gptr.Of("test input"), + }, + }, + } + + outputData := &entity.EvaluatorOutputData{ + EvaluatorResult: &entity.EvaluatorResult{ + Score: gptr.Of(0.85), + Reasoning: "test result", + }, + } + + tests := []struct { + name string + req *evaluatorapi.DebugBuiltinEvaluatorRequest + mockSetup func() + wantResp *evaluatorapi.DebugBuiltinEvaluatorResponse + wantErr bool + wantErrCode int32 + }{ + { + name: "success - normal request", + req: &evaluatorapi.DebugBuiltinEvaluatorRequest{ + EvaluatorID: evaluatorID, + WorkspaceID: workspaceID, + InputData: inputData, + }, + mockSetup: func() { + mockAuth.EXPECT(). + Authorization(gomock.Any(), &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(workspaceID, 10), + SpaceID: workspaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, + }). + Return(nil) + + mockEvaluatorService.EXPECT(). + GetBuiltinEvaluator(gomock.Any(), evaluatorID). + Return(builtinEvaluator, nil) + + mockEvaluatorService.EXPECT(). + DebugEvaluator(gomock.Any(), builtinEvaluator, gomock.Any()). + Return(outputData, nil) + }, + wantResp: &evaluatorapi.DebugBuiltinEvaluatorResponse{ + OutputData: evaluator.ConvertEvaluatorOutputDataDO2DTO(outputData), + }, + wantErr: false, + }, + { + name: "error - auth failed", + req: &evaluatorapi.DebugBuiltinEvaluatorRequest{ + EvaluatorID: evaluatorID, + WorkspaceID: workspaceID, + InputData: inputData, + }, + mockSetup: func() { + mockAuth.EXPECT(). + Authorization(gomock.Any(), gomock.Any()). + Return(errorx.NewByCode(errno.CommonNoPermissionCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonNoPermissionCode, + }, + { + name: "error - evaluator not found", + req: &evaluatorapi.DebugBuiltinEvaluatorRequest{ + EvaluatorID: evaluatorID, + WorkspaceID: workspaceID, + InputData: inputData, + }, + mockSetup: func() { + mockAuth.EXPECT(). + Authorization(gomock.Any(), gomock.Any()). + Return(nil) + + mockEvaluatorService.EXPECT(). + GetBuiltinEvaluator(gomock.Any(), evaluatorID). + Return(nil, nil) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.EvaluatorNotExistCode, + }, + { + name: "error - debug failure", + req: &evaluatorapi.DebugBuiltinEvaluatorRequest{ + EvaluatorID: evaluatorID, + WorkspaceID: workspaceID, + InputData: inputData, + }, + mockSetup: func() { + mockAuth.EXPECT(). + Authorization(gomock.Any(), gomock.Any()). + Return(nil) + + mockEvaluatorService.EXPECT(). + GetBuiltinEvaluator(gomock.Any(), evaluatorID). + Return(builtinEvaluator, nil) + + mockEvaluatorService.EXPECT(). + DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil, errorx.NewByCode(errno.CommonInternalErrorCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonInternalErrorCode, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + resp, err := app.DebugBuiltinEvaluator(context.Background(), tt.req) + + if tt.wantErr { + assert.Error(t, err) + if tt.wantErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.wantErrCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + assert.NotNil(t, resp) + assert.NotNil(t, resp.OutputData) + } + }) + } +} + +// TestEvaluatorHandlerImpl_UpdateBuiltinEvaluatorTags 测试 UpdateBuiltinEvaluatorTags 方法 +func TestEvaluatorHandlerImpl_UpdateBuiltinEvaluatorTags(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockEvaluatorService := mocks.NewMockEvaluatorService(ctrl) + mockConfiger := confmocks.NewMockIConfiger(ctrl) + mockAuth := rpcmocks.NewMockIAuthProvider(ctrl) + + app := &EvaluatorHandlerImpl{ + evaluatorService: mockEvaluatorService, + configer: mockConfiger, + auth: mockAuth, + } + + evaluatorID := int64(123) + workspaceID := int64(456) + evaluatorDO := &entity.Evaluator{ + ID: evaluatorID, + SpaceID: workspaceID, + Name: "builtin evaluator", + Builtin: true, + } + + tags := map[string]map[string][]string{ + evaluatordto.EvaluatorTagLangTypeZh: { + evaluatordto.EvaluatorTagKeyCategory: {"category1", "category2"}, + }, + } + + tests := []struct { + name string + req *evaluatorservice.UpdateBuiltinEvaluatorTagsRequest + mockSetup func() + wantResp *evaluatorservice.UpdateBuiltinEvaluatorTagsResponse + wantErr bool + wantErrCode int32 + }{ + { + name: "success - normal request", + req: &evaluatorservice.UpdateBuiltinEvaluatorTagsRequest{ + EvaluatorID: evaluatorID, + WorkspaceID: gptr.Of(workspaceID), + Tags: tags, + }, + mockSetup: func() { + mockEvaluatorService.EXPECT(). + GetEvaluator(gomock.Any(), workspaceID, evaluatorID, false). + Return(evaluatorDO, nil) + + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{"456"}) + + mockEvaluatorService.EXPECT(). + UpdateBuiltinEvaluatorTags(gomock.Any(), evaluatorID, gomock.Any()). + Return(nil) + }, + wantResp: &evaluatorservice.UpdateBuiltinEvaluatorTagsResponse{ + Evaluator: evaluator.ConvertEvaluatorDO2DTO(evaluatorDO), + }, + wantErr: false, + }, + { + name: "error - evaluator not found", + req: &evaluatorservice.UpdateBuiltinEvaluatorTagsRequest{ + EvaluatorID: evaluatorID, + WorkspaceID: gptr.Of(workspaceID), + Tags: tags, + }, + mockSetup: func() { + mockEvaluatorService.EXPECT(). + GetEvaluator(gomock.Any(), workspaceID, evaluatorID, false). + Return(nil, nil) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.EvaluatorNotExistCode, + }, + { + name: "error - auth failed", + req: &evaluatorservice.UpdateBuiltinEvaluatorTagsRequest{ + EvaluatorID: evaluatorID, + WorkspaceID: gptr.Of(int64(789)), // 不在允许列表中 + Tags: tags, + }, + mockSetup: func() { + testEvaluatorDO := &entity.Evaluator{ + ID: evaluatorID, + SpaceID: 789, // 不在允许列表中 + Name: "builtin evaluator", + Builtin: true, + } + mockEvaluatorService.EXPECT(). + GetEvaluator(gomock.Any(), int64(789), evaluatorID, false). + Return(testEvaluatorDO, nil) + + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{"456"}) + + mockAuth.EXPECT(). + Authorization(gomock.Any(), gomock.Any()). + Return(errorx.NewByCode(errno.CommonNoPermissionCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonNoPermissionCode, + }, + { + name: "error - service failure", + req: &evaluatorservice.UpdateBuiltinEvaluatorTagsRequest{ + EvaluatorID: evaluatorID, + WorkspaceID: gptr.Of(workspaceID), + Tags: tags, + }, + mockSetup: func() { + mockEvaluatorService.EXPECT(). + GetEvaluator(gomock.Any(), workspaceID, evaluatorID, false). + Return(evaluatorDO, nil) + + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{"456"}) + + mockEvaluatorService.EXPECT(). + UpdateBuiltinEvaluatorTags(gomock.Any(), evaluatorID, gomock.Any()). + Return(errorx.NewByCode(errno.CommonInternalErrorCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonInternalErrorCode, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + resp, err := app.UpdateBuiltinEvaluatorTags(context.Background(), tt.req) + + if tt.wantErr { + assert.Error(t, err) + if tt.wantErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.wantErrCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + assert.NotNil(t, resp) + assert.NotNil(t, resp.Evaluator) + } + }) + } +} + +// TestEvaluatorHandlerImpl_ListEvaluatorTags 测试 ListEvaluatorTags 方法 +func TestEvaluatorHandlerImpl_ListEvaluatorTags(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockConfiger := confmocks.NewMockIConfiger(ctrl) + + app := &EvaluatorHandlerImpl{ + configer: mockConfiger, + } + + tags := map[string][]string{ + evaluatordto.EvaluatorTagKeyCategory: {"category1", "category2"}, + evaluatordto.EvaluatorTagKeyTargetType: {"domain1"}, + } + + tests := []struct { + name string + req *evaluatorservice.ListEvaluatorTagsRequest + mockSetup func() + wantResp *evaluatorservice.ListEvaluatorTagsResponse + wantErr bool + wantErrCode int32 + }{ + { + name: "success - normal request", + req: &evaluatorservice.ListEvaluatorTagsRequest{}, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTagConf(gomock.Any()). + Return(tags) + }, + wantResp: &evaluatorservice.ListEvaluatorTagsResponse{ + Tags: tags, + }, + wantErr: false, + }, + { + name: "success - empty tags", + req: &evaluatorservice.ListEvaluatorTagsRequest{}, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTagConf(gomock.Any()). + Return(map[string][]string{}) + }, + wantResp: &evaluatorservice.ListEvaluatorTagsResponse{ + Tags: map[string][]string{}, + }, + wantErr: false, + }, + { + name: "success - tags sorted", + req: &evaluatorservice.ListEvaluatorTagsRequest{}, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTagConf(gomock.Any()). + Return(map[string][]string{ + evaluatordto.EvaluatorTagKeyCategory: {"z", "a", "m"}, + evaluatordto.EvaluatorTagKeyTargetType: {"x", "b"}, + }) + }, + wantResp: &evaluatorservice.ListEvaluatorTagsResponse{ + Tags: map[string][]string{ + evaluatordto.EvaluatorTagKeyCategory: {"a", "m", "z"}, + evaluatordto.EvaluatorTagKeyTargetType: {"b", "x"}, + }, + }, + wantErr: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + resp, err := app.ListEvaluatorTags(context.Background(), tt.req) + + if tt.wantErr { + assert.Error(t, err) + if tt.wantErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.wantErrCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + assert.NotNil(t, resp) + if tt.wantResp.Tags != nil { + // 验证标签是否已排序 + for key, expectedValues := range tt.wantResp.Tags { + actualValues := resp.Tags[key] + assert.Equal(t, expectedValues, actualValues, "Tags for key %v should be sorted", key) + } + } + } + }) + } +} + +// TestEvaluatorHandlerImpl_authBuiltinManagement 测试 authBuiltinManagement 方法 +func TestEvaluatorHandlerImpl_authBuiltinManagement(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockConfiger := confmocks.NewMockIConfiger(ctrl) + mockAuth := rpcmocks.NewMockIAuthProvider(ctrl) + + app := &EvaluatorHandlerImpl{ + configer: mockConfiger, + auth: mockAuth, + } + + tests := []struct { + name string + workspaceID int64 + spaceType SpaceType + mockSetup func() + wantErr bool + wantErrCode int32 + }{ + { + name: "success - workspace in allowed list for builtin", + workspaceID: 123, + spaceType: spaceTypeBuiltin, + mockSetup: func() { + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{"123", "456"}) + }, + wantErr: false, + }, + { + name: "success - workspace in allowed list for template", + workspaceID: 456, + spaceType: spaceTypeTemplate, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTemplateSpaceConf(gomock.Any()). + Return([]string{"123", "456"}) + }, + wantErr: false, + }, + { + name: "error - empty config for builtin", + workspaceID: 123, + spaceType: spaceTypeBuiltin, + mockSetup: func() { + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{}) + }, + wantErr: true, + wantErrCode: errno.CommonInvalidParamCode, + }, + { + name: "error - empty config for template", + workspaceID: 123, + spaceType: spaceTypeTemplate, + mockSetup: func() { + mockConfiger.EXPECT(). + GetEvaluatorTemplateSpaceConf(gomock.Any()). + Return([]string{}) + }, + wantErr: true, + wantErrCode: errno.CommonInvalidParamCode, + }, + { + name: "error - workspace not in allowed list", + workspaceID: 789, + spaceType: spaceTypeBuiltin, + mockSetup: func() { + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{"123", "456"}) + + mockAuth.EXPECT(). + Authorization(gomock.Any(), gomock.Any()). + Return(nil) + }, + wantErr: true, + wantErrCode: errno.CommonInvalidParamCode, + }, + { + name: "error - auth failed", + workspaceID: 789, + spaceType: spaceTypeBuiltin, + mockSetup: func() { + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{"123", "456"}) + + mockAuth.EXPECT(). + Authorization(gomock.Any(), gomock.Any()). + Return(errorx.NewByCode(errno.CommonNoPermissionCode)) + }, + wantErr: true, + wantErrCode: errno.CommonNoPermissionCode, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + err := app.authBuiltinManagement(context.Background(), tt.workspaceID, tt.spaceType) + + if tt.wantErr { + assert.Error(t, err) + if tt.wantErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.wantErrCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + } + }) + } +} From 13a6ff0ade4c7940aca4c8c2bb75a8277d6f62bd Mon Sep 17 00:00:00 2001 From: tpfz Date: Sat, 1 Nov 2025 18:26:34 +0800 Subject: [PATCH 10/42] add ut --- .../domain/service/evaluator_impl_test.go | 216 +++- .../service/evaluator_template_impl_test.go | 786 ++++++++++--- .../repo/evaluator/evaluator_impl_test.go | 276 +++++ .../evaluator/evaluator_template_impl_test.go | 1027 ++++++++--------- .../evaluator/list_builtin_evaluator_test.go | 133 --- 5 files changed, 1577 insertions(+), 861 deletions(-) delete mode 100644 backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go diff --git a/backend/modules/evaluation/domain/service/evaluator_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_impl_test.go index 13418f6d5..ca7111312 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl_test.go @@ -2019,11 +2019,159 @@ func TestEvaluatorServiceImpl_ListBuiltinEvaluator(t *testing.T) { expectedErr: nil, }, { - name: "成功 - 带版本信息 (WithVersion = true)", + name: "成功 - 带BuiltinVisibleVersion并回填版本信息", request: &entity.ListBuiltinEvaluatorRequest{ - PageSize: 10, - PageNum: 1, - WithVersion: true, + PageSize: 10, + PageNum: 1, + }, + setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { + expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + FilterOption: nil, + } + // 模拟返回有BuiltinVisibleVersion的评估器元数据 + mockRepo.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Eq(expectedRepoReq)).Return( + &repo.ListBuiltinEvaluatorResponse{ + Evaluators: []*entity.Evaluator{ + { + ID: 1, + Name: "BuiltinEval1", + SpaceID: 1, + Description: "Builtin Desc1", + BuiltinVisibleVersion: "1.0.0", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + { + ID: 2, + Name: "BuiltinEval2", + SpaceID: 1, + Description: "Builtin Desc2", + BuiltinVisibleVersion: "2.0.0", + EvaluatorType: entity.EvaluatorTypeCode, + }, + }, + TotalCount: 2, + }, nil) + + // 模拟批量查询版本信息 + mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), [][2]interface{}{ + {int64(1), "1.0.0"}, + {int64(2), "2.0.0"}, + }).Return([]*entity.Evaluator{ + { + ID: 1, + EvaluatorType: entity.EvaluatorTypePrompt, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + EvaluatorID: 1, + Version: "1.0.0", + MessageList: []*entity.Message{}, + }, + }, + { + ID: 2, + EvaluatorType: entity.EvaluatorTypeCode, + CodeEvaluatorVersion: &entity.CodeEvaluatorVersion{ + EvaluatorID: 2, + Version: "2.0.0", + CodeContent: "def evaluate(): pass", + }, + }, + }, nil) + }, + expectedList: []*entity.Evaluator{ + { + ID: 1, + Name: "BuiltinEval1", + SpaceID: 1, + Description: "Builtin Desc1", + BuiltinVisibleVersion: "1.0.0", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + { + ID: 2, + Name: "BuiltinEval2", + SpaceID: 1, + Description: "Builtin Desc2", + BuiltinVisibleVersion: "2.0.0", + EvaluatorType: entity.EvaluatorTypeCode, + }, + }, + expectedTotal: 2, + expectedErr: nil, + }, + { + name: "成功 - 部分评估器有BuiltinVisibleVersion", + request: &entity.ListBuiltinEvaluatorRequest{ + PageSize: 10, + PageNum: 1, + }, + setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { + expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + FilterOption: nil, + } + mockRepo.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Eq(expectedRepoReq)).Return( + &repo.ListBuiltinEvaluatorResponse{ + Evaluators: []*entity.Evaluator{ + { + ID: 1, + Name: "BuiltinEval1", + SpaceID: 1, + BuiltinVisibleVersion: "1.0.0", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + { + ID: 2, + Name: "BuiltinEval2", + SpaceID: 1, + BuiltinVisibleVersion: "", // 没有版本 + EvaluatorType: entity.EvaluatorTypePrompt, + }, + }, + TotalCount: 2, + }, nil) + + // 只查询有BuiltinVisibleVersion的评估器版本 + mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), [][2]interface{}{ + {int64(1), "1.0.0"}, + }).Return([]*entity.Evaluator{ + { + ID: 1, + EvaluatorType: entity.EvaluatorTypePrompt, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + EvaluatorID: 1, + Version: "1.0.0", + }, + }, + }, nil) + }, + expectedList: []*entity.Evaluator{ + { + ID: 1, + Name: "BuiltinEval1", + SpaceID: 1, + BuiltinVisibleVersion: "1.0.0", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + { + ID: 2, + Name: "BuiltinEval2", + SpaceID: 1, + EvaluatorType: entity.EvaluatorTypePrompt, + }, + }, + expectedTotal: 2, + expectedErr: nil, + }, + { + name: "成功 - 空列表", + request: &entity.ListBuiltinEvaluatorRequest{ + PageSize: 10, + PageNum: 1, }, setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ @@ -2032,6 +2180,31 @@ func TestEvaluatorServiceImpl_ListBuiltinEvaluator(t *testing.T) { IncludeDeleted: false, FilterOption: nil, } + mockRepo.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Eq(expectedRepoReq)).Return( + &repo.ListBuiltinEvaluatorResponse{ + Evaluators: []*entity.Evaluator{}, + TotalCount: 0, + }, nil) + // 空列表时不会调用BatchGetEvaluatorVersionsByEvaluatorIDAndVersions + }, + expectedList: []*entity.Evaluator{}, + expectedTotal: 0, + expectedErr: nil, + }, + { + name: "成功 - 带筛选条件", + request: &entity.ListBuiltinEvaluatorRequest{ + PageSize: 10, + PageNum: 1, + FilterOption: &entity.EvaluatorFilterOption{}, + }, + setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { + expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + FilterOption: &entity.EvaluatorFilterOption{}, + } mockRepo.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Eq(expectedRepoReq)).Return( &repo.ListBuiltinEvaluatorResponse{ Evaluators: []*entity.Evaluator{ @@ -2046,6 +2219,41 @@ func TestEvaluatorServiceImpl_ListBuiltinEvaluator(t *testing.T) { expectedTotal: 1, expectedErr: nil, }, + { + name: "失败 - BatchGetEvaluatorVersionsByEvaluatorIDAndVersions返回错误", + request: &entity.ListBuiltinEvaluatorRequest{ + PageSize: 10, + PageNum: 1, + }, + setupMock: func(mockRepo *repomocks.MockIEvaluatorRepo) { + expectedRepoReq := &repo.ListBuiltinEvaluatorRequest{ + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + FilterOption: nil, + } + mockRepo.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Eq(expectedRepoReq)).Return( + &repo.ListBuiltinEvaluatorResponse{ + Evaluators: []*entity.Evaluator{ + { + ID: 1, + Name: "BuiltinEval1", + SpaceID: 1, + BuiltinVisibleVersion: "1.0.0", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + }, + TotalCount: 1, + }, nil) + + mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), [][2]interface{}{ + {int64(1), "1.0.0"}, + }).Return(nil, errors.New("version query error")) + }, + expectedList: nil, + expectedTotal: 0, + expectedErr: errors.New("version query error"), + }, { name: "失败 - repo返回错误", request: &entity.ListBuiltinEvaluatorRequest{ diff --git a/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go index 40cae0617..f095e92e0 100644 --- a/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go @@ -5,55 +5,21 @@ package service import ( "context" + "errors" "testing" "github.com/bytedance/gg/gptr" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" + "go.uber.org/mock/gomock" "github.com/coze-dev/coze-loop/backend/infra/middleware/session" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" + repomocks "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo/mocks" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/errno" + "github.com/coze-dev/coze-loop/backend/pkg/errorx" ) -// MockEvaluatorTemplateRepo 模拟模板仓库 -type MockEvaluatorTemplateRepo struct { - mock.Mock -} - -func (m *MockEvaluatorTemplateRepo) CreateEvaluatorTemplate(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { - args := m.Called(ctx, template) - return args.Get(0).(*entity.EvaluatorTemplate), args.Error(1) -} - -func (m *MockEvaluatorTemplateRepo) UpdateEvaluatorTemplate(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { - args := m.Called(ctx, template) - return args.Get(0).(*entity.EvaluatorTemplate), args.Error(1) -} - -func (m *MockEvaluatorTemplateRepo) DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string) error { - args := m.Called(ctx, id, userID) - return args.Error(0) -} - -func (m *MockEvaluatorTemplateRepo) IncrPopularityByID(ctx context.Context, id int64) error { - args := m.Called(ctx, id) - return args.Error(0) -} - -func (m *MockEvaluatorTemplateRepo) GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool) (*entity.EvaluatorTemplate, error) { - args := m.Called(ctx, id, includeDeleted) - if args.Get(0) == nil { - return nil, args.Error(1) - } - return args.Get(0).(*entity.EvaluatorTemplate), args.Error(1) -} - -func (m *MockEvaluatorTemplateRepo) ListEvaluatorTemplate(ctx context.Context, req *repo.ListEvaluatorTemplateRequest) (*repo.ListEvaluatorTemplateResponse, error) { - args := m.Called(ctx, req) - return args.Get(0).(*repo.ListEvaluatorTemplateResponse), args.Error(1) -} - // TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate 测试创建评估器模板 func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { t.Parallel() @@ -61,13 +27,13 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { tests := []struct { name string req *entity.CreateEvaluatorTemplateRequest - mockTemplate *entity.EvaluatorTemplate - mockError error + mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) expectedError bool + expectedErrCode int32 description string }{ { - name: "successful creation", + name: "成功 - 创建Prompt类型模板", req: &entity.CreateEvaluatorTemplateRequest{ SpaceID: 100, Name: "Test Template", @@ -83,81 +49,171 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { }, }, }, - mockTemplate: &entity.EvaluatorTemplate{ - ID: 1, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + CreateEvaluatorTemplate(gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { + template.ID = 1 + return template, nil + }) + }, + expectedError: false, + description: "成功创建Prompt类型评估器模板", + }, + { + name: "成功 - 创建Code类型模板", + req: &entity.CreateEvaluatorTemplateRequest{ SpaceID: 100, Name: "Test Template", Description: "Test Description", - EvaluatorType: entity.EvaluatorTypePrompt, + EvaluatorType: entity.EvaluatorTypeCode, + CodeEvaluatorContent: &entity.CodeEvaluatorContent{ + CodeContent: "def evaluate(): pass", + }, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + CreateEvaluatorTemplate(gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { + template.ID = 1 + return template, nil + }) }, expectedError: false, - description: "成功创建评估器模板", + description: "成功创建Code类型评估器模板", }, { - name: "invalid space ID", + name: "失败 - 无效的SpaceID", req: &entity.CreateEvaluatorTemplateRequest{ SpaceID: 0, Name: "Test Template", EvaluatorType: entity.EvaluatorTypePrompt, }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, description: "无效的空间ID应该返回错误", }, { - name: "empty name", + name: "失败 - 空的模板名称", req: &entity.CreateEvaluatorTemplateRequest{ SpaceID: 100, Name: "", EvaluatorType: entity.EvaluatorTypePrompt, }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, description: "空的模板名称应该返回错误", }, { - name: "missing prompt content for prompt type", + name: "失败 - 模板名称过长", + req: &entity.CreateEvaluatorTemplateRequest{ + SpaceID: 100, + Name: string(make([]byte, 101)), // 101个字符 + EvaluatorType: entity.EvaluatorTypePrompt, + PromptEvaluatorContent: &entity.PromptEvaluatorContent{ + MessageList: []*entity.Message{}, + }, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "模板名称长度超过100应该返回错误", + }, + { + name: "失败 - Prompt类型缺少PromptEvaluatorContent", req: &entity.CreateEvaluatorTemplateRequest{ SpaceID: 100, Name: "Test Template", EvaluatorType: entity.EvaluatorTypePrompt, }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, description: "Prompt类型评估器缺少PromptEvaluatorContent应该返回错误", }, + { + name: "失败 - Code类型缺少CodeEvaluatorContent", + req: &entity.CreateEvaluatorTemplateRequest{ + SpaceID: 100, + Name: "Test Template", + EvaluatorType: entity.EvaluatorTypeCode, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "Code类型评估器缺少CodeEvaluatorContent应该返回错误", + }, + { + name: "失败 - 用户ID缺失", + req: &entity.CreateEvaluatorTemplateRequest{ + SpaceID: 100, + Name: "Test Template", + EvaluatorType: entity.EvaluatorTypePrompt, + PromptEvaluatorContent: &entity.PromptEvaluatorContent{ + MessageList: []*entity.Message{}, + }, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "用户ID缺失应该返回错误", + }, + { + name: "失败 - repo创建错误", + req: &entity.CreateEvaluatorTemplateRequest{ + SpaceID: 100, + Name: "Test Template", + EvaluatorType: entity.EvaluatorTypePrompt, + PromptEvaluatorContent: &entity.PromptEvaluatorContent{ + MessageList: []*entity.Message{}, + }, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + CreateEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(nil, errors.New("repo error")) + }, + expectedError: true, + expectedErrCode: errno.CommonInternalErrorCode, + description: "repo创建错误应该返回内部错误", + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - mockRepo := &MockEvaluatorTemplateRepo{} + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockRepo := repomocks.NewMockEvaluatorTemplateRepo(ctrl) service := NewEvaluatorTemplateService(mockRepo) - // 设置context with userID ctx := context.Background() - if !tt.expectedError { - user := &session.User{ID: "user123"} - ctx = session.WithCtxUser(ctx, user) - mockRepo.On("CreateEvaluatorTemplate", mock.Anything, mock.Anything).Return(tt.mockTemplate, tt.mockError) - } else { - // 对于参数验证失败的情况，不设置userID - if tt.name != "invalid space ID" && tt.name != "empty name" && tt.name != "missing prompt content for prompt type" { - user := &session.User{ID: "user123"} - ctx = session.WithCtxUser(ctx, user) - } + if !tt.expectedError || (tt.name != "失败 - 无效的SpaceID" && tt.name != "失败 - 空的模板名称" && tt.name != "失败 - 模板名称过长" && tt.name != "失败 - Prompt类型缺少PromptEvaluatorContent" && tt.name != "失败 - Code类型缺少CodeEvaluatorContent" && tt.name != "失败 - 用户ID缺失") { + ctx = session.WithCtxUser(ctx, &session.User{ID: "user123"}) } + tt.mockSetup(mockRepo) + result, err := service.CreateEvaluatorTemplate(ctx, tt.req) if tt.expectedError { assert.Error(t, err) assert.Nil(t, result) + if tt.expectedErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.expectedErrCode, statusErr.Code()) + } } else { assert.NoError(t, err) assert.NotNil(t, result) - assert.Equal(t, tt.mockTemplate.ID, result.Template.ID) - assert.Equal(t, tt.mockTemplate.Name, result.Template.Name) - } - - if !tt.expectedError { - mockRepo.AssertExpectations(t) + assert.NotNil(t, result.Template) + assert.Equal(t, tt.req.SpaceID, result.Template.SpaceID) + assert.Equal(t, tt.req.Name, result.Template.Name) + assert.Equal(t, tt.req.Description, result.Template.Description) + assert.Equal(t, tt.req.EvaluatorType, result.Template.EvaluatorType) } }) } @@ -170,88 +226,198 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { tests := []struct { name string req *entity.UpdateEvaluatorTemplateRequest - existingTemplate *entity.EvaluatorTemplate - mockTemplate *entity.EvaluatorTemplate - mockError error + mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) expectedError bool + expectedErrCode int32 description string }{ { - name: "successful update", + name: "成功 - 更新模板名称", req: &entity.UpdateEvaluatorTemplateRequest{ ID: 1, Name: gptr.Of("Updated Template"), }, - existingTemplate: &entity.EvaluatorTemplate{ - ID: 1, - SpaceID: 100, - Name: "Original Template", + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + existingTemplate := &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Original Template", + BaseInfo: &entity.BaseInfo{}, + } + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(existingTemplate, nil) + + mockRepo.EXPECT(). + UpdateEvaluatorTemplate(gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { + return template, nil + }) + }, + expectedError: false, + description: "成功更新评估器模板名称", + }, + { + name: "成功 - 更新多个字段", + req: &entity.UpdateEvaluatorTemplateRequest{ + ID: 1, + Name: gptr.Of("Updated Template"), + Description: gptr.Of("Updated Description"), + Benchmark: gptr.Of("benchmark1"), + Vendor: gptr.Of("vendor1"), }, - mockTemplate: &entity.EvaluatorTemplate{ - ID: 1, - SpaceID: 100, - Name: "Updated Template", + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + existingTemplate := &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Original Template", + BaseInfo: &entity.BaseInfo{}, + } + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(existingTemplate, nil) + + mockRepo.EXPECT(). + UpdateEvaluatorTemplate(gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, template *entity.EvaluatorTemplate) (*entity.EvaluatorTemplate, error) { + return template, nil + }) }, expectedError: false, - description: "成功更新评估器模板", + description: "成功更新多个字段", + }, + { + name: "失败 - 无效的模板ID", + req: &entity.UpdateEvaluatorTemplateRequest{ + ID: 0, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "无效的模板ID应该返回错误", + }, + { + name: "失败 - 空的模板名称", + req: &entity.UpdateEvaluatorTemplateRequest{ + ID: 1, + Name: gptr.Of(""), + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "空的模板名称应该返回错误", }, { - name: "template not found", + name: "失败 - 模板名称过长", + req: &entity.UpdateEvaluatorTemplateRequest{ + ID: 1, + Name: gptr.Of(string(make([]byte, 101))), + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "模板名称长度超过100应该返回错误", + }, + { + name: "失败 - 用户ID缺失", req: &entity.UpdateEvaluatorTemplateRequest{ ID: 1, Name: gptr.Of("Updated Template"), }, - existingTemplate: nil, - expectedError: true, - description: "模板不存在应该返回错误", + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "用户ID缺失应该返回错误", }, { - name: "invalid ID", + name: "失败 - 模板不存在", req: &entity.UpdateEvaluatorTemplateRequest{ - ID: 0, + ID: 1, + Name: gptr.Of("Updated Template"), + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(nil, nil) }, expectedError: true, - description: "无效的模板ID应该返回错误", + expectedErrCode: errno.ResourceNotFoundCode, + description: "模板不存在应该返回错误", + }, + { + name: "失败 - 获取模板错误", + req: &entity.UpdateEvaluatorTemplateRequest{ + ID: 1, + Name: gptr.Of("Updated Template"), + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(nil, errors.New("repo error")) + }, + expectedError: true, + expectedErrCode: errno.CommonInternalErrorCode, + description: "获取模板错误应该返回内部错误", + }, + { + name: "失败 - 更新模板错误", + req: &entity.UpdateEvaluatorTemplateRequest{ + ID: 1, + Name: gptr.Of("Updated Template"), + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + existingTemplate := &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Original Template", + BaseInfo: &entity.BaseInfo{}, + } + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(existingTemplate, nil) + + mockRepo.EXPECT(). + UpdateEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(nil, errors.New("repo error")) + }, + expectedError: true, + expectedErrCode: errno.CommonInternalErrorCode, + description: "更新模板错误应该返回内部错误", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - mockRepo := &MockEvaluatorTemplateRepo{} + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockRepo := repomocks.NewMockEvaluatorTemplateRepo(ctrl) service := NewEvaluatorTemplateService(mockRepo) - // 设置context with userID ctx := context.Background() - if tt.req.ID > 0 { + if !tt.expectedError || (tt.name != "失败 - 无效的模板ID" && tt.name != "失败 - 空的模板名称" && tt.name != "失败 - 模板名称过长" && tt.name != "失败 - 用户ID缺失") { ctx = session.WithCtxUser(ctx, &session.User{ID: "user123"}) } - // 只为会调用repo层的情况设置mock期望 - if tt.req.ID > 0 { - if tt.existingTemplate != nil { - mockRepo.On("GetEvaluatorTemplate", mock.Anything, tt.req.ID, false).Return(tt.existingTemplate, nil) - if !tt.expectedError { - mockRepo.On("UpdateEvaluatorTemplate", mock.Anything, mock.Anything).Return(tt.mockTemplate, tt.mockError) - } - } else if tt.expectedError { - mockRepo.On("GetEvaluatorTemplate", mock.Anything, tt.req.ID, false).Return(nil, nil) - } - } + tt.mockSetup(mockRepo) result, err := service.UpdateEvaluatorTemplate(ctx, tt.req) if tt.expectedError { assert.Error(t, err) assert.Nil(t, result) + if tt.expectedErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.expectedErrCode, statusErr.Code()) + } } else { assert.NoError(t, err) assert.NotNil(t, result) - assert.Equal(t, tt.mockTemplate.ID, result.Template.ID) - assert.Equal(t, tt.mockTemplate.Name, result.Template.Name) - } - - if tt.req.ID > 0 { - mockRepo.AssertExpectations(t) + assert.NotNil(t, result.Template) + if tt.req.Name != nil { + assert.Equal(t, *tt.req.Name, result.Template.Name) + } } }) } @@ -264,79 +430,134 @@ func TestEvaluatorTemplateServiceImpl_DeleteEvaluatorTemplate(t *testing.T) { tests := []struct { name string req *entity.DeleteEvaluatorTemplateRequest - existingTemplate *entity.EvaluatorTemplate - mockError error + mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) expectedError bool + expectedErrCode int32 description string }{ { - name: "successful deletion", + name: "成功 - 删除模板", req: &entity.DeleteEvaluatorTemplateRequest{ ID: 1, }, - existingTemplate: &entity.EvaluatorTemplate{ - ID: 1, - SpaceID: 100, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + existingTemplate := &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + } + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(existingTemplate, nil) + + mockRepo.EXPECT(). + DeleteEvaluatorTemplate(gomock.Any(), int64(1), "user123"). + Return(nil) }, expectedError: false, - description: "成功删除评估器模板", + description: "成功删除评估器模板", + }, + { + name: "失败 - 无效的模板ID", + req: &entity.DeleteEvaluatorTemplateRequest{ + ID: 0, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "无效的模板ID应该返回错误", }, { - name: "template not found", + name: "失败 - 用户ID缺失", req: &entity.DeleteEvaluatorTemplateRequest{ ID: 1, }, - existingTemplate: nil, - expectedError: true, - description: "模板不存在应该返回错误", + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "用户ID缺失应该返回错误", }, { - name: "invalid ID", + name: "失败 - 模板不存在", req: &entity.DeleteEvaluatorTemplateRequest{ - ID: 0, + ID: 1, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(nil, nil) }, expectedError: true, - description: "无效的模板ID应该返回错误", + expectedErrCode: errno.ResourceNotFoundCode, + description: "模板不存在应该返回错误", + }, + { + name: "失败 - 获取模板错误", + req: &entity.DeleteEvaluatorTemplateRequest{ + ID: 1, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(nil, errors.New("repo error")) + }, + expectedError: true, + expectedErrCode: errno.CommonInternalErrorCode, + description: "获取模板错误应该返回内部错误", + }, + { + name: "失败 - 删除模板错误", + req: &entity.DeleteEvaluatorTemplateRequest{ + ID: 1, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + existingTemplate := &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + } + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(existingTemplate, nil) + + mockRepo.EXPECT(). + DeleteEvaluatorTemplate(gomock.Any(), int64(1), "user123"). + Return(errors.New("repo error")) + }, + expectedError: true, + expectedErrCode: errno.CommonInternalErrorCode, + description: "删除模板错误应该返回内部错误", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - mockRepo := &MockEvaluatorTemplateRepo{} + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockRepo := repomocks.NewMockEvaluatorTemplateRepo(ctrl) service := NewEvaluatorTemplateService(mockRepo) - // 设置context with userID ctx := context.Background() - if tt.req.ID > 0 { + if !tt.expectedError || (tt.name != "失败 - 无效的模板ID" && tt.name != "失败 - 用户ID缺失") { ctx = session.WithCtxUser(ctx, &session.User{ID: "user123"}) } - // 只为会调用repo层的情况设置mock期望 - if tt.req.ID > 0 { - if tt.existingTemplate != nil { - mockRepo.On("GetEvaluatorTemplate", mock.Anything, tt.req.ID, false).Return(tt.existingTemplate, nil) - if !tt.expectedError { - mockRepo.On("DeleteEvaluatorTemplate", mock.Anything, tt.req.ID, "user123").Return(tt.mockError) - } - } else if tt.expectedError { - mockRepo.On("GetEvaluatorTemplate", mock.Anything, tt.req.ID, false).Return(nil, nil) - } - } + tt.mockSetup(mockRepo) result, err := service.DeleteEvaluatorTemplate(ctx, tt.req) if tt.expectedError { assert.Error(t, err) assert.Nil(t, result) + if tt.expectedErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.expectedErrCode, statusErr.Code()) + } } else { assert.NoError(t, err) assert.NotNil(t, result) assert.True(t, result.Success) } - - if tt.req.ID > 0 { - mockRepo.AssertExpectations(t) - } }) } } @@ -348,67 +569,113 @@ func TestEvaluatorTemplateServiceImpl_GetEvaluatorTemplate(t *testing.T) { tests := []struct { name string req *entity.GetEvaluatorTemplateRequest - mockTemplate *entity.EvaluatorTemplate - mockError error + mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) expectedError bool + expectedErrCode int32 description string }{ { - name: "successful get", + name: "成功 - 获取模板", req: &entity.GetEvaluatorTemplateRequest{ ID: 1, }, - mockTemplate: &entity.EvaluatorTemplate{ - ID: 1, - SpaceID: 100, - Name: "Test Template", + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockTemplate := &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Test Template", + } + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(mockTemplate, nil) + }, + expectedError: false, + description: "成功获取评估器模板", + }, + { + name: "成功 - 包含已删除记录", + req: &entity.GetEvaluatorTemplateRequest{ + ID: 1, + IncludeDeleted: true, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockTemplate := &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Test Template", + } + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), true). + Return(mockTemplate, nil) }, expectedError: false, - description: "成功获取评估器模板", + description: "成功获取已删除的模板", }, { - name: "template not found", + name: "失败 - 无效的模板ID", + req: &entity.GetEvaluatorTemplateRequest{ + ID: 0, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "无效的模板ID应该返回错误", + }, + { + name: "失败 - 模板不存在", req: &entity.GetEvaluatorTemplateRequest{ ID: 1, }, - mockTemplate: nil, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(nil, nil) + }, expectedError: true, + expectedErrCode: errno.ResourceNotFoundCode, description: "模板不存在应该返回错误", }, { - name: "invalid ID", + name: "失败 - 获取模板错误", req: &entity.GetEvaluatorTemplateRequest{ - ID: 0, + ID: 1, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(nil, errors.New("repo error")) }, expectedError: true, - description: "无效的模板ID应该返回错误", + expectedErrCode: errno.CommonInternalErrorCode, + description: "获取模板错误应该返回内部错误", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - mockRepo := &MockEvaluatorTemplateRepo{} + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockRepo := repomocks.NewMockEvaluatorTemplateRepo(ctrl) service := NewEvaluatorTemplateService(mockRepo) - // 只为会调用repo层的情况设置mock期望 - if tt.req.ID > 0 { - mockRepo.On("GetEvaluatorTemplate", mock.Anything, tt.req.ID, tt.req.IncludeDeleted).Return(tt.mockTemplate, tt.mockError) - } + tt.mockSetup(mockRepo) result, err := service.GetEvaluatorTemplate(context.Background(), tt.req) if tt.expectedError { assert.Error(t, err) assert.Nil(t, result) + if tt.expectedErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.expectedErrCode, statusErr.Code()) + } } else { assert.NoError(t, err) assert.NotNil(t, result) - assert.Equal(t, tt.mockTemplate.ID, result.Template.ID) - assert.Equal(t, tt.mockTemplate.Name, result.Template.Name) - } - - if tt.req.ID > 0 { - mockRepo.AssertExpectations(t) + assert.NotNil(t, result.Template) + assert.Equal(t, tt.req.ID, result.Template.ID) } }) } @@ -421,83 +688,218 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { tests := []struct { name string req *entity.ListEvaluatorTemplateRequest - mockResponse *repo.ListEvaluatorTemplateResponse - mockError error + mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) expectedError bool + expectedErrCode int32 + expectedTotalPages int32 description string }{ { - name: "successful list", + name: "成功 - 正常查询", req: &entity.ListEvaluatorTemplateRequest{ SpaceID: 100, PageSize: 10, PageNum: 1, }, - mockResponse: &repo.ListEvaluatorTemplateResponse{ - TotalCount: 2, - Templates: []*entity.EvaluatorTemplate{ - {ID: 1, Name: "Template 1"}, - {ID: 2, Name: "Template 2"}, - }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), &repo.ListEvaluatorTemplateRequest{ + SpaceID: 100, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }). + Return(&repo.ListEvaluatorTemplateResponse{ + TotalCount: 25, + Templates: []*entity.EvaluatorTemplate{ + {ID: 1, Name: "Template 1"}, + {ID: 2, Name: "Template 2"}, + }, + }, nil) }, expectedError: false, + expectedTotalPages: 3, // (25 + 10 - 1) / 10 = 3 description: "成功查询评估器模板列表", }, { - name: "invalid page size", + name: "成功 - 包含筛选条件", + req: &entity.ListEvaluatorTemplateRequest{ + SpaceID: 100, + FilterOption: &entity.EvaluatorFilterOption{}, + PageSize: 10, + PageNum: 1, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), &repo.ListEvaluatorTemplateRequest{ + SpaceID: 100, + FilterOption: &entity.EvaluatorFilterOption{}, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }). + Return(&repo.ListEvaluatorTemplateResponse{ + TotalCount: 5, + Templates: []*entity.EvaluatorTemplate{ + {ID: 1, Name: "Template 1"}, + }, + }, nil) + }, + expectedError: false, + expectedTotalPages: 1, // (5 + 10 - 1) / 10 = 1 + description: "成功查询带筛选条件的模板列表", + }, + { + name: "成功 - 包含已删除记录", + req: &entity.ListEvaluatorTemplateRequest{ + SpaceID: 100, + PageSize: 10, + PageNum: 1, + IncludeDeleted: true, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), &repo.ListEvaluatorTemplateRequest{ + SpaceID: 100, + PageSize: 10, + PageNum: 1, + IncludeDeleted: true, + }). + Return(&repo.ListEvaluatorTemplateResponse{ + TotalCount: 10, + Templates: []*entity.EvaluatorTemplate{ + {ID: 1, Name: "Template 1"}, + }, + }, nil) + }, + expectedError: false, + expectedTotalPages: 1, + description: "成功查询包含已删除记录的模板列表", + }, + { + name: "失败 - 无效的分页大小（为0）", req: &entity.ListEvaluatorTemplateRequest{ SpaceID: 100, PageSize: 0, PageNum: 1, }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, description: "无效的分页大小应该返回错误", }, { - name: "invalid page num", + name: "失败 - 分页大小超过100", + req: &entity.ListEvaluatorTemplateRequest{ + SpaceID: 100, + PageSize: 101, + PageNum: 1, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, + description: "分页大小超过100应该返回错误", + }, + { + name: "失败 - 无效的页码", req: &entity.ListEvaluatorTemplateRequest{ SpaceID: 100, PageSize: 10, PageNum: 0, }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, expectedError: true, + expectedErrCode: errno.CommonInvalidParamCode, description: "无效的页码应该返回错误", }, + { + name: "失败 - repo查询错误", + req: &entity.ListEvaluatorTemplateRequest{ + SpaceID: 100, + PageSize: 10, + PageNum: 1, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(nil, errors.New("repo error")) + }, + expectedError: true, + expectedErrCode: errno.CommonInternalErrorCode, + description: "repo查询错误应该返回内部错误", + }, + { + name: "成功 - 计算总页数（整除）", + req: &entity.ListEvaluatorTemplateRequest{ + SpaceID: 100, + PageSize: 10, + PageNum: 1, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(&repo.ListEvaluatorTemplateResponse{ + TotalCount: 20, + Templates: []*entity.EvaluatorTemplate{ + {ID: 1, Name: "Template 1"}, + }, + }, nil) + }, + expectedError: false, + expectedTotalPages: 2, // 20 / 10 = 2 + description: "正确计算总页数（整除）", + }, + { + name: "成功 - 计算总页数（不整除）", + req: &entity.ListEvaluatorTemplateRequest{ + SpaceID: 100, + PageSize: 10, + PageNum: 1, + }, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { + mockRepo.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(&repo.ListEvaluatorTemplateResponse{ + TotalCount: 21, + Templates: []*entity.EvaluatorTemplate{ + {ID: 1, Name: "Template 1"}, + }, + }, nil) + }, + expectedError: false, + expectedTotalPages: 3, // (21 + 10 - 1) / 10 = 3 + description: "正确计算总页数（不整除）", + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - mockRepo := &MockEvaluatorTemplateRepo{} + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockRepo := repomocks.NewMockEvaluatorTemplateRepo(ctrl) service := NewEvaluatorTemplateService(mockRepo) - if !tt.expectedError { - mockRepo.On("ListEvaluatorTemplate", mock.Anything, mock.Anything).Return(tt.mockResponse, tt.mockError) - } else { - // For error cases, we still need to mock the call or handle the validation error - if tt.name == "invalid page size" || tt.name == "invalid page num" { - // These are validation errors that should happen before the repo call - // So we don't need to mock the repo call - } else { - mockRepo.On("ListEvaluatorTemplate", mock.Anything, mock.Anything).Return(tt.mockResponse, tt.mockError) - } - } + tt.mockSetup(mockRepo) result, err := service.ListEvaluatorTemplate(context.Background(), tt.req) if tt.expectedError { assert.Error(t, err) assert.Nil(t, result) + if tt.expectedErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.expectedErrCode, statusErr.Code()) + } } else { assert.NoError(t, err) assert.NotNil(t, result) - assert.Equal(t, tt.mockResponse.TotalCount, result.TotalCount) - assert.Equal(t, len(tt.mockResponse.Templates), len(result.Templates)) assert.Equal(t, tt.req.PageSize, result.PageSize) assert.Equal(t, tt.req.PageNum, result.PageNum) - } - - if !tt.expectedError { - mockRepo.AssertExpectations(t) + if tt.expectedTotalPages > 0 { + assert.Equal(t, tt.expectedTotalPages, result.TotalPages) + } } }) } diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index cf2fee989..10fff1bd2 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -1955,3 +1955,279 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorMeta(t *testing.T) { }) } } + +func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + request *repo.ListBuiltinEvaluatorRequest + mockDaoResult *mysql.ListEvaluatorResponse + mockDaoError error + mockTagResult []*model.EvaluatorTag + mockTagError error + expectedError bool + expectedCount int64 + description string + }{ + { + name: "成功 - 无筛选条件查询", + request: &repo.ListBuiltinEvaluatorRequest{ + FilterOption: nil, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockDaoResult: &mysql.ListEvaluatorResponse{ + TotalCount: 2, + Evaluators: []*model.Evaluator{ + {ID: 1, Name: gptr.Of("test1"), EvaluatorType: int32(entity.EvaluatorTypePrompt)}, + {ID: 2, Name: gptr.Of("test2"), EvaluatorType: int32(entity.EvaluatorTypePrompt)}, + }, + }, + mockDaoError: nil, + mockTagResult: []*model.EvaluatorTag{ + {SourceID: 1, TagKey: "type", TagValue: "builtin", LangType: "en-US"}, + {SourceID: 2, TagKey: "type", TagValue: "custom", LangType: "en-US"}, + }, + mockTagError: nil, + expectedError: false, + expectedCount: 2, + description: "成功查询内置评估器列表（无筛选条件）", + }, + { + name: "成功 - 带标签信息", + request: &repo.ListBuiltinEvaluatorRequest{ + FilterOption: nil, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockDaoResult: &mysql.ListEvaluatorResponse{ + TotalCount: 1, + Evaluators: []*model.Evaluator{ + {ID: 1, Name: gptr.Of("test1"), EvaluatorType: int32(entity.EvaluatorTypePrompt)}, + }, + }, + mockDaoError: nil, + mockTagResult: []*model.EvaluatorTag{ + {SourceID: 1, TagKey: "category", TagValue: "performance", LangType: "en-US"}, + {SourceID: 1, TagKey: "objective", TagValue: "quality", LangType: "en-US"}, + }, + mockTagError: nil, + expectedError: false, + expectedCount: 1, + description: "成功查询内置评估器列表（带多个标签）", + }, + { + name: "成功 - 带筛选条件", + request: &repo.ListBuiltinEvaluatorRequest{ + FilterOption: &entity.EvaluatorFilterOption{ + SearchKeyword: gptr.Of("test"), + }, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockDaoResult: &mysql.ListEvaluatorResponse{ + TotalCount: 1, + Evaluators: []*model.Evaluator{ + {ID: 1, Name: gptr.Of("test1"), EvaluatorType: int32(entity.EvaluatorTypePrompt)}, + }, + }, + mockDaoError: nil, + mockTagResult: []*model.EvaluatorTag{ + {SourceID: 1, TagKey: "type", TagValue: "builtin", LangType: "en-US"}, + }, + mockTagError: nil, + expectedError: false, + expectedCount: 1, + description: "成功查询内置评估器列表（带搜索关键词筛选）", + }, + { + name: "成功 - 筛选后无结果", + request: &repo.ListBuiltinEvaluatorRequest{ + FilterOption: &entity.EvaluatorFilterOption{ + SearchKeyword: gptr.Of("nonexistent"), + }, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockDaoResult: nil, + mockDaoError: nil, + mockTagResult: nil, + mockTagError: nil, + expectedError: false, + expectedCount: 0, + description: "筛选条件匹配无结果", + }, + { + name: "失败 - DAO查询错误", + request: &repo.ListBuiltinEvaluatorRequest{ + FilterOption: nil, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockDaoResult: nil, + mockDaoError: assert.AnError, + mockTagResult: nil, + mockTagError: nil, + expectedError: true, + expectedCount: 0, + description: "DAO查询错误应该返回错误", + }, + { + name: "成功 - 标签查询失败但继续处理", + request: &repo.ListBuiltinEvaluatorRequest{ + FilterOption: nil, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockDaoResult: &mysql.ListEvaluatorResponse{ + TotalCount: 1, + Evaluators: []*model.Evaluator{ + {ID: 1, Name: gptr.Of("test1"), EvaluatorType: int32(entity.EvaluatorTypePrompt)}, + }, + }, + mockDaoError: nil, + mockTagResult: nil, + mockTagError: assert.AnError, + expectedError: false, + expectedCount: 1, + description: "标签查询失败应该继续处理，返回空标签", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + // 创建mock controller + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + // 创建mock DAOs + mockEvaluatorDao := evaluatormocks.NewMockEvaluatorDAO(ctrl) + mockEvaluatorVersionDao := evaluatormocks.NewMockEvaluatorVersionDAO(ctrl) + mockTagDao := evaluatormocks.NewMockEvaluatorTagDAO(ctrl) + + // 处理筛选条件 + if tt.request.FilterOption != nil { + hasValidFilters := false + if tt.request.FilterOption.SearchKeyword != nil && *tt.request.FilterOption.SearchKeyword != "" { + hasValidFilters = true + } + if tt.request.FilterOption.Filters != nil && len(tt.request.FilterOption.Filters.FilterConditions) > 0 { + hasValidFilters = true + } + + if hasValidFilters { + // 设置标签筛选查询的期望 + if tt.name == "成功 - 筛选后无结果" { + mockTagDao.EXPECT(). + GetSourceIDsByFilterConditions( + gomock.Any(), + int32(entity.EvaluatorTagKeyType_Evaluator), + tt.request.FilterOption, + tt.request.PageSize, + tt.request.PageNum, + gomock.Any(), + ).Return([]int64{}, int64(0), nil) + } else { + mockTagDao.EXPECT(). + GetSourceIDsByFilterConditions( + gomock.Any(), + int32(entity.EvaluatorTagKeyType_Evaluator), + tt.request.FilterOption, + tt.request.PageSize, + tt.request.PageNum, + gomock.Any(), + ).Return([]int64{1}, int64(1), nil) + } + } + } + + // 设置evaluatorDao的期望 + if tt.mockDaoResult != nil || tt.mockDaoError != nil { + expectedIDs := []int64{} + if tt.request.FilterOption != nil { + hasValidFilters := false + if tt.request.FilterOption.SearchKeyword != nil && *tt.request.FilterOption.SearchKeyword != "" { + hasValidFilters = true + } + if tt.request.FilterOption.Filters != nil && len(tt.request.FilterOption.Filters.FilterConditions) > 0 { + hasValidFilters = true + } + if hasValidFilters { + if tt.name != "成功 - 筛选后无结果" { + expectedIDs = []int64{1} + } + } + } + + mockEvaluatorDao.EXPECT(). + ListBuiltinEvaluator( + gomock.Any(), + &mysql.ListBuiltinEvaluatorRequest{ + IDs: expectedIDs, + PageSize: tt.request.PageSize, + PageNum: tt.request.PageNum, + OrderBy: []*mysql.OrderBy{{Field: "name", ByDesc: false}}, + }, + ).Return(tt.mockDaoResult, tt.mockDaoError) + } + + // 设置tagDAO的期望 - 使用批量查询 + if tt.mockDaoResult != nil && len(tt.mockDaoResult.Evaluators) > 0 { + // 收集所有evaluator的ID + evaluatorIDs := make([]int64, 0, len(tt.mockDaoResult.Evaluators)) + for _, evaluator := range tt.mockDaoResult.Evaluators { + evaluatorIDs = append(evaluatorIDs, evaluator.ID) + } + + mockTagDao.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + evaluatorIDs, + int32(entity.EvaluatorTagKeyType_Evaluator), + gomock.Any(), + ).Return(tt.mockTagResult, tt.mockTagError) + } + + // 创建EvaluatorRepoImpl实例 + repo := &EvaluatorRepoImpl{ + evaluatorDao: mockEvaluatorDao, + evaluatorVersionDao: mockEvaluatorVersionDao, + tagDAO: mockTagDao, + } + + // 调用方法 + result, err := repo.ListBuiltinEvaluator(context.Background(), tt.request) + + // 验证结果 + if tt.expectedError { + assert.Error(t, err) + assert.Nil(t, result) + } else { + assert.NoError(t, err) + assert.NotNil(t, result) + assert.Equal(t, tt.expectedCount, result.TotalCount) + if tt.expectedCount > 0 { + assert.Equal(t, len(tt.mockDaoResult.Evaluators), len(result.Evaluators)) + // 验证标签是否正确设置 + if tt.mockTagError == nil && len(tt.mockTagResult) > 0 { + // 验证第一个评估器有标签 + if len(result.Evaluators) > 0 { + assert.NotNil(t, result.Evaluators[0].Tags) + } + } + } else { + assert.Len(t, result.Evaluators, 0) + } + } + }) + } +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go index c3f3711e5..f4ae6db1f 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go @@ -10,109 +10,31 @@ import ( "github.com/bytedance/gg/gptr" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" + "go.uber.org/mock/gomock" - "github.com/coze-dev/coze-loop/backend/infra/db" + idgenmocks "github.com/coze-dev/coze-loop/backend/infra/idgen/mocks" + "github.com/coze-dev/coze-loop/backend/infra/middleware/session" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql" - "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor" + mysqlmocks "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" ) -// MockEvaluatorTagDAO 模拟标签DAO -type MockEvaluatorTagDAO struct { - mock.Mock -} - -func (m *MockEvaluatorTagDAO) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, langType string, opts ...db.Option) ([]int64, int64, error) { - args := m.Called(ctx, tagType, filterOption, pageSize, pageNum, langType, opts) - return args.Get(0).([]int64), args.Get(1).(int64), args.Error(2) -} - -func (m *MockEvaluatorTagDAO) BatchCreateEvaluatorTags(ctx context.Context, evaluatorTags []*model.EvaluatorTag, opts ...db.Option) error { - args := m.Called(ctx, evaluatorTags, opts) - return args.Error(0) -} - -func (m *MockEvaluatorTagDAO) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, langType string, tags map[string][]string, opts ...db.Option) error { - args := m.Called(ctx, sourceID, tagType, langType, tags, opts) - return args.Error(0) -} - -func (m *MockEvaluatorTagDAO) BatchGetTagsBySourceIDsAndType(ctx context.Context, sourceIDs []int64, tagType int32, langType string, opts ...db.Option) ([]*model.EvaluatorTag, error) { - args := m.Called(ctx, sourceIDs, tagType, langType, opts) - return args.Get(0).([]*model.EvaluatorTag), args.Error(1) -} - -// stubIDGen 为测试提供简单的自增ID生成器 -type stubIDGen struct{ cur int64 } - -func (s *stubIDGen) GenID(ctx context.Context) (int64, error) { - s.cur++ - return s.cur, nil -} - -func (s *stubIDGen) GenMultiIDs(ctx context.Context, counts int) ([]int64, error) { - ids := make([]int64, counts) - for i := 0; i < counts; i++ { - s.cur++ - ids[i] = s.cur - } - return ids, nil -} - -// MockEvaluatorTemplateDAO 模拟模板DAO -type MockEvaluatorTemplateDAO struct { - mock.Mock -} - -func (m *MockEvaluatorTemplateDAO) CreateEvaluatorTemplate(ctx context.Context, template *model.EvaluatorTemplate, opts ...db.Option) (*model.EvaluatorTemplate, error) { - args := m.Called(ctx, template, opts) - return args.Get(0).(*model.EvaluatorTemplate), args.Error(1) -} - -func (m *MockEvaluatorTemplateDAO) UpdateEvaluatorTemplate(ctx context.Context, template *model.EvaluatorTemplate, opts ...db.Option) (*model.EvaluatorTemplate, error) { - args := m.Called(ctx, template, opts) - return args.Get(0).(*model.EvaluatorTemplate), args.Error(1) -} - -func (m *MockEvaluatorTemplateDAO) DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string, opts ...db.Option) error { - args := m.Called(ctx, id, userID, opts) - return args.Error(0) -} - -func (m *MockEvaluatorTemplateDAO) GetEvaluatorTemplate(ctx context.Context, id int64, includeDeleted bool, opts ...db.Option) (*model.EvaluatorTemplate, error) { - args := m.Called(ctx, id, includeDeleted, opts) - return args.Get(0).(*model.EvaluatorTemplate), args.Error(1) -} - -func (m *MockEvaluatorTemplateDAO) ListEvaluatorTemplate(ctx context.Context, req *mysql.ListEvaluatorTemplateRequest, opts ...db.Option) (*mysql.ListEvaluatorTemplateResponse, error) { - args := m.Called(ctx, req, opts) - return args.Get(0).(*mysql.ListEvaluatorTemplateResponse), args.Error(1) -} - -func (m *MockEvaluatorTemplateDAO) IncrPopularityByID(ctx context.Context, id int64, opts ...db.Option) error { - args := m.Called(ctx, id, opts) - return args.Error(0) -} - +// TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate 测试查询评估器模板列表 func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { t.Parallel() tests := []struct { - name string - request *repo.ListEvaluatorTemplateRequest - mockTagIDs []int64 - mockTagError error - mockTemplates *mysql.ListEvaluatorTemplateResponse - mockTemplateError error - expectedResult *repo.ListEvaluatorTemplateResponse - expectedError bool - description string + name string + request *repo.ListEvaluatorTemplateRequest + mockSetup func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) + expectedResult *repo.ListEvaluatorTemplateResponse + expectedError bool + description string }{ { - name: "no filter conditions", + name: "成功 - 无筛选条件", request: &repo.ListEvaluatorTemplateRequest{ SpaceID: 123, FilterOption: nil, @@ -120,81 +42,61 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { PageNum: 1, IncludeDeleted: false, }, - mockTemplates: &mysql.ListEvaluatorTemplateResponse{ - TotalCount: 2, - Templates: []*model.EvaluatorTemplate{ - { - ID: 1, - SpaceID: gptr.Of(int64(123)), - Name: gptr.Of("Template A"), - Description: gptr.Of("Description A"), - EvaluatorType: gptr.Of(int32(1)), - Benchmark: gptr.Of("benchmark1"), - Vendor: gptr.Of("vendor1"), - Popularity: 100, - CreatedBy: "user1", - UpdatedBy: "user1", - }, - { - ID: 2, - SpaceID: gptr.Of(int64(123)), - Name: gptr.Of("Template B"), - Description: gptr.Of("Description B"), - EvaluatorType: gptr.Of(int32(2)), - Benchmark: gptr.Of("benchmark2"), - Vendor: gptr.Of("vendor2"), - Popularity: 200, - CreatedBy: "user2", - UpdatedBy: "user2", - }, - }, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + expectedDAOReq := &mysql.ListEvaluatorTemplateRequest{ + IDs: []int64{}, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + } + mockTemplateDAO.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), expectedDAOReq). + Return(&mysql.ListEvaluatorTemplateResponse{ + TotalCount: 2, + Templates: []*model.EvaluatorTemplate{ + { + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template A"), + Description: gptr.Of("Description A"), + EvaluatorType: gptr.Of(int32(1)), + Benchmark: gptr.Of("benchmark1"), + Vendor: gptr.Of("vendor1"), + Popularity: 100, + CreatedBy: "user1", + UpdatedBy: "user1", + }, + { + ID: 2, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template B"), + Description: gptr.Of("Description B"), + EvaluatorType: gptr.Of(int32(2)), + Benchmark: gptr.Of("benchmark2"), + Vendor: gptr.Of("vendor2"), + Popularity: 200, + CreatedBy: "user2", + UpdatedBy: "user2", + }, + }, + }, nil) + + mockTagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{1, 2}, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), gomock.Any()). + Return([]*model.EvaluatorTag{}, nil) }, expectedResult: &repo.ListEvaluatorTemplateResponse{ TotalCount: 2, Templates: []*entity.EvaluatorTemplate{ - { - ID: 1, - SpaceID: 123, - Name: "Template A", - Description: "Description A", - EvaluatorType: entity.EvaluatorType(1), - Benchmark: "benchmark1", - Vendor: "vendor1", - Popularity: 100, - BaseInfo: &entity.BaseInfo{ - CreatedBy: &entity.UserInfo{ - UserID: gptr.Of("user1"), - }, - UpdatedBy: &entity.UserInfo{ - UserID: gptr.Of("user1"), - }, - }, - }, - { - ID: 2, - SpaceID: 123, - Name: "Template B", - Description: "Description B", - EvaluatorType: entity.EvaluatorType(2), - Benchmark: "benchmark2", - Vendor: "vendor2", - Popularity: 200, - BaseInfo: &entity.BaseInfo{ - CreatedBy: &entity.UserInfo{ - UserID: gptr.Of("user2"), - }, - UpdatedBy: &entity.UserInfo{ - UserID: gptr.Of("user2"), - }, - }, - }, + {ID: 1, SpaceID: 123, Name: "Template A"}, + {ID: 2, SpaceID: 123, Name: "Template B"}, }, }, expectedError: false, description: "无筛选条件时，应该直接查询所有模板", }, { - name: "with filter conditions", + name: "成功 - 有筛选条件", request: &repo.ListEvaluatorTemplateRequest{ SpaceID: 123, FilterOption: entity.NewEvaluatorFilterOption(). @@ -211,52 +113,62 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { PageNum: 1, IncludeDeleted: false, }, - mockTagIDs: []int64{1, 3}, - mockTemplates: &mysql.ListEvaluatorTemplateResponse{ - TotalCount: 1, - Templates: []*model.EvaluatorTemplate{ - { - ID: 1, - SpaceID: gptr.Of(int64(123)), - Name: gptr.Of("Template A"), - Description: gptr.Of("Description A"), - EvaluatorType: gptr.Of(int32(1)), - Benchmark: gptr.Of("benchmark1"), - Vendor: gptr.Of("vendor1"), - Popularity: 100, - CreatedBy: "user1", - UpdatedBy: "user1", - }, - }, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + filterOption := entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "LLM", + )), + ) + mockTagDAO.EXPECT(). + GetSourceIDsByFilterConditions(gomock.Any(), int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), filterOption, int32(0), int32(0), gomock.Any()). + Return([]int64{1, 3}, int64(2), nil) + + expectedDAOReq := &mysql.ListEvaluatorTemplateRequest{ + IDs: []int64{1, 3}, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + } + mockTemplateDAO.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), expectedDAOReq). + Return(&mysql.ListEvaluatorTemplateResponse{ + TotalCount: 1, + Templates: []*model.EvaluatorTemplate{ + { + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template A"), + Description: gptr.Of("Description A"), + EvaluatorType: gptr.Of(int32(1)), + Benchmark: gptr.Of("benchmark1"), + Vendor: gptr.Of("vendor1"), + Popularity: 100, + CreatedBy: "user1", + UpdatedBy: "user1", + }, + }, + }, nil) + + mockTagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{1}, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), gomock.Any()). + Return([]*model.EvaluatorTag{}, nil) }, expectedResult: &repo.ListEvaluatorTemplateResponse{ TotalCount: 1, Templates: []*entity.EvaluatorTemplate{ - { - ID: 1, - SpaceID: 123, - Name: "Template A", - Description: "Description A", - EvaluatorType: entity.EvaluatorType(1), - Benchmark: "benchmark1", - Vendor: "vendor1", - Popularity: 100, - BaseInfo: &entity.BaseInfo{ - CreatedBy: &entity.UserInfo{ - UserID: gptr.Of("user1"), - }, - UpdatedBy: &entity.UserInfo{ - UserID: gptr.Of("user1"), - }, - }, - }, + {ID: 1, SpaceID: 123, Name: "Template A"}, }, }, expectedError: false, description: "有筛选条件时，应该先通过标签查询获取ID，再查询模板详情", }, { - name: "tag query error", + name: "失败 - 标签查询错误", request: &repo.ListEvaluatorTemplateRequest{ SpaceID: 123, FilterOption: entity.NewEvaluatorFilterOption(). @@ -273,78 +185,27 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { PageNum: 1, IncludeDeleted: false, }, - mockTagError: assert.AnError, - expectedError: true, - description: "标签查询出错时，应该返回错误", - }, - { - name: "template query error", - request: &repo.ListEvaluatorTemplateRequest{ - SpaceID: 123, - FilterOption: nil, - PageSize: 10, - PageNum: 1, - IncludeDeleted: false, - }, - mockTemplateError: assert.AnError, - expectedError: true, - description: "模板查询出错时，应该返回错误", - }, - { - name: "empty search keyword", - request: &repo.ListEvaluatorTemplateRequest{ - SpaceID: 123, - FilterOption: entity.NewEvaluatorFilterOption(). - WithSearchKeyword(""), - PageSize: 10, - PageNum: 1, - IncludeDeleted: false, - }, - mockTemplates: &mysql.ListEvaluatorTemplateResponse{ - TotalCount: 2, - Templates: []*model.EvaluatorTemplate{ - { - ID: 1, - SpaceID: gptr.Of(int64(123)), - Name: gptr.Of("Template A"), - Description: gptr.Of("Description A"), - EvaluatorType: gptr.Of(int32(1)), - Benchmark: gptr.Of("benchmark1"), - Vendor: gptr.Of("vendor1"), - Popularity: 100, - CreatedBy: "user1", - UpdatedBy: "user1", - }, - }, - }, - expectedResult: &repo.ListEvaluatorTemplateResponse{ - TotalCount: 2, - Templates: []*entity.EvaluatorTemplate{ - { - ID: 1, - SpaceID: 123, - Name: "Template A", - Description: "Description A", - EvaluatorType: entity.EvaluatorType(1), - Benchmark: "benchmark1", - Vendor: "vendor1", - Popularity: 100, - BaseInfo: &entity.BaseInfo{ - CreatedBy: &entity.UserInfo{ - UserID: gptr.Of("user1"), - }, - UpdatedBy: &entity.UserInfo{ - UserID: gptr.Of("user1"), - }, - }, - }, - }, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + filterOption := entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "LLM", + )), + ) + mockTagDAO.EXPECT(). + GetSourceIDsByFilterConditions(gomock.Any(), int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), filterOption, int32(0), int32(0), gomock.Any()). + Return(nil, int64(0), errors.New("tag query error")) }, - expectedError: false, - description: "空搜索关键词时，应该忽略筛选条件，查询所有模板", + expectedResult: nil, + expectedError: true, + description: "标签查询出错时，应该返回错误", }, { - name: "filter conditions hit zero results", + name: "成功 - 筛选条件命中数为0", request: &repo.ListEvaluatorTemplateRequest{ SpaceID: 123, FilterOption: entity.NewEvaluatorFilterOption(). @@ -361,185 +222,89 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { PageNum: 1, IncludeDeleted: false, }, - mockTagIDs: []int64{}, // 空结果 + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + filterOption := entity.NewEvaluatorFilterOption(). + WithFilters( + entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "NonExistentCategory", + )), + ) + mockTagDAO.EXPECT(). + GetSourceIDsByFilterConditions(gomock.Any(), int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), filterOption, int32(0), int32(0), gomock.Any()). + Return([]int64{}, int64(0), nil) + }, expectedResult: &repo.ListEvaluatorTemplateResponse{ TotalCount: 0, Templates: []*entity.EvaluatorTemplate{}, }, expectedError: false, - description: "筛选条件命中数为0时，应该直接返回空结果", + description: "筛选条件命中数为0时，应该直接返回空结果", + }, + { + name: "失败 - 模板查询错误", + request: &repo.ListEvaluatorTemplateRequest{ + SpaceID: 123, + FilterOption: nil, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + }, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + expectedDAOReq := &mysql.ListEvaluatorTemplateRequest{ + IDs: []int64{}, + PageSize: 10, + PageNum: 1, + IncludeDeleted: false, + } + mockTemplateDAO.EXPECT(). + ListEvaluatorTemplate(gomock.Any(), expectedDAOReq). + Return(nil, errors.New("template query error")) + }, + expectedResult: nil, + expectedError: true, + description: "模板查询出错时，应该返回错误", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - t.Parallel() - - // 创建mock对象 - mockTagDAO := &MockEvaluatorTagDAO{} - mockTemplateDAO := &MockEvaluatorTemplateDAO{} - - // 设置mock期望 - hasValidFilters := false - if tt.request.FilterOption != nil { - // 检查SearchKeyword是否有效 - if tt.request.FilterOption.SearchKeyword != nil && *tt.request.FilterOption.SearchKeyword != "" { - hasValidFilters = true - } - // 检查FilterConditions是否有效 - if tt.request.FilterOption.Filters != nil && len(tt.request.FilterOption.Filters.FilterConditions) > 0 { - hasValidFilters = true - } - } + ctrl := gomock.NewController(t) + defer ctrl.Finish() - if hasValidFilters { - mockTagDAO.On("GetSourceIDsByFilterConditions", mock.Anything, int32(2), tt.request.FilterOption, int32(0), int32(0), mock.Anything, mock.Anything).Return(tt.mockTagIDs, int64(len(tt.mockTagIDs)), tt.mockTagError) - } + mockTagDAO := mysqlmocks.NewMockEvaluatorTagDAO(ctrl) + mockTemplateDAO := mysqlmocks.NewMockEvaluatorTemplateDAO(ctrl) + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) - // Set up mock for BatchGetTagsBySourceIDsAndType - this is always called when there are template IDs - if tt.mockTemplates != nil && len(tt.mockTemplates.Templates) > 0 { - templateIDs := make([]int64, len(tt.mockTemplates.Templates)) - for i, template := range tt.mockTemplates.Templates { - templateIDs[i] = template.ID - } - mockTagDAO.On("BatchGetTagsBySourceIDsAndType", mock.Anything, templateIDs, int32(2), "en-US", mock.Anything).Return([]*model.EvaluatorTag{}, nil) - } + tt.mockSetup(mockTagDAO, mockTemplateDAO) - // 设置templateDAO的期望 - // 只有在tag查询有错误或筛选条件命中数为0时才不设置templateDAO的期望 - if tt.mockTagError == nil && !(hasValidFilters && len(tt.mockTagIDs) == 0) { - // 如果有筛选条件，templateDAO应该被调用时传入筛选后的IDs - // 如果没有筛选条件，templateDAO应该被调用时传入空的IDs - expectedIDs := []int64{} - if hasValidFilters { - expectedIDs = tt.mockTagIDs - } - // 确保不是nil - if expectedIDs == nil { - expectedIDs = []int64{} - } + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, mockIDGen) - expectedDAOReq := &mysql.ListEvaluatorTemplateRequest{ - IDs: expectedIDs, - PageSize: tt.request.PageSize, - PageNum: tt.request.PageNum, - IncludeDeleted: tt.request.IncludeDeleted, - } - mockTemplateDAO.On("ListEvaluatorTemplate", mock.Anything, expectedDAOReq, mock.Anything).Return(tt.mockTemplates, tt.mockTemplateError) - } - - // 创建repo实例 - repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, &stubIDGen{}) - - // 执行测试 ctx := context.Background() result, err := repo.ListEvaluatorTemplate(ctx, tt.request) - // 验证结果 if tt.expectedError { assert.Error(t, err) } else { assert.NoError(t, err) + assert.NotNil(t, result) assert.Equal(t, tt.expectedResult.TotalCount, result.TotalCount) - assert.Len(t, result.Templates, len(tt.expectedResult.Templates)) - - // 验证模板内容 - for i, template := range result.Templates { - expected := tt.expectedResult.Templates[i] - assert.Equal(t, expected.ID, template.ID) - assert.Equal(t, expected.SpaceID, template.SpaceID) - assert.Equal(t, expected.Name, template.Name) - assert.Equal(t, expected.Description, template.Description) - assert.Equal(t, expected.EvaluatorType, template.EvaluatorType) - assert.Equal(t, expected.Benchmark, template.Benchmark) - assert.Equal(t, expected.Vendor, template.Vendor) - assert.Equal(t, expected.Popularity, template.Popularity) - assert.NotNil(t, template.BaseInfo) - assert.NotNil(t, template.BaseInfo.CreatedBy) - assert.NotNil(t, template.BaseInfo.UpdatedBy) + if len(tt.expectedResult.Templates) > 0 { + assert.Len(t, result.Templates, len(tt.expectedResult.Templates)) + // 验证模板基本属性 + for i, template := range result.Templates { + expected := tt.expectedResult.Templates[i] + assert.Equal(t, expected.ID, template.ID) + assert.Equal(t, expected.SpaceID, template.SpaceID) + assert.Equal(t, expected.Name, template.Name) + } + } else { + assert.Len(t, result.Templates, 0) } } - - // 验证mock调用 - mockTagDAO.AssertExpectations(t) - mockTemplateDAO.AssertExpectations(t) - }) - } -} - -func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { - t.Parallel() - - tests := []struct { - name string - po *model.EvaluatorTemplate - expected *entity.EvaluatorTemplate - }{ - { - name: "nil po", - po: nil, - expected: nil, - }, - { - name: "valid po", - po: &model.EvaluatorTemplate{ - ID: 1, - SpaceID: gptr.Of(int64(123)), - Name: gptr.Of("Test Template"), - Description: gptr.Of("Test Description"), - EvaluatorType: gptr.Of(int32(1)), - Benchmark: gptr.Of("test_benchmark"), - Vendor: gptr.Of("test_vendor"), - Popularity: 100, - CreatedBy: "user1", - UpdatedBy: "user1", - }, - expected: &entity.EvaluatorTemplate{ - ID: 1, - SpaceID: 123, - Name: "Test Template", - Description: "Test Description", - EvaluatorType: entity.EvaluatorType(1), - Benchmark: "test_benchmark", - Vendor: "test_vendor", - Popularity: 100, - BaseInfo: &entity.BaseInfo{ - CreatedBy: &entity.UserInfo{ - UserID: gptr.Of("user1"), - }, - UpdatedBy: &entity.UserInfo{ - UserID: gptr.Of("user1"), - }, - }, - }, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - t.Parallel() - - result, err := convertor.ConvertEvaluatorTemplatePO2DOWithBaseInfo(tt.po) - assert.NoError(t, err) - - if tt.expected == nil { - assert.Nil(t, result) - } else { - assert.NotNil(t, result) - assert.Equal(t, tt.expected.ID, result.ID) - assert.Equal(t, tt.expected.SpaceID, result.SpaceID) - assert.Equal(t, tt.expected.Name, result.Name) - assert.Equal(t, tt.expected.Description, result.Description) - assert.Equal(t, tt.expected.EvaluatorType, result.EvaluatorType) - assert.Equal(t, tt.expected.Benchmark, result.Benchmark) - assert.Equal(t, tt.expected.Vendor, result.Vendor) - assert.Equal(t, tt.expected.Popularity, result.Popularity) - assert.NotNil(t, result.BaseInfo) - assert.NotNil(t, result.BaseInfo.CreatedBy) - assert.NotNil(t, result.BaseInfo.UpdatedBy) - assert.Equal(t, tt.expected.BaseInfo.CreatedBy.UserID, result.BaseInfo.CreatedBy.UserID) - assert.Equal(t, tt.expected.BaseInfo.UpdatedBy.UserID, result.BaseInfo.UpdatedBy.UserID) - } }) } } @@ -551,58 +316,131 @@ func TestEvaluatorTemplateRepoImpl_CreateEvaluatorTemplate(t *testing.T) { tests := []struct { name string template *entity.EvaluatorTemplate - mockTemplate *model.EvaluatorTemplate - mockError error - expectedResult *entity.EvaluatorTemplate + mockSetup func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) expectedError bool description string }{ { - name: "successful creation", + name: "成功 - 创建模板无标签", template: &entity.EvaluatorTemplate{ - ID: 1, SpaceID: 100, Name: "Test Template", Description: "Test Description", EvaluatorType: entity.EvaluatorTypePrompt, }, - mockTemplate: &model.EvaluatorTemplate{ - ID: 1, - SpaceID: gptr.Of(int64(100)), - Name: gptr.Of("Test Template"), - Description: gptr.Of("Test Description"), - EvaluatorType: gptr.Of(int32(1)), + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) { + mockIDGen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return([]int64{1}, nil) + + mockTemplateDAO.EXPECT(). + CreateEvaluatorTemplate(gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, template *model.EvaluatorTemplate, opts ...interface{}) (*model.EvaluatorTemplate, error) { + template.ID = 1 + return template, nil + }) }, - expectedResult: &entity.EvaluatorTemplate{ - ID: 1, + expectedError: false, + description: "成功创建评估器模板（无标签）", + }, + { + name: "成功 - 创建模板带标签", + template: &entity.EvaluatorTemplate{ SpaceID: 100, Name: "Test Template", Description: "Test Description", EvaluatorType: entity.EvaluatorTypePrompt, + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"category1", "category2"}, + }, + }, + }, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) { + mockIDGen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return([]int64{1}, nil) + + mockTemplateDAO.EXPECT(). + CreateEvaluatorTemplate(gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, template *model.EvaluatorTemplate, opts ...interface{}) (*model.EvaluatorTemplate, error) { + template.ID = 1 + return template, nil + }) + + mockIDGen.EXPECT(). + GenMultiIDs(gomock.Any(), 2). + Return([]int64{10, 11}, nil) + + mockTagDAO.EXPECT(). + BatchCreateEvaluatorTags(gomock.Any(), gomock.Any()). + Return(nil) }, expectedError: false, - description: "成功创建评估器模板", + description: "成功创建评估器模板（带标签）", + }, + { + name: "失败 - nil模板", + template: nil, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) { + // 不设置任何mock期望 + }, + expectedError: true, + description: "传入nil模板应该返回错误", + }, + { + name: "失败 - ID生成错误", + template: &entity.EvaluatorTemplate{ + SpaceID: 100, + Name: "Test Template", + Description: "Test Description", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) { + mockIDGen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return(nil, errors.New("id generation error")) + }, + expectedError: true, + description: "ID生成失败应该返回错误", }, { - name: "nil template", - template: nil, + name: "失败 - 模板创建错误", + template: &entity.EvaluatorTemplate{ + SpaceID: 100, + Name: "Test Template", + Description: "Test Description", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) { + mockIDGen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return([]int64{1}, nil) + + mockTemplateDAO.EXPECT(). + CreateEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(nil, errors.New("template creation error")) + }, expectedError: true, - description: "传入nil模板应该返回错误", + description: "模板创建失败应该返回错误", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - mockTemplateDAO := &MockEvaluatorTemplateDAO{} - mockTagDAO := &MockEvaluatorTagDAO{} + ctrl := gomock.NewController(t) + defer ctrl.Finish() - repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, &stubIDGen{}) + mockTagDAO := mysqlmocks.NewMockEvaluatorTagDAO(ctrl) + mockTemplateDAO := mysqlmocks.NewMockEvaluatorTemplateDAO(ctrl) + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) - if tt.template != nil { - mockTemplateDAO.On("CreateEvaluatorTemplate", mock.Anything, mock.Anything, mock.Anything).Return(tt.mockTemplate, tt.mockError) - } + tt.mockSetup(mockTagDAO, mockTemplateDAO, mockIDGen) + + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, mockIDGen) - result, err := repo.CreateEvaluatorTemplate(context.Background(), tt.template) + ctx := session.WithCtxUser(context.Background(), &session.User{ID: "user123"}) + result, err := repo.CreateEvaluatorTemplate(ctx, tt.template) if tt.expectedError { assert.Error(t, err) @@ -610,14 +448,11 @@ func TestEvaluatorTemplateRepoImpl_CreateEvaluatorTemplate(t *testing.T) { } else { assert.NoError(t, err) assert.NotNil(t, result) - assert.Equal(t, tt.expectedResult.ID, result.ID) - assert.Equal(t, tt.expectedResult.SpaceID, result.SpaceID) - assert.Equal(t, tt.expectedResult.Name, result.Name) - assert.Equal(t, tt.expectedResult.Description, result.Description) - assert.Equal(t, tt.expectedResult.EvaluatorType, result.EvaluatorType) + assert.Equal(t, tt.template.SpaceID, result.SpaceID) + assert.Equal(t, tt.template.Name, result.Name) + assert.Equal(t, tt.template.Description, result.Description) + assert.Equal(t, tt.template.EvaluatorType, result.EvaluatorType) } - - mockTemplateDAO.AssertExpectations(t) }) } } @@ -629,58 +464,124 @@ func TestEvaluatorTemplateRepoImpl_UpdateEvaluatorTemplate(t *testing.T) { tests := []struct { name string template *entity.EvaluatorTemplate - mockTemplate *model.EvaluatorTemplate - mockError error - expectedResult *entity.EvaluatorTemplate + mockSetup func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) expectedError bool description string }{ { - name: "successful update", + name: "成功 - 更新模板无标签", template: &entity.EvaluatorTemplate{ ID: 1, SpaceID: 100, Name: "Updated Template", Description: "Updated Description", EvaluatorType: entity.EvaluatorTypePrompt, + Tags: nil, }, - mockTemplate: &model.EvaluatorTemplate{ - ID: 1, - SpaceID: gptr.Of(int64(100)), - Name: gptr.Of("Updated Template"), - Description: gptr.Of("Updated Description"), - EvaluatorType: gptr.Of(int32(1)), + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) { + mockTemplateDAO.EXPECT(). + UpdateEvaluatorTemplate(gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, template *model.EvaluatorTemplate, opts ...interface{}) (*model.EvaluatorTemplate, error) { + return template, nil + }) }, - expectedResult: &entity.EvaluatorTemplate{ + expectedError: false, + description: "成功更新评估器模板（无标签）", + }, + { + name: "成功 - 更新模板标签对齐", + template: &entity.EvaluatorTemplate{ ID: 1, SpaceID: 100, Name: "Updated Template", Description: "Updated Description", EvaluatorType: entity.EvaluatorTypePrompt, + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"category1"}, + }, + }, + }, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) { + mockTemplateDAO.EXPECT(). + UpdateEvaluatorTemplate(gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, template *model.EvaluatorTemplate, opts ...interface{}) (*model.EvaluatorTemplate, error) { + return template, nil + }) + + // 获取现有标签 + mockTagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType(gomock.Any(), []int64{1}, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), string(entity.EvaluatorTagLangType_Zh)). + Return([]*model.EvaluatorTag{ + { + ID: 10, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_Category), + TagValue: "category2", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + }, nil) + + // 删除不需要的标签 + mockTagDAO.EXPECT(). + DeleteEvaluatorTagsByConditions(gomock.Any(), int64(1), int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), string(entity.EvaluatorTagLangType_Zh), gomock.Any()). + Return(nil) + + // 添加新标签 + mockIDGen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return([]int64{20}, nil) + + mockTagDAO.EXPECT(). + BatchCreateEvaluatorTags(gomock.Any(), gomock.Any()). + Return(nil) }, expectedError: false, - description: "成功更新评估器模板", + description: "成功更新评估器模板（标签对齐）", }, { - name: "nil template", - template: nil, + name: "失败 - nil模板", + template: nil, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) { + // 不设置任何mock期望 + }, + expectedError: true, + description: "传入nil模板应该返回错误", + }, + { + name: "失败 - 模板更新错误", + template: &entity.EvaluatorTemplate{ + ID: 1, + SpaceID: 100, + Name: "Updated Template", + Description: "Updated Description", + EvaluatorType: entity.EvaluatorTypePrompt, + }, + mockSetup: func(mockTagDAO *mysqlmocks.MockEvaluatorTagDAO, mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO, mockIDGen *idgenmocks.MockIIDGenerator) { + mockTemplateDAO.EXPECT(). + UpdateEvaluatorTemplate(gomock.Any(), gomock.Any()). + Return(nil, errors.New("template update error")) + }, expectedError: true, - description: "传入nil模板应该返回错误", + description: "模板更新失败应该返回错误", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - mockTemplateDAO := &MockEvaluatorTemplateDAO{} - mockTagDAO := &MockEvaluatorTagDAO{} + ctrl := gomock.NewController(t) + defer ctrl.Finish() - repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, &stubIDGen{}) + mockTagDAO := mysqlmocks.NewMockEvaluatorTagDAO(ctrl) + mockTemplateDAO := mysqlmocks.NewMockEvaluatorTemplateDAO(ctrl) + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) - if tt.template != nil { - mockTemplateDAO.On("UpdateEvaluatorTemplate", mock.Anything, mock.Anything, mock.Anything).Return(tt.mockTemplate, tt.mockError) - } + tt.mockSetup(mockTagDAO, mockTemplateDAO, mockIDGen) + + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, mockIDGen) - result, err := repo.UpdateEvaluatorTemplate(context.Background(), tt.template) + ctx := session.WithCtxUser(context.Background(), &session.User{ID: "user123"}) + result, err := repo.UpdateEvaluatorTemplate(ctx, tt.template) if tt.expectedError { assert.Error(t, err) @@ -688,14 +589,9 @@ func TestEvaluatorTemplateRepoImpl_UpdateEvaluatorTemplate(t *testing.T) { } else { assert.NoError(t, err) assert.NotNil(t, result) - assert.Equal(t, tt.expectedResult.ID, result.ID) - assert.Equal(t, tt.expectedResult.SpaceID, result.SpaceID) - assert.Equal(t, tt.expectedResult.Name, result.Name) - assert.Equal(t, tt.expectedResult.Description, result.Description) - assert.Equal(t, tt.expectedResult.EvaluatorType, result.EvaluatorType) + assert.Equal(t, tt.template.ID, result.ID) + assert.Equal(t, tt.template.Name, result.Name) } - - mockTemplateDAO.AssertExpectations(t) }) } } @@ -708,35 +604,48 @@ func TestEvaluatorTemplateRepoImpl_DeleteEvaluatorTemplate(t *testing.T) { name string id int64 userID string - mockError error + mockSetup func(mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) expectedError bool description string }{ { - name: "successful deletion", - id: 1, - userID: "user123", + name: "成功 - 删除模板", + id: 1, + userID: "user123", + mockSetup: func(mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + mockTemplateDAO.EXPECT(). + DeleteEvaluatorTemplate(gomock.Any(), int64(1), "user123"). + Return(nil) + }, expectedError: false, - description: "成功删除评估器模板", + description: "成功删除评估器模板", }, { - name: "deletion error", - id: 1, - userID: "user123", - mockError: errors.New("database error"), + name: "失败 - 删除错误", + id: 1, + userID: "user123", + mockSetup: func(mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + mockTemplateDAO.EXPECT(). + DeleteEvaluatorTemplate(gomock.Any(), int64(1), "user123"). + Return(errors.New("database error")) + }, expectedError: true, - description: "删除时发生数据库错误", + description: "删除时发生数据库错误", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - mockTemplateDAO := &MockEvaluatorTemplateDAO{} - mockTagDAO := &MockEvaluatorTagDAO{} + ctrl := gomock.NewController(t) + defer ctrl.Finish() - repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, &stubIDGen{}) + mockTagDAO := mysqlmocks.NewMockEvaluatorTagDAO(ctrl) + mockTemplateDAO := mysqlmocks.NewMockEvaluatorTemplateDAO(ctrl) + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) - mockTemplateDAO.On("DeleteEvaluatorTemplate", mock.Anything, tt.id, tt.userID, mock.Anything).Return(tt.mockError) + tt.mockSetup(mockTemplateDAO) + + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, mockIDGen) err := repo.DeleteEvaluatorTemplate(context.Background(), tt.id, tt.userID) @@ -745,8 +654,6 @@ func TestEvaluatorTemplateRepoImpl_DeleteEvaluatorTemplate(t *testing.T) { } else { assert.NoError(t, err) } - - mockTemplateDAO.AssertExpectations(t) }) } } @@ -759,60 +666,66 @@ func TestEvaluatorTemplateRepoImpl_GetEvaluatorTemplate(t *testing.T) { name string id int64 includeDeleted bool - mockTemplate *model.EvaluatorTemplate - mockError error - expectedResult *entity.EvaluatorTemplate + mockSetup func(mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) expectedError bool description string }{ { - name: "successful get", + name: "成功 - 获取模板", id: 1, includeDeleted: false, - mockTemplate: &model.EvaluatorTemplate{ - ID: 1, - SpaceID: gptr.Of(int64(100)), - Name: gptr.Of("Test Template"), - Description: gptr.Of("Test Description"), - EvaluatorType: gptr.Of(int32(1)), - }, - expectedResult: &entity.EvaluatorTemplate{ - ID: 1, - SpaceID: 100, - Name: "Test Template", - Description: "Test Description", - EvaluatorType: entity.EvaluatorTypePrompt, + mockSetup: func(mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + mockTemplateDAO.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(&model.EvaluatorTemplate{ + ID: 1, + SpaceID: gptr.Of(int64(100)), + Name: gptr.Of("Test Template"), + Description: gptr.Of("Test Description"), + EvaluatorType: gptr.Of(int32(1)), + }, nil) }, expectedError: false, - description: "成功获取评估器模板", + description: "成功获取评估器模板", }, { - name: "template not found", + name: "成功 - 模板不存在", id: 1, includeDeleted: false, - mockTemplate: nil, - expectedResult: nil, - expectedError: false, - description: "模板不存在", + mockSetup: func(mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + mockTemplateDAO.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(nil, nil) + }, + expectedError: false, + description: "模板不存在时返回nil", }, { - name: "database error", + name: "失败 - 数据库错误", id: 1, includeDeleted: false, - mockError: errors.New("database error"), - expectedError: true, - description: "数据库查询错误", + mockSetup: func(mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + mockTemplateDAO.EXPECT(). + GetEvaluatorTemplate(gomock.Any(), int64(1), false). + Return(nil, errors.New("database error")) + }, + expectedError: true, + description: "数据库查询错误", }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - mockTemplateDAO := &MockEvaluatorTemplateDAO{} - mockTagDAO := &MockEvaluatorTagDAO{} + ctrl := gomock.NewController(t) + defer ctrl.Finish() - repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, &stubIDGen{}) + mockTagDAO := mysqlmocks.NewMockEvaluatorTagDAO(ctrl) + mockTemplateDAO := mysqlmocks.NewMockEvaluatorTemplateDAO(ctrl) + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) - mockTemplateDAO.On("GetEvaluatorTemplate", mock.Anything, tt.id, tt.includeDeleted, mock.Anything).Return(tt.mockTemplate, tt.mockError) + tt.mockSetup(mockTemplateDAO) + + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, mockIDGen) result, err := repo.GetEvaluatorTemplate(context.Background(), tt.id, tt.includeDeleted) @@ -821,19 +734,69 @@ func TestEvaluatorTemplateRepoImpl_GetEvaluatorTemplate(t *testing.T) { assert.Nil(t, result) } else { assert.NoError(t, err) - if tt.expectedResult == nil { - assert.Nil(t, result) - } else { - assert.NotNil(t, result) - assert.Equal(t, tt.expectedResult.ID, result.ID) - assert.Equal(t, tt.expectedResult.SpaceID, result.SpaceID) - assert.Equal(t, tt.expectedResult.Name, result.Name) - assert.Equal(t, tt.expectedResult.Description, result.Description) - assert.Equal(t, tt.expectedResult.EvaluatorType, result.EvaluatorType) + if result != nil { + assert.Equal(t, tt.id, result.ID) } } + }) + } +} + +// TestEvaluatorTemplateRepoImpl_IncrPopularityByID 测试增加模板热度 +func TestEvaluatorTemplateRepoImpl_IncrPopularityByID(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + id int64 + mockSetup func(mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) + expectedError bool + description string + }{ + { + name: "成功 - 增加热度", + id: 1, + mockSetup: func(mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + mockTemplateDAO.EXPECT(). + IncrPopularityByID(gomock.Any(), int64(1)). + Return(nil) + }, + expectedError: false, + description: "成功增加模板热度", + }, + { + name: "失败 - 数据库错误", + id: 1, + mockSetup: func(mockTemplateDAO *mysqlmocks.MockEvaluatorTemplateDAO) { + mockTemplateDAO.EXPECT(). + IncrPopularityByID(gomock.Any(), int64(1)). + Return(errors.New("database error")) + }, + expectedError: true, + description: "数据库更新错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() - mockTemplateDAO.AssertExpectations(t) + mockTagDAO := mysqlmocks.NewMockEvaluatorTagDAO(ctrl) + mockTemplateDAO := mysqlmocks.NewMockEvaluatorTemplateDAO(ctrl) + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) + + tt.mockSetup(mockTemplateDAO) + + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, mockIDGen) + + err := repo.IncrPopularityByID(context.Background(), tt.id) + + if tt.expectedError { + assert.Error(t, err) + } else { + assert.NoError(t, err) + } }) } } diff --git a/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go b/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go deleted file mode 100644 index de557b7bf..000000000 --- a/backend/modules/evaluation/infra/repo/evaluator/list_builtin_evaluator_test.go +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (c) 2025 coze-dev Authors -// SPDX-License-Identifier: Apache-2.0 - -package evaluator - -import ( - "context" - "testing" - - "github.com/bytedance/gg/gptr" - "github.com/stretchr/testify/assert" - "go.uber.org/mock/gomock" - - "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" - "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" - "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql" - "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" - "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks" -) - -func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { - tests := []struct { - name string - request *repo.ListBuiltinEvaluatorRequest - mockDaoResult *mysql.ListEvaluatorResponse - mockDaoError error - mockTagResult []*model.EvaluatorTag - mockTagError error - expectedError bool - expectedCount int64 - }{ - { - name: "successful query without filters", - request: &repo.ListBuiltinEvaluatorRequest{ - FilterOption: nil, - PageSize: 10, - PageNum: 1, - IncludeDeleted: false, - }, - mockDaoResult: &mysql.ListEvaluatorResponse{ - TotalCount: 2, - Evaluators: []*model.Evaluator{ - {ID: 1, Name: gptr.Of("test1")}, - {ID: 2, Name: gptr.Of("test2")}, - }, - }, - mockDaoError: nil, - mockTagResult: []*model.EvaluatorTag{ - {SourceID: 1, TagKey: "type", TagValue: "builtin"}, - {SourceID: 2, TagKey: "type", TagValue: "custom"}, - }, - mockTagError: nil, - expectedError: false, - expectedCount: 2, - }, - { - name: "successful query with tags", - request: &repo.ListBuiltinEvaluatorRequest{ - FilterOption: nil, - PageSize: 10, - PageNum: 1, - IncludeDeleted: false, - }, - mockDaoResult: &mysql.ListEvaluatorResponse{ - TotalCount: 1, - Evaluators: []*model.Evaluator{ - {ID: 1, Name: gptr.Of("test1")}, - }, - }, - mockDaoError: nil, - mockTagResult: []*model.EvaluatorTag{ - {SourceID: 1, TagKey: "type", TagValue: "builtin"}, - {SourceID: 1, TagKey: "category", TagValue: "performance"}, - }, - mockTagError: nil, - expectedError: false, - expectedCount: 1, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // 创建mock controller - ctrl := gomock.NewController(t) - defer ctrl.Finish() - - // 创建mock DAOs - mockEvaluatorDao := mocks.NewMockEvaluatorDAO(ctrl) - mockEvaluatorVersionDao := mocks.NewMockEvaluatorVersionDAO(ctrl) - mockTagDao := mocks.NewMockEvaluatorTagDAO(ctrl) - - // 设置evaluatorDao的期望 - if tt.mockDaoResult != nil { - mockEvaluatorDao.EXPECT().ListBuiltinEvaluator(gomock.Any(), gomock.Any()).Return(tt.mockDaoResult, tt.mockDaoError) - } - - // 设置tagDAO的期望 - 使用批量查询 - if tt.mockDaoResult != nil && len(tt.mockDaoResult.Evaluators) > 0 { - // 收集所有evaluator的ID - evaluatorIDs := make([]int64, 0, len(tt.mockDaoResult.Evaluators)) - for _, evaluator := range tt.mockDaoResult.Evaluators { - evaluatorIDs = append(evaluatorIDs, evaluator.ID) - } - - mockTagDao.EXPECT().BatchGetTagsBySourceIDsAndType( - gomock.Any(), - evaluatorIDs, - int32(entity.EvaluatorTagKeyType_Evaluator), - gomock.Any(), - ).Return(tt.mockTagResult, tt.mockTagError).AnyTimes() - } - - // 创建EvaluatorRepoImpl实例 - repo := &EvaluatorRepoImpl{ - evaluatorDao: mockEvaluatorDao, - evaluatorVersionDao: mockEvaluatorVersionDao, - tagDAO: mockTagDao, - } - - // 调用方法 - result, err := repo.ListBuiltinEvaluator(context.Background(), tt.request) - - // 验证结果 - if tt.expectedError { - assert.Error(t, err) - } else { - assert.NoError(t, err) - assert.NotNil(t, result) - assert.Equal(t, tt.expectedCount, result.TotalCount) - } - }) - } -} From ec9a7ec6ee5c078ea65bb3e138122788c8f5ee99 Mon Sep 17 00:00:00 2001 From: tpfz Date: Mon, 3 Nov 2025 19:54:30 +0800 Subject: [PATCH 11/42] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/go.sum | 1 + .../evaluation/domain/evaluator/evaluator.go | 376 ++++++++++- .../domain/evaluator/evaluator_validator.go | 3 + .../domain/evaluator/k-evaluator.go | 268 ++++++++ .../expt/coze.loop.evaluation.expt.go | 106 +++- .../expt/k-coze.loop.evaluation.expt.go | 87 +++ .../convertor/evaluator/evaluator.go | 2 +- .../convertor/evaluator/evaluator_template.go | 42 +- .../convertor/evaluator/evaluator_test.go | 314 +++++++++ .../evaluation/application/experiment_app.go | 111 +++- .../evaluation/application/wire_gen.go | 3 +- .../domain/entity/evaluator_template.go | 3 +- .../evaluator_version_custom_rpc_test.go | 379 +++++++++++ .../evaluation/domain/service/evaluator.go | 4 + .../domain/service/evaluator_impl.go | 41 ++ .../repo/evaluator/evaluator_impl_test.go | 600 +++++++++++++++++- .../convertor/evaluator_template_test.go | 437 +++++++++++++ .../coze.loop.evaluation.expt.thrift | 3 + .../loop/evaluation/domain/evaluator.thrift | 11 + 19 files changed, 2736 insertions(+), 55 deletions(-) create mode 100644 backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc_test.go create mode 100644 backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go diff --git a/backend/go.sum b/backend/go.sum index ed089935d..53bf8e523 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -473,6 +473,7 @@ github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAx github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= +github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go index c6c36bf35..a91db92d3 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go @@ -36,6 +36,10 @@ const ( AccessProtocolRPC = "rpc" + EvaluatorVersionTypeLatest = "Latest" + + EvaluatorVersionTypeBuiltinVisible = "BuiltinVisible" + EvaluatorFilterLogicOpUnknown = "Unknown" EvaluatorFilterLogicOpAnd = "And" @@ -297,6 +301,8 @@ type EvaluatorBoxType = string type AccessProtocol = string +type EvaluatorVersionType = string + // 筛选逻辑操作符 type EvaluatorFilterLogicOp = string @@ -1451,8 +1457,9 @@ type CodeEvaluator struct { LanguageType *LanguageType `thrift:"language_type,1,optional" frugal:"1,optional,string" form:"language_type" json:"language_type,omitempty" query:"language_type"` CodeContent *string `thrift:"code_content,2,optional" frugal:"2,optional,string" form:"code_content" json:"code_content,omitempty" query:"code_content"` // code类型评估器模板中code_template_key + language_type是唯一键；最新版本中存evaluator_template_id - CodeTemplateKey *string `thrift:"code_template_key,3,optional" frugal:"3,optional,string" form:"code_template_key" json:"code_template_key,omitempty" query:"code_template_key"` - CodeTemplateName *string `thrift:"code_template_name,4,optional" frugal:"4,optional,string" form:"code_template_name" json:"code_template_name,omitempty" query:"code_template_name"` + CodeTemplateKey *string `thrift:"code_template_key,3,optional" frugal:"3,optional,string" form:"code_template_key" json:"code_template_key,omitempty" query:"code_template_key"` + CodeTemplateName *string `thrift:"code_template_name,4,optional" frugal:"4,optional,string" form:"code_template_name" json:"code_template_name,omitempty" query:"code_template_name"` + Lang2CodeContent map[LanguageType]string `thrift:"lang_2_code_content,5,optional" frugal:"5,optional,map" form:"lang_2_code_content" json:"lang_2_code_content,omitempty" query:"lang_2_code_content"` } func NewCodeEvaluator() *CodeEvaluator { @@ -1509,6 +1516,18 @@ func (p *CodeEvaluator) GetCodeTemplateName() (v string) { } return *p.CodeTemplateName } + +var CodeEvaluator_Lang2CodeContent_DEFAULT map[LanguageType]string + +func (p *CodeEvaluator) GetLang2CodeContent() (v map[LanguageType]string) { + if p == nil { + return + } + if !p.IsSetLang2CodeContent() { + return CodeEvaluator_Lang2CodeContent_DEFAULT + } + return p.Lang2CodeContent +} func (p *CodeEvaluator) SetLanguageType(val *LanguageType) { p.LanguageType = val } @@ -1521,12 +1540,16 @@ func (p *CodeEvaluator) SetCodeTemplateKey(val *string) { func (p *CodeEvaluator) SetCodeTemplateName(val *string) { p.CodeTemplateName = val } +func (p *CodeEvaluator) SetLang2CodeContent(val map[LanguageType]string) { + p.Lang2CodeContent = val +} var fieldIDToName_CodeEvaluator = map[int16]string{ 1: "language_type", 2: "code_content", 3: "code_template_key", 4: "code_template_name", + 5: "lang_2_code_content", } func (p *CodeEvaluator) IsSetLanguageType() bool { @@ -1545,6 +1568,10 @@ func (p *CodeEvaluator) IsSetCodeTemplateName() bool { return p.CodeTemplateName != nil } +func (p *CodeEvaluator) IsSetLang2CodeContent() bool { + return p.Lang2CodeContent != nil +} + func (p *CodeEvaluator) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -1595,6 +1622,14 @@ func (p *CodeEvaluator) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 5: + if fieldTypeId == thrift.MAP { + if err = p.ReadField5(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } default: if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError @@ -1668,6 +1703,35 @@ func (p *CodeEvaluator) ReadField4(iprot thrift.TProtocol) error { p.CodeTemplateName = _field return nil } +func (p *CodeEvaluator) ReadField5(iprot thrift.TProtocol) error { + _, _, size, err := iprot.ReadMapBegin() + if err != nil { + return err + } + _field := make(map[LanguageType]string, size) + for i := 0; i < size; i++ { + var _key LanguageType + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _key = v + } + + var _val string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _val = v + } + + _field[_key] = _val + } + if err := iprot.ReadMapEnd(); err != nil { + return err + } + p.Lang2CodeContent = _field + return nil +} func (p *CodeEvaluator) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 @@ -1691,6 +1755,10 @@ func (p *CodeEvaluator) Write(oprot thrift.TProtocol) (err error) { fieldId = 4 goto WriteFieldError } + if err = p.writeField5(oprot); err != nil { + fieldId = 5 + goto WriteFieldError + } } if err = oprot.WriteFieldStop(); err != nil { goto WriteFieldStopError @@ -1781,6 +1849,35 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) } +func (p *CodeEvaluator) writeField5(oprot thrift.TProtocol) (err error) { + if p.IsSetLang2CodeContent() { + if err = oprot.WriteFieldBegin("lang_2_code_content", thrift.MAP, 5); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteMapBegin(thrift.STRING, thrift.STRING, len(p.Lang2CodeContent)); err != nil { + return err + } + for k, v := range p.Lang2CodeContent { + if err := oprot.WriteString(k); err != nil { + return err + } + if err := oprot.WriteString(v); err != nil { + return err + } + } + if err := oprot.WriteMapEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 5 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 5 end error: ", p), err) +} func (p *CodeEvaluator) String() string { if p == nil { @@ -1808,6 +1905,9 @@ func (p *CodeEvaluator) DeepEqual(ano *CodeEvaluator) bool { if !p.Field4DeepEqual(ano.CodeTemplateName) { return false } + if !p.Field5DeepEqual(ano.Lang2CodeContent) { + return false + } return true } @@ -1859,6 +1959,19 @@ func (p *CodeEvaluator) Field4DeepEqual(src *string) bool { } return true } +func (p *CodeEvaluator) Field5DeepEqual(src map[LanguageType]string) bool { + + if len(p.Lang2CodeContent) != len(src) { + return false + } + for k, v := range p.Lang2CodeContent { + _src := src[k] + if strings.Compare(v, _src) != 0 { + return false + } + } + return true +} type CustomRPCEvaluator struct { // 自定义评估器编码，例如：EvalBot的给“代码生成-代码正确”赋予CN:480的评估器ID @@ -3403,6 +3516,265 @@ func (p *EvaluatorContent) Field103DeepEqual(src *CustomRPCEvaluator) bool { return true } +// 明确有顺序的 evaluator 与版本映射元素 +type EvaluatorIDVersionItem struct { + EvaluatorID *int64 `thrift:"evaluator_id,1,optional" frugal:"1,optional,i64" json:"evaluator_id" form:"evaluator_id" query:"evaluator_id"` + Version *string `thrift:"version,2,optional" frugal:"2,optional,string" json:"version" form:"version" query:"version"` +} + +func NewEvaluatorIDVersionItem() *EvaluatorIDVersionItem { + return &EvaluatorIDVersionItem{} +} + +func (p *EvaluatorIDVersionItem) InitDefault() { +} + +var EvaluatorIDVersionItem_EvaluatorID_DEFAULT int64 + +func (p *EvaluatorIDVersionItem) GetEvaluatorID() (v int64) { + if p == nil { + return + } + if !p.IsSetEvaluatorID() { + return EvaluatorIDVersionItem_EvaluatorID_DEFAULT + } + return *p.EvaluatorID +} + +var EvaluatorIDVersionItem_Version_DEFAULT string + +func (p *EvaluatorIDVersionItem) GetVersion() (v string) { + if p == nil { + return + } + if !p.IsSetVersion() { + return EvaluatorIDVersionItem_Version_DEFAULT + } + return *p.Version +} +func (p *EvaluatorIDVersionItem) SetEvaluatorID(val *int64) { + p.EvaluatorID = val +} +func (p *EvaluatorIDVersionItem) SetVersion(val *string) { + p.Version = val +} + +var fieldIDToName_EvaluatorIDVersionItem = map[int16]string{ + 1: "evaluator_id", + 2: "version", +} + +func (p *EvaluatorIDVersionItem) IsSetEvaluatorID() bool { + return p.EvaluatorID != nil +} + +func (p *EvaluatorIDVersionItem) IsSetVersion() bool { + return p.Version != nil +} + +func (p *EvaluatorIDVersionItem) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRING { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorIDVersionItem[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorIDVersionItem) ReadField1(iprot thrift.TProtocol) error { + + var _field *int64 + if v, err := iprot.ReadI64(); err != nil { + return err + } else { + _field = &v + } + p.EvaluatorID = _field + return nil +} +func (p *EvaluatorIDVersionItem) ReadField2(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Version = _field + return nil +} + +func (p *EvaluatorIDVersionItem) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("EvaluatorIDVersionItem"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorIDVersionItem) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluatorID() { + if err = oprot.WriteFieldBegin("evaluator_id", thrift.I64, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.EvaluatorID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *EvaluatorIDVersionItem) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetVersion() { + if err = oprot.WriteFieldBegin("version", thrift.STRING, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Version); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} + +func (p *EvaluatorIDVersionItem) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorIDVersionItem(%+v)", *p) + +} + +func (p *EvaluatorIDVersionItem) DeepEqual(ano *EvaluatorIDVersionItem) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.EvaluatorID) { + return false + } + if !p.Field2DeepEqual(ano.Version) { + return false + } + return true +} + +func (p *EvaluatorIDVersionItem) Field1DeepEqual(src *int64) bool { + + if p.EvaluatorID == src { + return true + } else if p.EvaluatorID == nil || src == nil { + return false + } + if *p.EvaluatorID != *src { + return false + } + return true +} +func (p *EvaluatorIDVersionItem) Field2DeepEqual(src *string) bool { + + if p.Version == src { + return true + } else if p.Version == nil || src == nil { + return false + } + if strings.Compare(*p.Version, *src) != 0 { + return false + } + return true +} + type Evaluator struct { EvaluatorID *int64 `thrift:"evaluator_id,1,optional" frugal:"1,optional,i64" json:"evaluator_id" form:"evaluator_id" query:"evaluator_id"` WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" form:"workspace_id" query:"workspace_id"` diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go index 42ab119e6..eea553d0f 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go @@ -77,6 +77,9 @@ func (p *EvaluatorContent) IsValid() error { } return nil } +func (p *EvaluatorIDVersionItem) IsValid() error { + return nil +} func (p *Evaluator) IsValid() error { if p.BaseInfo != nil { if err := p.BaseInfo.IsValid(); err != nil { diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go index 690882344..f657a4b6d 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go @@ -944,6 +944,20 @@ func (p *CodeEvaluator) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 5: + if fieldTypeId == thrift.MAP { + l, err = p.FastReadField5(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 + } + } default: l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -1018,6 +1032,38 @@ func (p *CodeEvaluator) FastReadField4(buf []byte) (int, error) { return offset, nil } +func (p *CodeEvaluator) FastReadField5(buf []byte) (int, error) { + offset := 0 + + _, _, size, l, err := thrift.Binary.ReadMapBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make(map[LanguageType]string, size) + for i := 0; i < size; i++ { + var _key LanguageType + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _key = v + } + + var _val string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _val = v + } + + _field[_key] = _val + } + p.Lang2CodeContent = _field + return offset, nil +} + func (p *CodeEvaluator) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } @@ -1029,6 +1075,7 @@ func (p *CodeEvaluator) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset += p.fastWriteField2(buf[offset:], w) offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField4(buf[offset:], w) + offset += p.fastWriteField5(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) return offset @@ -1041,6 +1088,7 @@ func (p *CodeEvaluator) BLength() int { l += p.field2Length() l += p.field3Length() l += p.field4Length() + l += p.field5Length() } l += thrift.Binary.FieldStopLength() return l @@ -1082,6 +1130,23 @@ func (p *CodeEvaluator) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { return offset } +func (p *CodeEvaluator) fastWriteField5(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetLang2CodeContent() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.MAP, 5) + mapBeginOffset := offset + offset += thrift.Binary.MapBeginLength() + var length int + for k, v := range p.Lang2CodeContent { + length++ + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, k) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, v) + } + thrift.Binary.WriteMapBegin(buf[mapBeginOffset:], thrift.STRING, thrift.STRING, length) + } + return offset +} + func (p *CodeEvaluator) field1Length() int { l := 0 if p.IsSetLanguageType() { @@ -1118,6 +1183,21 @@ func (p *CodeEvaluator) field4Length() int { return l } +func (p *CodeEvaluator) field5Length() int { + l := 0 + if p.IsSetLang2CodeContent() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.MapBeginLength() + for k, v := range p.Lang2CodeContent { + _, _ = k, v + + l += thrift.Binary.StringLengthNocopy(k) + l += thrift.Binary.StringLengthNocopy(v) + } + } + return l +} + func (p *CodeEvaluator) DeepCopy(s interface{}) error { src, ok := s.(*CodeEvaluator) if !ok { @@ -1153,6 +1233,21 @@ func (p *CodeEvaluator) DeepCopy(s interface{}) error { p.CodeTemplateName = &tmp } + if src.Lang2CodeContent != nil { + p.Lang2CodeContent = make(map[LanguageType]string, len(src.Lang2CodeContent)) + for key, val := range src.Lang2CodeContent { + var _key LanguageType + _key = key + + var _val string + if val != "" { + _val = kutils.StringDeepCopy(val) + } + + p.Lang2CodeContent[_key] = _val + } + } + return nil } @@ -2286,6 +2381,179 @@ func (p *EvaluatorContent) DeepCopy(s interface{}) error { return nil } +func (p *EvaluatorIDVersionItem) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.I64 { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField2(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorIDVersionItem[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorIDVersionItem) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field *int64 + if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.EvaluatorID = _field + return offset, nil +} + +func (p *EvaluatorIDVersionItem) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Version = _field + return offset, nil +} + +func (p *EvaluatorIDVersionItem) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorIDVersionItem) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorIDVersionItem) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorIDVersionItem) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetEvaluatorID() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], *p.EvaluatorID) + } + return offset +} + +func (p *EvaluatorIDVersionItem) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetVersion() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 2) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Version) + } + return offset +} + +func (p *EvaluatorIDVersionItem) field1Length() int { + l := 0 + if p.IsSetEvaluatorID() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *EvaluatorIDVersionItem) field2Length() int { + l := 0 + if p.IsSetVersion() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Version) + } + return l +} + +func (p *EvaluatorIDVersionItem) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorIDVersionItem) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.EvaluatorID != nil { + tmp := *src.EvaluatorID + p.EvaluatorID = &tmp + } + + if src.Version != nil { + var tmp string + if *src.Version != "" { + tmp = kutils.StringDeepCopy(*src.Version) + } + p.Version = &tmp + } + + return nil +} + func (p *Evaluator) FastRead(buf []byte) (int, error) { var err error 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 ee7fe7866..e7aa91950 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 @@ -10,6 +10,7 @@ import ( "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/data/domain/dataset" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/eval_set" + "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/expt" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/eval_target" "strings" @@ -1924,9 +1925,11 @@ type SubmitExperimentRequest struct { MaxAliveTime *int64 `thrift:"max_alive_time,31,optional" frugal:"31,optional,i64" form:"max_alive_time" json:"max_alive_time,omitempty"` SourceType *expt.SourceType `thrift:"source_type,32,optional" frugal:"32,optional,SourceType" form:"source_type" json:"source_type,omitempty"` SourceID *string `thrift:"source_id,33,optional" frugal:"33,optional,string" form:"source_id" json:"source_id,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"` + // 补充的评估器id+version关联评估器方式，和evaluator_version_ids共同使用，兼容老逻辑 + EvaluatorIDVersionList []*evaluator.EvaluatorIDVersionItem `thrift:"evaluator_id_version_list,40,optional" frugal:"40,optional,list" form:"evaluator_id_version_list" json:"evaluator_id_version_list,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"` } func NewSubmitExperimentRequest() *SubmitExperimentRequest { @@ -2147,6 +2150,18 @@ func (p *SubmitExperimentRequest) GetSourceID() (v string) { return *p.SourceID } +var SubmitExperimentRequest_EvaluatorIDVersionList_DEFAULT []*evaluator.EvaluatorIDVersionItem + +func (p *SubmitExperimentRequest) GetEvaluatorIDVersionList() (v []*evaluator.EvaluatorIDVersionItem) { + if p == nil { + return + } + if !p.IsSetEvaluatorIDVersionList() { + return SubmitExperimentRequest_EvaluatorIDVersionList_DEFAULT + } + return p.EvaluatorIDVersionList +} + var SubmitExperimentRequest_Ext_DEFAULT map[string]string func (p *SubmitExperimentRequest) GetExt() (v map[string]string) { @@ -2236,6 +2251,9 @@ func (p *SubmitExperimentRequest) SetSourceType(val *expt.SourceType) { func (p *SubmitExperimentRequest) SetSourceID(val *string) { p.SourceID = val } +func (p *SubmitExperimentRequest) SetEvaluatorIDVersionList(val []*evaluator.EvaluatorIDVersionItem) { + p.EvaluatorIDVersionList = val +} func (p *SubmitExperimentRequest) SetExt(val map[string]string) { p.Ext = val } @@ -2265,6 +2283,7 @@ var fieldIDToName_SubmitExperimentRequest = map[int16]string{ 31: "max_alive_time", 32: "source_type", 33: "source_id", + 40: "evaluator_id_version_list", 100: "ext", 200: "session", 255: "Base", @@ -2338,6 +2357,10 @@ func (p *SubmitExperimentRequest) IsSetSourceID() bool { return p.SourceID != nil } +func (p *SubmitExperimentRequest) IsSetEvaluatorIDVersionList() bool { + return p.EvaluatorIDVersionList != nil +} + func (p *SubmitExperimentRequest) IsSetExt() bool { return p.Ext != nil } @@ -2514,6 +2537,14 @@ func (p *SubmitExperimentRequest) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 40: + if fieldTypeId == thrift.LIST { + if err = p.ReadField40(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } case 100: if fieldTypeId == thrift.MAP { if err = p.ReadField100(iprot); err != nil { @@ -2788,6 +2819,29 @@ func (p *SubmitExperimentRequest) ReadField33(iprot thrift.TProtocol) error { p.SourceID = _field return nil } +func (p *SubmitExperimentRequest) ReadField40(iprot thrift.TProtocol) error { + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _field := make([]*evaluator.EvaluatorIDVersionItem, 0, size) + values := make([]evaluator.EvaluatorIDVersionItem, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + + if err := _elem.Read(iprot); err != nil { + return err + } + + _field = append(_field, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + p.EvaluatorIDVersionList = _field + return nil +} func (p *SubmitExperimentRequest) ReadField100(iprot thrift.TProtocol) error { _, _, size, err := iprot.ReadMapBegin() if err != nil { @@ -2912,6 +2966,10 @@ func (p *SubmitExperimentRequest) Write(oprot thrift.TProtocol) (err error) { fieldId = 33 goto WriteFieldError } + if err = p.writeField40(oprot); err != nil { + fieldId = 40 + goto WriteFieldError + } if err = p.writeField100(oprot); err != nil { fieldId = 100 goto WriteFieldError @@ -3280,6 +3338,32 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 33 end error: ", p), err) } +func (p *SubmitExperimentRequest) writeField40(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluatorIDVersionList() { + if err = oprot.WriteFieldBegin("evaluator_id_version_list", thrift.LIST, 40); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteListBegin(thrift.STRUCT, len(p.EvaluatorIDVersionList)); err != nil { + return err + } + for _, v := range p.EvaluatorIDVersionList { + if err := v.Write(oprot); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 40 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 40 end error: ", p), err) +} func (p *SubmitExperimentRequest) writeField100(oprot thrift.TProtocol) (err error) { if p.IsSetExt() { if err = oprot.WriteFieldBegin("ext", thrift.MAP, 100); err != nil { @@ -3414,6 +3498,9 @@ func (p *SubmitExperimentRequest) DeepEqual(ano *SubmitExperimentRequest) bool { if !p.Field33DeepEqual(ano.SourceID) { return false } + if !p.Field40DeepEqual(ano.EvaluatorIDVersionList) { + return false + } if !p.Field100DeepEqual(ano.Ext) { return false } @@ -3624,6 +3711,19 @@ func (p *SubmitExperimentRequest) Field33DeepEqual(src *string) bool { } return true } +func (p *SubmitExperimentRequest) Field40DeepEqual(src []*evaluator.EvaluatorIDVersionItem) bool { + + if len(p.EvaluatorIDVersionList) != len(src) { + return false + } + for i, v := range p.EvaluatorIDVersionList { + _src := src[i] + if !v.DeepEqual(_src) { + return false + } + } + return true +} func (p *SubmitExperimentRequest) Field100DeepEqual(src map[string]string) bool { if len(p.Ext) != len(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 2a61f427f..c77ba145a 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 @@ -15,6 +15,7 @@ import ( "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/data/domain/dataset" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/eval_set" + "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/expt" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/eval_target" ) @@ -24,6 +25,7 @@ var ( _ = dataset.KitexUnusedProtection _ = common.KitexUnusedProtection _ = eval_set.KitexUnusedProtection + _ = evaluator.KitexUnusedProtection _ = expt.KitexUnusedProtection _ = eval_target.KitexUnusedProtection ) @@ -1681,6 +1683,20 @@ func (p *SubmitExperimentRequest) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 40: + if fieldTypeId == thrift.LIST { + l, err = p.FastReadField40(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 100: if fieldTypeId == thrift.MAP { l, err = p.FastReadField100(buf[offset:]) @@ -2018,6 +2034,31 @@ func (p *SubmitExperimentRequest) FastReadField33(buf []byte) (int, error) { return offset, nil } +func (p *SubmitExperimentRequest) FastReadField40(buf []byte) (int, error) { + offset := 0 + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make([]*evaluator.EvaluatorIDVersionItem, 0, size) + values := make([]evaluator.EvaluatorIDVersionItem, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + if l, err := _elem.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + + _field = append(_field, _elem) + } + p.EvaluatorIDVersionList = _field + return offset, nil +} + func (p *SubmitExperimentRequest) FastReadField100(buf []byte) (int, error) { offset := 0 @@ -2099,6 +2140,7 @@ func (p *SubmitExperimentRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWri offset += p.fastWriteField30(buf[offset:], w) offset += p.fastWriteField32(buf[offset:], w) offset += p.fastWriteField33(buf[offset:], w) + offset += p.fastWriteField40(buf[offset:], w) offset += p.fastWriteField100(buf[offset:], w) offset += p.fastWriteField200(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) @@ -2128,6 +2170,7 @@ func (p *SubmitExperimentRequest) BLength() int { l += p.field31Length() l += p.field32Length() l += p.field33Length() + l += p.field40Length() l += p.field100Length() l += p.field200Length() l += p.field255Length() @@ -2310,6 +2353,22 @@ func (p *SubmitExperimentRequest) fastWriteField33(buf []byte, w thrift.NocopyWr return offset } +func (p *SubmitExperimentRequest) fastWriteField40(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetEvaluatorIDVersionList() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.LIST, 40) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range p.EvaluatorIDVersionList { + length++ + offset += v.FastWriteNocopy(buf[offset:], w) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRUCT, length) + } + return offset +} + func (p *SubmitExperimentRequest) fastWriteField100(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetExt() { @@ -2511,6 +2570,19 @@ func (p *SubmitExperimentRequest) field33Length() int { return l } +func (p *SubmitExperimentRequest) field40Length() int { + l := 0 + if p.IsSetEvaluatorIDVersionList() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.ListBeginLength() + for _, v := range p.EvaluatorIDVersionList { + _ = v + l += v.BLength() + } + } + return l +} + func (p *SubmitExperimentRequest) field100Length() int { l := 0 if p.IsSetExt() { @@ -2672,6 +2744,21 @@ func (p *SubmitExperimentRequest) DeepCopy(s interface{}) error { p.SourceID = &tmp } + if src.EvaluatorIDVersionList != nil { + p.EvaluatorIDVersionList = make([]*evaluator.EvaluatorIDVersionItem, 0, len(src.EvaluatorIDVersionList)) + for _, elem := range src.EvaluatorIDVersionList { + var _elem *evaluator.EvaluatorIDVersionItem + if elem != nil { + _elem = &evaluator.EvaluatorIDVersionItem{} + if err := _elem.DeepCopy(elem); err != nil { + return err + } + } + + p.EvaluatorIDVersionList = append(p.EvaluatorIDVersionList, _elem) + } + } + if src.Ext != nil { p.Ext = make(map[string]string, len(src.Ext)) for key, val := range src.Ext { diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go index ac955ff9b..32ea03810 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go @@ -251,7 +251,7 @@ func ConvertEvaluatorContent2DO(content *evaluatordto.EvaluatorContent, evaluato return nil, errorx.NewByCode(errno.InvalidInputDataCode, errorx.WithExtraMsg("code evaluator content is nil")) } - // 标准化语言类型 + // 保持原逻辑：基于旧字段 languageType := evaluatordo.LanguageType(content.CodeEvaluator.GetLanguageType()) normalizedLangType := normalizeLanguageType(languageType) diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go index 9a913dcd3..7e81586f8 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go @@ -237,11 +237,21 @@ func ConvertCodeEvaluatorContentDTO2DO(dto *evaluatordto.CodeEvaluator) *evaluat if dto == nil { return nil } - - return &evaluatordo.CodeEvaluatorContent{ - CodeContent: dto.GetCodeContent(), - LanguageType: evaluatordo.LanguageType(dto.GetLanguageType()), - } + // 新字段优先：lang_2_code_content + if len(dto.GetLang2CodeContent()) > 0 { + // 直接映射为 DO 的 Lang2CodeContent + lang2 := make(map[evaluatordo.LanguageType]string, len(dto.GetLang2CodeContent())) + for k, v := range dto.GetLang2CodeContent() { + lang2[evaluatordo.LanguageType(k)] = v + } + return &evaluatordo.CodeEvaluatorContent{Lang2CodeContent: lang2} + } + // 兼容旧字段：language_type + code_content + return &evaluatordo.CodeEvaluatorContent{ + Lang2CodeContent: map[evaluatordo.LanguageType]string{ + evaluatordo.LanguageType(dto.GetLanguageType()): dto.GetCodeContent(), + }, + } } // ConvertCodeEvaluatorContentDO2DTO 将 CodeEvaluatorContent DO 转换为 DTO @@ -249,9 +259,21 @@ func ConvertCodeEvaluatorContentDO2DTO(do *evaluatordo.CodeEvaluatorContent) *ev if do == nil { return nil } - - return &evaluatordto.CodeEvaluator{ - CodeContent: gptr.Of(do.CodeContent), - LanguageType: gptr.Of(evaluatordto.LanguageType(do.LanguageType)), - } + dto := &evaluatordto.CodeEvaluator{} + if len(do.Lang2CodeContent) > 0 { + lang2 := make(map[evaluatordto.LanguageType]string, len(do.Lang2CodeContent)) + for k, v := range do.Lang2CodeContent { + lang2[evaluatordto.LanguageType(k)] = v + } + dto.SetLang2CodeContent(lang2) + // 兼容旧字段：选择一个主语言回填（稳定选择） + for k, v := range do.Lang2CodeContent { + // 回填后跳出 + dto.LanguageType = gptr.Of(evaluatordto.LanguageType(k)) + dto.CodeContent = gptr.Of(v) + break + } + return dto + } + return dto } diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go index d02443c24..ed1f6015b 100755 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go @@ -1068,3 +1068,317 @@ func TestConvertEvaluatorTagKeyDO2DTO(t *testing.T) { }) } } + +// 新增：覆盖 CodeEvaluatorContent 的 lang_2_code_content 转换路径（DTO -> DO） +func TestConvertCodeEvaluatorContentDTO2DO_OldFieldsToMap(t *testing.T) { + t.Parallel() + + dto := &evaluatordto.CodeEvaluator{ + LanguageType: gptr.Of(evaluatordto.LanguageType("Python")), + CodeContent: gptr.Of("print('old')"), + } + // 使用旧字段，期望转换为单元素 Lang2CodeContent + + do := ConvertCodeEvaluatorContentDTO2DO(dto) + // 期望将 map 完整落入 DO + assert.NotNil(t, do) + assert.NotNil(t, do.Lang2CodeContent) + assert.Equal(t, "print('old')", do.Lang2CodeContent[evaluatordo.LanguageType("Python")]) +} + +// 新增：覆盖 CodeEvaluatorContent 的 lang_2_code_content 转换路径（DO -> DTO） +func TestConvertCodeEvaluatorContentDO2DTO_Lang2(t *testing.T) { + t.Parallel() + + do := &evaluatordo.CodeEvaluatorContent{ + Lang2CodeContent: map[evaluatordo.LanguageType]string{ + evaluatordo.LanguageType("Python"): "print('py')", + }, + } + + dto := ConvertCodeEvaluatorContentDO2DTO(do) + assert.NotNil(t, dto) + // 兼容旧字段：从 map 回填一个 language_type/code_content + assert.Equal(t, "Python", dto.GetLanguageType()) + assert.Equal(t, "print('py')", dto.GetCodeContent()) + // 不校验新字段（兼容老字段即可） +} + +// 新增：覆盖 CodeEvaluatorVersion 的 DTO -> DO（优先根据 language_type 命中 lang_2_code_content） +func TestConvertCodeEvaluatorVersionDTO2DO_Lang2_PickByLanguageType(t *testing.T) { + t.Parallel() + + ev := &evaluatordto.EvaluatorVersion{ + ID: gptr.Of(int64(100)), + Version: gptr.Of("1.0.0"), + Description: gptr.Of("desc"), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{ + LanguageType: gptr.Of(evaluatordto.LanguageType("JS")), + CodeTemplateKey: gptr.Of("tpl-1"), + CodeTemplateName: gptr.Of("TPL1"), + }, + }, + } + // 不使用新字段，使用旧字段验证兼容路径 + ev.EvaluatorContent.CodeEvaluator.CodeContent = gptr.Of("console.log('js')") + + do := ConvertCodeEvaluatorVersionDTO2DO(1, 2, ev) + assert.NotNil(t, do) + assert.Equal(t, int64(1), do.EvaluatorID) + assert.Equal(t, int64(2), do.SpaceID) + // 根据 language_type=JS 命中 map + assert.Equal(t, "console.log('js')", do.CodeContent) + assert.Equal(t, evaluatordo.LanguageType("JS"), do.LanguageType) +} + +// 新增：覆盖 CodeEvaluatorVersion 的 DTO -> DO（未给 language_type 时取第一个） +func TestConvertCodeEvaluatorVersionDTO2DO_Lang2_PickFirst(t *testing.T) { + t.Parallel() + + ev := &evaluatordto.EvaluatorVersion{ + EvaluatorContent: &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{}, + }, + } + // 不使用新字段，使用旧字段验证兼容路径 + ev.EvaluatorContent.CodeEvaluator.LanguageType = gptr.Of(evaluatordto.LanguageType("Python")) + ev.EvaluatorContent.CodeEvaluator.CodeContent = gptr.Of("print('py')") + + do := ConvertCodeEvaluatorVersionDTO2DO(1, 2, ev) + assert.NotNil(t, do) + assert.Equal(t, "print('py')", do.CodeContent) + assert.Equal(t, evaluatordo.LanguageType("Python"), do.LanguageType) +} + +// 新增：覆盖 ConvertEvaluatorContent2DO 的 Code 分支（优先 lang_2_code_content） +func TestConvertEvaluatorContent2DO_Code_Lang2(t *testing.T) { + t.Parallel() + content := &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{ + LanguageType: gptr.Of(evaluatordto.LanguageType("Python")), + }, + } + // 不使用新字段，使用旧字段验证兼容路径 + content.CodeEvaluator.CodeContent = gptr.Of("print('py')") + + do, err := ConvertEvaluatorContent2DO(content, evaluatordto.EvaluatorType_Code) + assert.NoError(t, err) + assert.NotNil(t, do) + if do.CodeEvaluatorVersion == nil { + t.Fatalf("expected CodeEvaluatorVersion not nil") + } + assert.Equal(t, "print('py')", do.CodeEvaluatorVersion.CodeContent) + assert.Equal(t, evaluatordo.LanguageType("Python"), do.CodeEvaluatorVersion.LanguageType) +} + +// TestConvertCustomRPCEvaluatorVersionDTO2DO 测试将 CustomRPC EvaluatorVersion DTO 转换为 DO +func TestConvertCustomRPCEvaluatorVersionDTO2DO(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + evaluatorID int64 + spaceID int64 + dto *evaluatordto.EvaluatorVersion + validate func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion) + description string + }{ + { + name: "nil输入", + evaluatorID: 123, + spaceID: 456, + dto: nil, + validate: func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion) { + assert.Nil(t, result) + }, + description: "nil输入应该返回nil", + }, + { + name: "成功 - 基本转换", + evaluatorID: 123, + spaceID: 456, + dto: &evaluatordto.EvaluatorVersion{ + ID: gptr.Of(int64(789)), + Version: gptr.Of("1.0.0"), + Description: gptr.Of("Test CustomRPC version"), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("PROVIDER_001"), + AccessProtocol: evaluatordto.AccessProtocol("HTTP"), + ServiceName: gptr.Of("test_service"), + Cluster: gptr.Of("test_cluster"), + Timeout: gptr.Of(int64(5000)), + }, + InputSchemas: []*commondto.ArgsSchema{ + { + Key: gptr.Of("input1"), + SupportContentTypes: []commondto.ContentType{"Text"}, + JSONSchema: gptr.Of(`{"type": "string"}`), + }, + }, + OutputSchemas: []*commondto.ArgsSchema{ + { + Key: gptr.Of("output1"), + SupportContentTypes: []commondto.ContentType{"Text"}, + JSONSchema: gptr.Of(`{"type": "string"}`), + }, + }, + }, + }, + validate: func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion) { + assert.NotNil(t, result) + assert.Equal(t, int64(789), result.ID) + assert.Equal(t, int64(123), result.EvaluatorID) + assert.Equal(t, int64(456), result.SpaceID) + assert.Equal(t, "1.0.0", result.Version) + assert.Equal(t, "Test CustomRPC version", result.Description) + assert.Equal(t, evaluatordo.EvaluatorTypeCustomRPC, result.EvaluatorType) + assert.NotNil(t, result.ProviderEvaluatorCode) + assert.Equal(t, "PROVIDER_001", *result.ProviderEvaluatorCode) + assert.Equal(t, evaluatordo.AccessProtocol("HTTP"), evaluatordo.AccessProtocol(result.AccessProtocol)) + assert.NotNil(t, result.ServiceName) + assert.Equal(t, "test_service", *result.ServiceName) + assert.NotNil(t, result.Cluster) + assert.Equal(t, "test_cluster", *result.Cluster) + assert.NotNil(t, result.Timeout) + assert.Equal(t, int64(5000), *result.Timeout) + assert.NotNil(t, result.InputSchemas) + assert.Len(t, result.InputSchemas, 1) + assert.NotNil(t, result.OutputSchemas) + assert.Len(t, result.OutputSchemas, 1) + }, + description: "成功转换CustomRPC评估器版本", + }, + { + name: "成功 - 空EvaluatorContent", + evaluatorID: 123, + spaceID: 456, + dto: &evaluatordto.EvaluatorVersion{ + ID: gptr.Of(int64(789)), + Version: gptr.Of("1.0.0"), + Description: gptr.Of("Test version"), + EvaluatorContent: &evaluatordto.EvaluatorContent{}, + }, + validate: func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion) { + assert.NotNil(t, result) + assert.Equal(t, int64(789), result.ID) + assert.Nil(t, result.InputSchemas) + assert.Nil(t, result.OutputSchemas) + }, + description: "成功转换空EvaluatorContent", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + result := ConvertCustomRPCEvaluatorVersionDTO2DO(tt.evaluatorID, tt.spaceID, tt.dto) + + if tt.validate != nil { + tt.validate(t, result) + } + }) + } +} + +// TestConvertCustomRPCEvaluatorVersionDO2DTO 测试将 CustomRPC EvaluatorVersion DO 转换为 DTO +func TestConvertCustomRPCEvaluatorVersionDO2DTO(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + do *evaluatordo.CustomRPCEvaluatorVersion + validate func(t *testing.T, result *evaluatordto.EvaluatorVersion) + description string + }{ + { + name: "nil输入", + do: nil, + validate: func(t *testing.T, result *evaluatordto.EvaluatorVersion) { + assert.Nil(t, result) + }, + description: "nil输入应该返回nil", + }, + { + name: "成功 - 完整转换", + do: &evaluatordo.CustomRPCEvaluatorVersion{ + ID: 789, + EvaluatorID: 123, + SpaceID: 456, + Version: "1.0.0", + Description: "Test CustomRPC version", + EvaluatorType: evaluatordo.EvaluatorTypeCustomRPC, + ProviderEvaluatorCode: gptr.Of("PROVIDER_001"), + AccessProtocol: evaluatordo.AccessProtocol("HTTP"), + ServiceName: gptr.Of("test_service"), + Cluster: gptr.Of("test_cluster"), + Timeout: gptr.Of(int64(5000)), + InputSchemas: []*evaluatordo.ArgsSchema{ + { + Key: gptr.Of("input1"), + SupportContentTypes: []evaluatordo.ContentType{evaluatordo.ContentTypeText}, + JsonSchema: gptr.Of(`{"type": "string"}`), + }, + }, + OutputSchemas: []*evaluatordo.ArgsSchema{ + { + Key: gptr.Of("output1"), + SupportContentTypes: []evaluatordo.ContentType{evaluatordo.ContentTypeText}, + JsonSchema: gptr.Of(`{"type": "string"}`), + }, + }, + }, + validate: func(t *testing.T, result *evaluatordto.EvaluatorVersion) { + assert.NotNil(t, result) + assert.Equal(t, int64(789), result.GetID()) + assert.Equal(t, "1.0.0", result.GetVersion()) + assert.Equal(t, "Test CustomRPC version", result.GetDescription()) + assert.NotNil(t, result.EvaluatorContent) + assert.NotNil(t, result.EvaluatorContent.CustomRPCEvaluator) + assert.Equal(t, "PROVIDER_001", *result.EvaluatorContent.CustomRPCEvaluator.ProviderEvaluatorCode) + assert.Equal(t, evaluatordto.AccessProtocol("HTTP"), evaluatordto.AccessProtocol(result.EvaluatorContent.CustomRPCEvaluator.AccessProtocol)) + assert.Equal(t, "test_service", *result.EvaluatorContent.CustomRPCEvaluator.ServiceName) + assert.Equal(t, "test_cluster", *result.EvaluatorContent.CustomRPCEvaluator.Cluster) + assert.Equal(t, int64(5000), *result.EvaluatorContent.CustomRPCEvaluator.Timeout) + assert.NotNil(t, result.EvaluatorContent.InputSchemas) + assert.Len(t, result.EvaluatorContent.InputSchemas, 1) + assert.NotNil(t, result.EvaluatorContent.OutputSchemas) + assert.Len(t, result.EvaluatorContent.OutputSchemas, 1) + }, + description: "成功转换CustomRPC评估器版本DO为DTO", + }, + { + name: "成功 - 空字段", + do: &evaluatordo.CustomRPCEvaluatorVersion{ + ID: 789, + EvaluatorID: 123, + SpaceID: 456, + Version: "1.0.0", + Description: "", + EvaluatorType: evaluatordo.EvaluatorTypeCustomRPC, + }, + validate: func(t *testing.T, result *evaluatordto.EvaluatorVersion) { + assert.NotNil(t, result) + assert.Equal(t, "", result.GetDescription()) + assert.Nil(t, result.EvaluatorContent.InputSchemas) + assert.Nil(t, result.EvaluatorContent.OutputSchemas) + }, + description: "成功转换空字段的CustomRPC版本", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + result := ConvertCustomRPCEvaluatorVersionDO2DTO(tt.do) + + if tt.validate != nil { + tt.validate(t, result) + } + }) + } +} + diff --git a/backend/modules/evaluation/application/experiment_app.go b/backend/modules/evaluation/application/experiment_app.go index a399b44ff..8d2b569d7 100644 --- a/backend/modules/evaluation/application/experiment_app.go +++ b/backend/modules/evaluation/application/experiment_app.go @@ -62,6 +62,9 @@ type experimentApplication struct { evalTargetService service.IEvalTargetService evaluationSetItemService service.EvaluationSetItemService annotateService service.IExptAnnotateService + + // 新增：EvaluatorService 用于查询内置评估器版本 + evaluatorService service.EvaluatorService } func NewExperimentApplication( @@ -80,6 +83,7 @@ func NewExperimentApplication( tagRPCAdapter rpc.ITagRPCAdapter, exptResultExportService service.IExptResultExportService, exptInsightAnalysisService service.IExptInsightAnalysisService, + evaluatorService service.EvaluatorService, ) IExperimentApplication { return &experimentApplication{ resultSvc: resultSvc, @@ -98,6 +102,7 @@ func NewExperimentApplication( tagRPCAdapter: tagRPCAdapter, IExptResultExportService: exptResultExportService, IExptInsightAnalysisService: exptInsightAnalysisService, + evaluatorService: evaluatorService, } } @@ -131,11 +136,31 @@ func (e *experimentApplication) SubmitExperiment(ctx context.Context, req *expt. return nil, errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("duplicate evaluator version ids")) } + // 收集 evaluator_version_id（包含顺序解析 EvaluatorIDVersionList） + evalVersionIDs, err := e.resolveEvaluatorVersionIDs(ctx, req) + if err != nil { + return nil, err + } + + // 去重 + if len(evalVersionIDs) > 1 { + seen := map[int64]struct{}{} + uniq := make([]int64, 0, len(evalVersionIDs)) + for _, id := range evalVersionIDs { + if _, ok := seen[id]; ok { + continue + } + seen[id] = struct{}{} + uniq = append(uniq, id) + } + evalVersionIDs = uniq + } + cresp, err := e.CreateExperiment(ctx, &expt.CreateExperimentRequest{ WorkspaceID: req.GetWorkspaceID(), EvalSetVersionID: req.EvalSetVersionID, EvalSetID: req.EvalSetID, - EvaluatorVersionIds: req.EvaluatorVersionIds, + EvaluatorVersionIds: evalVersionIDs, Name: req.Name, Desc: req.Desc, TargetFieldMapping: req.TargetFieldMapping, @@ -172,6 +197,90 @@ func (e *experimentApplication) SubmitExperiment(ctx context.Context, req *expt. }, nil } +// resolveEvaluatorVersionIDs 汇总 evaluator_version_ids： +// 1) 先取请求中的 EvaluatorVersionIds +// 2) 从有序 EvaluatorIDVersionList 中批量解析并按输入顺序回填版本ID +func (e *experimentApplication) resolveEvaluatorVersionIDs(ctx context.Context, req *expt.SubmitExperimentRequest) ([]int64, error) { + evalVersionIDs := make([]int64, 0, len(req.EvaluatorVersionIds)) + evalVersionIDs = append(evalVersionIDs, req.EvaluatorVersionIds...) + + // 解析有序列表并批量查询：将 BuiltinVisible 与普通版本分离，分别批量查，最后按输入顺序回填版本ID + items := req.GetEvaluatorIDVersionList() + builtinIDs := make([]int64, 0) + normalPairs := make([][2]interface{}, 0) + for _, it := range items { + if it == nil { + continue + } + eid := it.GetEvaluatorID() + ver := it.GetVersion() + if eid == 0 || ver == "" { + continue + } + if ver == "BuiltinVisible" { + builtinIDs = append(builtinIDs, eid) + } else { + normalPairs = append(normalPairs, [2]interface{}{eid, ver}) + } + } + + // 批量获取内置与普通版本 + id2Builtin := make(map[int64]*entity.Evaluator, len(builtinIDs)) + if len(builtinIDs) > 0 { + evs, err := e.evaluatorService.BatchGetBuiltinEvaluator(ctx, builtinIDs) + if err != nil { + return nil, err + } + for _, ev := range evs { + if ev != nil { + id2Builtin[ev.ID] = ev + } + } + } + + pair2Eval := make(map[string]*entity.Evaluator, len(normalPairs)) + if len(normalPairs) > 0 { + evs, err := e.evaluatorService.BatchGetEvaluatorByIDAndVersion(ctx, normalPairs) + if err != nil { + return nil, err + } + for _, ev := range evs { + if ev == nil { + continue + } + key := fmt.Sprintf("%d#%s", ev.ID, ev.GetVersion()) + pair2Eval[key] = ev + } + } + + // 按输入顺序回填版本ID + for _, it := range items { + if it == nil { + continue + } + eid := it.GetEvaluatorID() + ver := it.GetVersion() + if eid == 0 || ver == "" { + continue + } + var ev *entity.Evaluator + if ver == "BuiltinVisible" { + ev = id2Builtin[eid] + } else { + key := fmt.Sprintf("%d#%s", eid, ver) + ev = pair2Eval[key] + } + if ev == nil { + continue + } + if verID := ev.GetEvaluatorVersionID(); verID != 0 { + evalVersionIDs = append(evalVersionIDs, verID) + } + } + + return evalVersionIDs, nil +} + func (e *experimentApplication) CheckExperimentName(ctx context.Context, req *expt.CheckExperimentNameRequest) (r *expt.CheckExperimentNameResponse, err error) { if err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ ObjectID: strconv.FormatInt(req.GetWorkspaceID(), 10), diff --git a/backend/modules/evaluation/application/wire_gen.go b/backend/modules/evaluation/application/wire_gen.go index 50a6b4807..14e00b83d 100644 --- a/backend/modules/evaluation/application/wire_gen.go +++ b/backend/modules/evaluation/application/wire_gen.go @@ -8,7 +8,6 @@ package application import ( "context" - "github.com/coze-dev/coze-loop/backend/infra/ck" "github.com/coze-dev/coze-loop/backend/infra/db" "github.com/coze-dev/coze-loop/backend/infra/external/audit" @@ -162,7 +161,7 @@ func InitExperimentApplication(ctx context.Context, idgen2 idgen.IIDGenerator, d iAgentAdapter := agent.NewAgentAdapter() iNotifyRPCAdapter := notify.NewNotifyRPCAdapter() iExptInsightAnalysisService := service.NewInsightAnalysisService(iExptInsightAnalysisRecordRepo, exptEventPublisher, objectStorage, iAgentAdapter, iExptResultExportService, iNotifyRPCAdapter, iUserProvider, iExperimentRepo) - iExperimentApplication := NewExperimentApplication(exptAggrResultService, exptResultService, iExptManager, exptSchedulerEvent, exptItemEvalEvent, idgen2, componentIConfiger, iAuthProvider, userInfoService, iEvalTargetService, evaluationSetItemService, iExptAnnotateService, iTagRPCAdapter, iExptResultExportService, iExptInsightAnalysisService) + iExperimentApplication := NewExperimentApplication(exptAggrResultService, exptResultService, iExptManager, exptSchedulerEvent, exptItemEvalEvent, idgen2, componentIConfiger, iAuthProvider, userInfoService, iEvalTargetService, evaluationSetItemService, iExptAnnotateService, iTagRPCAdapter, iExptResultExportService, iExptInsightAnalysisService, serviceEvaluatorService) return iExperimentApplication, nil } diff --git a/backend/modules/evaluation/domain/entity/evaluator_template.go b/backend/modules/evaluation/domain/entity/evaluator_template.go index ea99b1cc1..33d270811 100644 --- a/backend/modules/evaluation/domain/entity/evaluator_template.go +++ b/backend/modules/evaluation/domain/entity/evaluator_template.go @@ -31,8 +31,7 @@ type PromptEvaluatorContent struct { } type CodeEvaluatorContent struct { - CodeContent string `json:"code_content"` - LanguageType LanguageType `json:"language_type"` + Lang2CodeContent map[LanguageType]string `json:"lang_2_code_content"` } func (do *EvaluatorTemplate) SetBaseInfo(baseInfo *BaseInfo) { diff --git a/backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc_test.go b/backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc_test.go new file mode 100644 index 000000000..2467ff8a3 --- /dev/null +++ b/backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc_test.go @@ -0,0 +1,379 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package entity + +import ( + "testing" + + "github.com/bytedance/gg/gptr" + "github.com/stretchr/testify/assert" + + "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/errno" + "github.com/coze-dev/coze-loop/backend/pkg/errorx" +) + +// TestCustomRPCEvaluatorVersion_ValidateInput 测试验证输入数据 +func TestCustomRPCEvaluatorVersion_ValidateInput(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + evaluator *CustomRPCEvaluatorVersion + input *EvaluatorInputData + wantErr bool + errCode int32 + description string + }{ + { + name: "成功 - 有效输入", + evaluator: &CustomRPCEvaluatorVersion{ + InputSchemas: []*ArgsSchema{ + { + Key: gptr.Of("input1"), + SupportContentTypes: []ContentType{ContentTypeText}, + JsonSchema: gptr.Of(`{"type": "string"}`), + }, + }, + }, + input: &EvaluatorInputData{ + InputFields: map[string]*Content{ + "input1": { + ContentType: gptr.Of(ContentTypeText), + Text: gptr.Of(`"test"`), + }, + }, + }, + wantErr: false, + description: "有效输入应该通过验证", + }, + { + name: "成功 - 输入字段不在schema中（不验证）", + evaluator: &CustomRPCEvaluatorVersion{ + InputSchemas: []*ArgsSchema{ + { + Key: gptr.Of("input1"), + SupportContentTypes: []ContentType{ContentTypeText}, + JsonSchema: gptr.Of(`{"type": "string"}`), + }, + }, + }, + input: &EvaluatorInputData{ + InputFields: map[string]*Content{ + "input2": { + ContentType: gptr.Of(ContentTypeText), + Text: gptr.Of("test"), + }, + }, + }, + wantErr: false, + description: "输入字段不在schema中应该通过验证", + }, + { + name: "成功 - 空输入字段（跳过）", + evaluator: &CustomRPCEvaluatorVersion{ + InputSchemas: []*ArgsSchema{ + { + Key: gptr.Of("input1"), + SupportContentTypes: []ContentType{ContentTypeText}, + JsonSchema: gptr.Of(`{"type": "string"}`), + }, + }, + }, + input: &EvaluatorInputData{ + InputFields: map[string]*Content{ + "input1": nil, + }, + }, + wantErr: false, + description: "空输入字段应该跳过验证", + }, + { + name: "失败 - 不支持的内容类型", + evaluator: &CustomRPCEvaluatorVersion{ + InputSchemas: []*ArgsSchema{ + { + Key: gptr.Of("input1"), + SupportContentTypes: []ContentType{ContentTypeText}, + JsonSchema: gptr.Of(`{"type": "string"}`), + }, + }, + }, + input: &EvaluatorInputData{ + InputFields: map[string]*Content{ + "input1": { + ContentType: gptr.Of(ContentTypeImage), + Text: gptr.Of("test"), + }, + }, + }, + wantErr: true, + errCode: errno.ContentTypeNotSupportedCode, + description: "不支持的内容类型应该返回错误", + }, + { + name: "失败 - JSON Schema验证失败", + evaluator: &CustomRPCEvaluatorVersion{ + InputSchemas: []*ArgsSchema{ + { + Key: gptr.Of("input1"), + SupportContentTypes: []ContentType{ContentTypeText}, + JsonSchema: gptr.Of(`{"type": "number"}`), + }, + }, + }, + input: &EvaluatorInputData{ + InputFields: map[string]*Content{ + "input1": { + ContentType: gptr.Of(ContentTypeText), + Text: gptr.Of(`"not a number"`), + }, + }, + }, + wantErr: true, + errCode: errno.ContentSchemaInvalidCode, + description: "JSON Schema验证失败应该返回错误", + }, + { + name: "成功 - 无InputSchemas", + evaluator: &CustomRPCEvaluatorVersion{ + InputSchemas: []*ArgsSchema{}, + }, + input: &EvaluatorInputData{ + InputFields: map[string]*Content{ + "input1": { + ContentType: gptr.Of(ContentTypeText), + Text: gptr.Of("test"), + }, + }, + }, + wantErr: false, + description: "无InputSchemas时应该通过验证", + }, + { + name: "成功 - 多个输入字段", + evaluator: &CustomRPCEvaluatorVersion{ + InputSchemas: []*ArgsSchema{ + { + Key: gptr.Of("input1"), + SupportContentTypes: []ContentType{ContentTypeText}, + JsonSchema: gptr.Of(`{"type": "string"}`), + }, + { + Key: gptr.Of("input2"), + SupportContentTypes: []ContentType{ContentTypeText}, + JsonSchema: gptr.Of(`{"type": "number"}`), + }, + }, + }, + input: &EvaluatorInputData{ + InputFields: map[string]*Content{ + "input1": { + ContentType: gptr.Of(ContentTypeText), + Text: gptr.Of(`"test"`), + }, + "input2": { + ContentType: gptr.Of(ContentTypeText), + Text: gptr.Of("123"), + }, + }, + }, + wantErr: false, + description: "多个有效输入字段应该通过验证", + }, + { + name: "成功 - 非Text类型（跳过JSON验证）", + evaluator: &CustomRPCEvaluatorVersion{ + InputSchemas: []*ArgsSchema{ + { + Key: gptr.Of("input1"), + SupportContentTypes: []ContentType{ContentTypeImage}, + JsonSchema: gptr.Of(`{"type": "string"}`), + }, + }, + }, + input: &EvaluatorInputData{ + InputFields: map[string]*Content{ + "input1": { + ContentType: gptr.Of(ContentTypeImage), + }, + }, + }, + wantErr: false, + description: "非Text类型应该跳过JSON Schema验证", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + err := tt.evaluator.ValidateInput(tt.input) + + if tt.wantErr { + assert.Error(t, err) + if tt.errCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.errCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + } + }) + } +} + +// TestCustomRPCEvaluatorVersion_ValidateBaseInfo 测试验证基础信息 +func TestCustomRPCEvaluatorVersion_ValidateBaseInfo(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + evaluator *CustomRPCEvaluatorVersion + wantErr bool + errCode int32 + description string + }{ + { + name: "成功 - 有效的基础信息", + evaluator: &CustomRPCEvaluatorVersion{ + ProviderEvaluatorCode: gptr.Of("PROVIDER_001"), + AccessProtocol: AccessProtocol("HTTP"), + ServiceName: gptr.Of("test_service"), + }, + wantErr: false, + description: "有效的基础信息应该通过验证", + }, + { + name: "失败 - nil evaluator", + evaluator: nil, + wantErr: true, + errCode: errno.EvaluatorNotExistCode, + description: "nil evaluator应该返回错误", + }, + { + name: "失败 - 空的ProviderEvaluatorCode", + evaluator: &CustomRPCEvaluatorVersion{ + ProviderEvaluatorCode: gptr.Of(""), + AccessProtocol: AccessProtocol("HTTP"), + ServiceName: gptr.Of("test_service"), + }, + wantErr: true, + errCode: errno.InvalidProviderEvaluatorCodeCode, + description: "空的ProviderEvaluatorCode应该返回错误", + }, + { + name: "失败 - nil ProviderEvaluatorCode", + evaluator: &CustomRPCEvaluatorVersion{ + ProviderEvaluatorCode: nil, + AccessProtocol: AccessProtocol("HTTP"), + ServiceName: gptr.Of("test_service"), + }, + wantErr: true, + errCode: errno.InvalidProviderEvaluatorCodeCode, + description: "nil ProviderEvaluatorCode应该返回错误", + }, + { + name: "失败 - 空的AccessProtocol", + evaluator: &CustomRPCEvaluatorVersion{ + ProviderEvaluatorCode: gptr.Of("PROVIDER_001"), + AccessProtocol: AccessProtocol(""), + ServiceName: gptr.Of("test_service"), + }, + wantErr: true, + errCode: errno.InvalidAccessProtocolCode, + description: "空的AccessProtocol应该返回错误", + }, + { + name: "失败 - 空的ServiceName", + evaluator: &CustomRPCEvaluatorVersion{ + ProviderEvaluatorCode: gptr.Of("PROVIDER_001"), + AccessProtocol: AccessProtocol("HTTP"), + ServiceName: gptr.Of(""), + }, + wantErr: true, + errCode: errno.InvalidServiceNameCode, + description: "空的ServiceName应该返回错误", + }, + { + name: "失败 - nil ServiceName", + evaluator: &CustomRPCEvaluatorVersion{ + ProviderEvaluatorCode: gptr.Of("PROVIDER_001"), + AccessProtocol: AccessProtocol("HTTP"), + ServiceName: nil, + }, + wantErr: true, + errCode: errno.InvalidServiceNameCode, + description: "nil ServiceName应该返回错误", + }, + { + name: "成功 - 所有可选字段都有值", + evaluator: &CustomRPCEvaluatorVersion{ + ProviderEvaluatorCode: gptr.Of("PROVIDER_001"), + AccessProtocol: AccessProtocol("HTTP"), + ServiceName: gptr.Of("test_service"), + Cluster: gptr.Of("test_cluster"), + Timeout: gptr.Of(int64(5000)), + }, + wantErr: false, + description: "所有字段都有值应该通过验证", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + err := tt.evaluator.ValidateBaseInfo() + + if tt.wantErr { + assert.Error(t, err) + if tt.errCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.errCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + } + }) + } +} + +// TestCustomRPCEvaluatorVersion_GettersAndSetters 测试getter和setter方法 +func TestCustomRPCEvaluatorVersion_GettersAndSetters(t *testing.T) { + t.Parallel() + + evaluator := &CustomRPCEvaluatorVersion{} + + // 测试 ID + evaluator.SetID(123) + assert.Equal(t, int64(123), evaluator.GetID()) + + // 测试 EvaluatorID + evaluator.SetEvaluatorID(456) + assert.Equal(t, int64(456), evaluator.GetEvaluatorID()) + + // 测试 SpaceID + evaluator.SetSpaceID(789) + assert.Equal(t, int64(789), evaluator.GetSpaceID()) + + // 测试 Version + evaluator.SetVersion("1.0.0") + assert.Equal(t, "1.0.0", evaluator.GetVersion()) + + // 测试 Description + evaluator.SetDescription("Test description") + assert.Equal(t, "Test description", evaluator.GetDescription()) + + // 测试 BaseInfo + baseInfo := &BaseInfo{ + CreatedBy: &UserInfo{ + UserID: gptr.Of("user1"), + }, + } + evaluator.SetBaseInfo(baseInfo) + assert.Equal(t, baseInfo, evaluator.GetBaseInfo()) +} + diff --git a/backend/modules/evaluation/domain/service/evaluator.go b/backend/modules/evaluation/domain/service/evaluator.go index d80a98ca6..88b8440d5 100644 --- a/backend/modules/evaluation/domain/service/evaluator.go +++ b/backend/modules/evaluation/domain/service/evaluator.go @@ -36,6 +36,10 @@ type EvaluatorService interface { // GetBuiltinEvaluator 根据 evaluatorID 查询元信息，若为预置评估器则按 builtin_visible_version 组装返回 // 非预置评估器则返回nil GetBuiltinEvaluator(ctx context.Context, evaluatorID int64) (*entity.Evaluator, error) + // BatchGetBuiltinEvaluator 批量获取预置评估器（按 visible 版本） + BatchGetBuiltinEvaluator(ctx context.Context, evaluatorIDs []int64) ([]*entity.Evaluator, error) + // BatchGetEvaluatorByIDAndVersion 批量根据 (evaluator_id, version) 查询具体版本 + BatchGetEvaluatorByIDAndVersion(ctx context.Context, pairs [][2]interface{}) ([]*entity.Evaluator, error) // GetEvaluatorVersion 按 version id 单个查询 evaluator_version version // withTags=true 时查询并回填标签（用于内置评估器），需传入 spaceID；否则查询普通评估器 GetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionID int64, includeDeleted bool, withTags bool) (*entity.Evaluator, error) diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index e17c0af72..8858d8553 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -210,6 +210,47 @@ func (e *EvaluatorServiceImpl) GetBuiltinEvaluator(ctx context.Context, evaluato return versions[0], nil } +// BatchGetBuiltinEvaluator 批量获取预置评估器（visible版本） +func (e *EvaluatorServiceImpl) BatchGetBuiltinEvaluator(ctx context.Context, evaluatorIDs []int64) ([]*entity.Evaluator, error) { + if len(evaluatorIDs) == 0 { + return []*entity.Evaluator{}, nil + } + // 批量获取元信息 + metas, err := e.evaluatorRepo.BatchGetEvaluatorMetaByID(ctx, evaluatorIDs, false) + if err != nil { + return nil, err + } + // 组装 (evaluator_id, builtin_visible_version) 对 + pairs := make([][2]interface{}, 0, len(metas)) + for _, meta := range metas { + if meta == nil || !meta.Builtin || meta.BuiltinVisibleVersion == "" { + continue + } + pairs = append(pairs, [2]interface{}{meta.ID, meta.BuiltinVisibleVersion}) + } + if len(pairs) == 0 { + return []*entity.Evaluator{}, nil + } + // 一次性批量获取版本 + versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) + if err != nil { + return nil, err + } + return versions, nil +} + +// BatchGetEvaluatorByIDAndVersion 批量根据 (evaluator_id, version) 查询具体版本 +func (e *EvaluatorServiceImpl) BatchGetEvaluatorByIDAndVersion(ctx context.Context, pairs [][2]interface{}) ([]*entity.Evaluator, error) { + if len(pairs) == 0 { + return []*entity.Evaluator{}, nil + } + versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) + if err != nil { + return nil, err + } + return versions, nil +} + // CreateEvaluator 创建 evaluator_version func (e *EvaluatorServiceImpl) CreateEvaluator(ctx context.Context, evaluator *entity.Evaluator, cid string) (int64, error) { err := e.idem.Set(ctx, e.makeCreateIdemKey(cid), time.Second*10) diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index 10fff1bd2..280fed4df 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -15,6 +15,7 @@ import ( "github.com/coze-dev/coze-loop/backend/infra/db" dbmocks "github.com/coze-dev/coze-loop/backend/infra/db/mocks" idgenmocks "github.com/coze-dev/coze-loop/backend/infra/idgen/mocks" + "github.com/coze-dev/coze-loop/backend/infra/middleware/session" "github.com/coze-dev/coze-loop/backend/infra/platestwrite" platestwritemocks "github.com/coze-dev/coze-loop/backend/infra/platestwrite/mocks" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" @@ -1226,11 +1227,11 @@ func TestEvaluatorRepoImpl_UpdateEvaluatorMeta(t *testing.T) { } err := repo.UpdateEvaluatorMeta(context.Background(), &entity.UpdateEvaluatorMetaRequest{ - ID: tt.id, - SpaceID: 100, // 使用测试用的spaceID - Name: &tt.evaluatorName, + ID: tt.id, + SpaceID: 100, // 使用测试用的spaceID + Name: &tt.evaluatorName, Description: &tt.description, - UpdatedBy: tt.userID, + UpdatedBy: tt.userID, }) assert.Equal(t, tt.expectedError, err) }) @@ -1938,13 +1939,13 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorMeta(t *testing.T) { } err := repo.UpdateEvaluatorMeta(context.Background(), &entity.UpdateEvaluatorMetaRequest{ - ID: tt.id, - SpaceID: 100, // 使用测试用的spaceID - Name: gptr.Of(""), + ID: tt.id, + SpaceID: 100, // 使用测试用的spaceID + Name: gptr.Of(""), Description: gptr.Of(""), - Benchmark: &tt.benchmark, - Vendor: &tt.vendor, - UpdatedBy: tt.userID, + Benchmark: &tt.benchmark, + Vendor: &tt.vendor, + UpdatedBy: tt.userID, }) if tt.expectedError != nil { assert.Error(t, err) @@ -1960,15 +1961,15 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { t.Parallel() tests := []struct { - name string - request *repo.ListBuiltinEvaluatorRequest - mockDaoResult *mysql.ListEvaluatorResponse - mockDaoError error - mockTagResult []*model.EvaluatorTag - mockTagError error - expectedError bool - expectedCount int64 - description string + name string + request *repo.ListBuiltinEvaluatorRequest + mockDaoResult *mysql.ListEvaluatorResponse + mockDaoError error + mockTagResult []*model.EvaluatorTag + mockTagError error + expectedError bool + expectedCount int64 + description string }{ { name: "成功 - 无筛选条件查询", @@ -2054,13 +2055,13 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { PageNum: 1, IncludeDeleted: false, }, - mockDaoResult: nil, - mockDaoError: nil, - mockTagResult: nil, - mockTagError: nil, - expectedError: false, - expectedCount: 0, - description: "筛选条件匹配无结果", + mockDaoResult: nil, + mockDaoError: nil, + mockTagResult: nil, + mockTagError: nil, + expectedError: false, + expectedCount: 0, + description: "筛选条件匹配无结果", }, { name: "失败 - DAO查询错误", @@ -2070,13 +2071,13 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { PageNum: 1, IncludeDeleted: false, }, - mockDaoResult: nil, - mockDaoError: assert.AnError, - mockTagResult: nil, - mockTagError: nil, - expectedError: true, - expectedCount: 0, - description: "DAO查询错误应该返回错误", + mockDaoResult: nil, + mockDaoError: assert.AnError, + mockTagResult: nil, + mockTagError: nil, + expectedError: true, + expectedCount: 0, + description: "DAO查询错误应该返回错误", }, { name: "成功 - 标签查询失败但继续处理", @@ -2092,7 +2093,7 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { {ID: 1, Name: gptr.Of("test1"), EvaluatorType: int32(entity.EvaluatorTypePrompt)}, }, }, - mockDaoError: nil, + mockDaoError: nil, mockTagResult: nil, mockTagError: assert.AnError, expectedError: false, @@ -2231,3 +2232,534 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { }) } } + +// TestEvaluatorRepoImpl_BatchGetEvaluatorVersionsByEvaluatorIDAndVersions 测试批量根据 (evaluator_id, version) 获取版本 +func TestEvaluatorRepoImpl_BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) + mockEvaluatorDAO := evaluatormocks.NewMockEvaluatorDAO(ctrl) + mockEvaluatorVersionDAO := evaluatormocks.NewMockEvaluatorVersionDAO(ctrl) + mockTagDAO := evaluatormocks.NewMockEvaluatorTagDAO(ctrl) + mockDBProvider := dbmocks.NewMockProvider(ctrl) + mockLWT := platestwritemocks.NewMockILatestWriteTracker(ctrl) + mockTemplateDAO := evaluatormocks.NewMockEvaluatorTemplateDAO(ctrl) + + tests := []struct { + name string + pairs [][2]interface{} + mockSetup func() + expectedResult []*entity.Evaluator + expectedError error + description string + }{ + { + name: "成功 - 批量获取版本", + pairs: [][2]interface{}{ + {int64(1), "1.0.0"}, + {int64(2), "2.0.0"}, + }, + mockSetup: func() { + mockEvaluatorVersionDAO.EXPECT(). + BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), [][2]interface{}{ + {int64(1), "1.0.0"}, + {int64(2), "2.0.0"}, + }). + Return([]*model.EvaluatorVersion{ + { + ID: 1, + EvaluatorID: 1, + Version: "1.0.0", + EvaluatorType: gptr.Of(int32(entity.EvaluatorTypePrompt)), + }, + { + ID: 2, + EvaluatorID: 2, + Version: "2.0.0", + EvaluatorType: gptr.Of(int32(entity.EvaluatorTypeCode)), + }, + }, nil) + + mockTagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1, 2}, + int32(entity.EvaluatorTagKeyType_Evaluator), + gomock.Any(), + ).Return([]*model.EvaluatorTag{ + {SourceID: 1, TagKey: "category", TagValue: "test", LangType: "en-US"}, + {SourceID: 2, TagKey: "category", TagValue: "production", LangType: "en-US"}, + }, nil) + }, + expectedError: nil, + description: "成功批量获取评估器版本", + }, + { + name: "成功 - 空pairs", + pairs: [][2]interface{}{}, + mockSetup: func() { + mockEvaluatorVersionDAO.EXPECT(). + BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), [][2]interface{}{}). + Return([]*model.EvaluatorVersion{}, nil) + }, + expectedResult: []*entity.Evaluator{}, + expectedError: nil, + description: "空pairs应该返回空结果", + }, + { + name: "失败 - DAO查询错误", + pairs: [][2]interface{}{ + {int64(1), "1.0.0"}, + }, + mockSetup: func() { + mockEvaluatorVersionDAO.EXPECT(). + BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), gomock.Any()). + Return(nil, assert.AnError) + }, + expectedResult: nil, + expectedError: assert.AnError, + description: "DAO查询错误应该返回错误", + }, + { + name: "成功 - 标签查询失败但继续处理", + pairs: [][2]interface{}{ + {int64(1), "1.0.0"}, + }, + mockSetup: func() { + mockEvaluatorVersionDAO.EXPECT(). + BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), gomock.Any()). + Return([]*model.EvaluatorVersion{ + { + ID: 1, + EvaluatorID: 1, + Version: "1.0.0", + EvaluatorType: gptr.Of(int32(entity.EvaluatorTypePrompt)), + }, + }, nil) + + mockTagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1}, + int32(entity.EvaluatorTagKeyType_Evaluator), + gomock.Any(), + ).Return(nil, assert.AnError) + }, + expectedError: nil, + description: "标签查询失败应该继续处理，返回无标签结果", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + repo := &EvaluatorRepoImpl{ + evaluatorDao: mockEvaluatorDAO, + evaluatorVersionDao: mockEvaluatorVersionDAO, + tagDAO: mockTagDAO, + dbProvider: mockDBProvider, + idgen: mockIDGen, + lwt: mockLWT, + evaluatorTemplateDAO: mockTemplateDAO, + } + + result, err := repo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(context.Background(), tt.pairs) + + assert.Equal(t, tt.expectedError, err) + if err == nil { + if tt.expectedResult != nil { + assert.Equal(t, len(tt.expectedResult), len(result)) + } + if len(tt.pairs) > 0 && len(result) > 0 { + assert.NotNil(t, result[0]) + } + } else { + assert.Nil(t, result) + } + }) + } +} + +// TestEvaluatorRepoImpl_UpdateEvaluatorTags 测试更新评估器标签 +func TestEvaluatorRepoImpl_UpdateEvaluatorTags(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + evaluatorID int64 + tags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string + mockSetup func() + mockSetupWithMocks func(idgen *idgenmocks.MockIIDGenerator, evaluatorDAO *evaluatormocks.MockEvaluatorDAO, evaluatorVersionDAO *evaluatormocks.MockEvaluatorVersionDAO, tagDAO *evaluatormocks.MockEvaluatorTagDAO, dbProvider *dbmocks.MockProvider, lwt *platestwritemocks.MockILatestWriteTracker, templateDAO *evaluatormocks.MockEvaluatorTemplateDAO) + expectedError error + description string + }{ + { + name: "成功 - 新增标签", + evaluatorID: 1, + tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM"}, + entity.EvaluatorTagKey_Objective: {"Quality"}, + }, + }, + mockSetup: func() {}, + mockSetupWithMocks: func(idgen *idgenmocks.MockIIDGenerator, evaluatorDAO *evaluatormocks.MockEvaluatorDAO, evaluatorVersionDAO *evaluatormocks.MockEvaluatorVersionDAO, tagDAO *evaluatormocks.MockEvaluatorTagDAO, dbProvider *dbmocks.MockProvider, lwt *platestwritemocks.MockILatestWriteTracker, templateDAO *evaluatormocks.MockEvaluatorTemplateDAO) { + dbProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + tagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1}, + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + ).Return([]*model.EvaluatorTag{}, nil) + + idgen.EXPECT(). + GenMultiIDs(gomock.Any(), 2). + Return([]int64{1, 2}, nil) + + tagDAO.EXPECT(). + BatchCreateEvaluatorTags(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + }, + expectedError: nil, + description: "成功新增标签", + }, + { + name: "成功 - 删除标签", + evaluatorID: 1, + tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + }, + mockSetup: func() {}, + mockSetupWithMocks: func(idgen *idgenmocks.MockIIDGenerator, evaluatorDAO *evaluatormocks.MockEvaluatorDAO, evaluatorVersionDAO *evaluatormocks.MockEvaluatorVersionDAO, tagDAO *evaluatormocks.MockEvaluatorTagDAO, dbProvider *dbmocks.MockProvider, lwt *platestwritemocks.MockILatestWriteTracker, templateDAO *evaluatormocks.MockEvaluatorTemplateDAO) { + dbProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + tagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1}, + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + ).Return([]*model.EvaluatorTag{ + {SourceID: 1, TagKey: "Category", TagValue: "LLM", LangType: "en-US"}, + {SourceID: 1, TagKey: "Objective", TagValue: "Quality", LangType: "en-US"}, + }, nil) + + tagDAO.EXPECT(). + DeleteEvaluatorTagsByConditions( + gomock.Any(), + int64(1), + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + gomock.Any(), + ).Return(nil) + }, + expectedError: nil, + description: "成功删除不需要的标签", + }, + { + name: "成功 - 新增和删除同时进行", + evaluatorID: 1, + tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM", "Code"}, + entity.EvaluatorTagKey_Objective: {"Quality"}, + }, + }, + mockSetup: func() {}, + mockSetupWithMocks: func(idgen *idgenmocks.MockIIDGenerator, evaluatorDAO *evaluatormocks.MockEvaluatorDAO, evaluatorVersionDAO *evaluatormocks.MockEvaluatorVersionDAO, tagDAO *evaluatormocks.MockEvaluatorTagDAO, dbProvider *dbmocks.MockProvider, lwt *platestwritemocks.MockILatestWriteTracker, templateDAO *evaluatormocks.MockEvaluatorTemplateDAO) { + dbProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + tagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1}, + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + ).Return([]*model.EvaluatorTag{ + {SourceID: 1, TagKey: "Category", TagValue: "LLM", LangType: "en-US"}, + {SourceID: 1, TagKey: "Objective", TagValue: "Speed", LangType: "en-US"}, + }, nil) + + tagDAO.EXPECT(). + DeleteEvaluatorTagsByConditions( + gomock.Any(), + int64(1), + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + gomock.Any(), + ).Return(nil) + + idgen.EXPECT(). + GenMultiIDs(gomock.Any(), 2). + Return([]int64{1, 2}, nil) + + tagDAO.EXPECT(). + BatchCreateEvaluatorTags(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + }, + expectedError: nil, + description: "成功同时新增和删除标签", + }, + { + name: "成功 - 空标签", + evaluatorID: 1, + tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: {}, + }, + mockSetup: func() {}, + mockSetupWithMocks: func(idgen *idgenmocks.MockIIDGenerator, evaluatorDAO *evaluatormocks.MockEvaluatorDAO, evaluatorVersionDAO *evaluatormocks.MockEvaluatorVersionDAO, tagDAO *evaluatormocks.MockEvaluatorTagDAO, dbProvider *dbmocks.MockProvider, lwt *platestwritemocks.MockILatestWriteTracker, templateDAO *evaluatormocks.MockEvaluatorTemplateDAO) { + dbProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + tagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1}, + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + ).Return([]*model.EvaluatorTag{ + {SourceID: 1, TagKey: "Category", TagValue: "LLM", LangType: "en-US"}, + }, nil) + + tagDAO.EXPECT(). + DeleteEvaluatorTagsByConditions( + gomock.Any(), + int64(1), + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + gomock.Any(), + ).Return(nil) + }, + expectedError: nil, + description: "成功清空标签", + }, + { + name: "失败 - 查询已有标签错误", + evaluatorID: 1, + tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + }, + mockSetup: func() {}, + mockSetupWithMocks: func(idgen *idgenmocks.MockIIDGenerator, evaluatorDAO *evaluatormocks.MockEvaluatorDAO, evaluatorVersionDAO *evaluatormocks.MockEvaluatorVersionDAO, tagDAO *evaluatormocks.MockEvaluatorTagDAO, dbProvider *dbmocks.MockProvider, lwt *platestwritemocks.MockILatestWriteTracker, templateDAO *evaluatormocks.MockEvaluatorTemplateDAO) { + dbProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + tagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1}, + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + ).Return(nil, assert.AnError) + }, + expectedError: assert.AnError, + description: "查询已有标签错误应该返回错误", + }, + { + name: "失败 - 生成ID错误", + evaluatorID: 1, + tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + }, + mockSetup: func() {}, + mockSetupWithMocks: func(idgen *idgenmocks.MockIIDGenerator, evaluatorDAO *evaluatormocks.MockEvaluatorDAO, evaluatorVersionDAO *evaluatormocks.MockEvaluatorVersionDAO, tagDAO *evaluatormocks.MockEvaluatorTagDAO, dbProvider *dbmocks.MockProvider, lwt *platestwritemocks.MockILatestWriteTracker, templateDAO *evaluatormocks.MockEvaluatorTemplateDAO) { + dbProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + tagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1}, + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + ).Return([]*model.EvaluatorTag{}, nil) + + idgen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return(nil, assert.AnError) + }, + expectedError: assert.AnError, + description: "生成ID错误应该返回错误", + }, + { + name: "失败 - 创建标签错误", + evaluatorID: 1, + tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + }, + mockSetup: func() {}, + mockSetupWithMocks: func(idgen *idgenmocks.MockIIDGenerator, evaluatorDAO *evaluatormocks.MockEvaluatorDAO, evaluatorVersionDAO *evaluatormocks.MockEvaluatorVersionDAO, tagDAO *evaluatormocks.MockEvaluatorTagDAO, dbProvider *dbmocks.MockProvider, lwt *platestwritemocks.MockILatestWriteTracker, templateDAO *evaluatormocks.MockEvaluatorTemplateDAO) { + dbProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + tagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1}, + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + ).Return([]*model.EvaluatorTag{}, nil) + + idgen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return([]int64{1}, nil) + + tagDAO.EXPECT(). + BatchCreateEvaluatorTags(gomock.Any(), gomock.Any(), gomock.Any()). + Return(assert.AnError) + }, + expectedError: assert.AnError, + description: "创建标签错误应该返回错误", + }, + { + name: "成功 - 多语言标签", + evaluatorID: 1, + tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"大语言模型"}, + }, + }, + mockSetup: func() {}, + mockSetupWithMocks: func(idgen *idgenmocks.MockIIDGenerator, evaluatorDAO *evaluatormocks.MockEvaluatorDAO, evaluatorVersionDAO *evaluatormocks.MockEvaluatorVersionDAO, tagDAO *evaluatormocks.MockEvaluatorTagDAO, dbProvider *dbmocks.MockProvider, lwt *platestwritemocks.MockILatestWriteTracker, templateDAO *evaluatormocks.MockEvaluatorTemplateDAO) { + dbProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + // en-US 语言 - 先处理 + tagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1}, + int32(entity.EvaluatorTagKeyType_Evaluator), + "en-US", + gomock.Any(), + ).Return([]*model.EvaluatorTag{}, nil) + + idgen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return([]int64{1}, nil) + + tagDAO.EXPECT(). + BatchCreateEvaluatorTags(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + + // zh-CN 语言 - 后处理 + tagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{1}, + int32(entity.EvaluatorTagKeyType_Evaluator), + "zh-CN", + gomock.Any(), + ).Return([]*model.EvaluatorTag{}, nil) + + idgen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return([]int64{2}, nil) + + tagDAO.EXPECT(). + BatchCreateEvaluatorTags(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + }, + expectedError: nil, + description: "成功处理多语言标签", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + // 每个测试用例创建独立的mock控制器，避免并行执行时mock期望冲突 + subCtrl := gomock.NewController(t) + defer subCtrl.Finish() + + subMockIDGen := idgenmocks.NewMockIIDGenerator(subCtrl) + subMockEvaluatorDAO := evaluatormocks.NewMockEvaluatorDAO(subCtrl) + subMockEvaluatorVersionDAO := evaluatormocks.NewMockEvaluatorVersionDAO(subCtrl) + subMockTagDAO := evaluatormocks.NewMockEvaluatorTagDAO(subCtrl) + subMockDBProvider := dbmocks.NewMockProvider(subCtrl) + subMockLWT := platestwritemocks.NewMockILatestWriteTracker(subCtrl) + subMockTemplateDAO := evaluatormocks.NewMockEvaluatorTemplateDAO(subCtrl) + + // 设置mock期望 + tt.mockSetupWithMocks(subMockIDGen, subMockEvaluatorDAO, subMockEvaluatorVersionDAO, subMockTagDAO, subMockDBProvider, subMockLWT, subMockTemplateDAO) + + repo := &EvaluatorRepoImpl{ + evaluatorDao: subMockEvaluatorDAO, + evaluatorVersionDao: subMockEvaluatorVersionDAO, + tagDAO: subMockTagDAO, + dbProvider: subMockDBProvider, + idgen: subMockIDGen, + lwt: subMockLWT, + evaluatorTemplateDAO: subMockTemplateDAO, + } + + ctx := context.Background() + ctx = session.WithCtxUser(ctx, &session.User{ID: "test_user"}) + + err := repo.UpdateEvaluatorTags(ctx, tt.evaluatorID, tt.tags) + + assert.Equal(t, tt.expectedError, err) + }) + } +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go new file mode 100644 index 000000000..80e102559 --- /dev/null +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go @@ -0,0 +1,437 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package convertor + +import ( + "testing" + "time" + + "github.com/bytedance/gg/gptr" + "github.com/stretchr/testify/assert" + "gorm.io/gorm" + + evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + "github.com/coze-dev/coze-loop/backend/pkg/lang/ptr" +) + +// TestConvertEvaluatorTemplateDO2PO 测试将 DO 对象转换为 PO 对象 +func TestConvertEvaluatorTemplateDO2PO(t *testing.T) { + t.Parallel() + + baseTime := time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC) + + tests := []struct { + name string + do *evaluatordo.EvaluatorTemplate + wantErr bool + validate func(t *testing.T, po *model.EvaluatorTemplate, err error) + description string + }{ + { + name: "nil输入", + do: nil, + wantErr: false, + validate: func(t *testing.T, po *model.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.Nil(t, po) + }, + description: "nil输入应该返回nil", + }, + { + name: "成功 - Prompt类型模板（基础字段）", + do: &evaluatordo.EvaluatorTemplate{ + ID: 1, + SpaceID: 123, + Name: "Test Template", + Description: "Test Description", + EvaluatorType: evaluatordo.EvaluatorTypePrompt, + ReceiveChatHistory: gptr.Of(true), + Popularity: 100, + Benchmark: "benchmark1", + Vendor: "vendor1", + BaseInfo: &evaluatordo.BaseInfo{ + CreatedBy: &evaluatordo.UserInfo{ + UserID: ptr.Of("user1"), + }, + UpdatedBy: &evaluatordo.UserInfo{ + UserID: ptr.Of("user1"), + }, + CreatedAt: ptr.Of(baseTime.UnixMilli()), + UpdatedAt: ptr.Of(baseTime.UnixMilli()), + }, + }, + wantErr: false, + validate: func(t *testing.T, po *model.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, po) + assert.Equal(t, int64(1), po.ID) + assert.Equal(t, int64(123), gptr.Indirect(po.SpaceID)) + assert.Equal(t, "Test Template", gptr.Indirect(po.Name)) + assert.Equal(t, "Test Description", gptr.Indirect(po.Description)) + assert.Equal(t, int32(evaluatordo.EvaluatorTypePrompt), gptr.Indirect(po.EvaluatorType)) + assert.NotNil(t, po.ReceiveChatHistory) + assert.True(t, gptr.Indirect(po.ReceiveChatHistory)) + assert.Equal(t, int32(100), po.Popularity) + assert.Equal(t, "benchmark1", gptr.Indirect(po.Benchmark)) + assert.Equal(t, "vendor1", gptr.Indirect(po.Vendor)) + assert.Equal(t, "user1", po.CreatedBy) + assert.Equal(t, "user1", po.UpdatedBy) + assert.Equal(t, baseTime, po.CreatedAt) + assert.Equal(t, baseTime, po.UpdatedAt) + }, + description: "成功转换Prompt类型模板（基础字段）", + }, + { + name: "成功 - Code类型模板", + do: &evaluatordo.EvaluatorTemplate{ + ID: 2, + SpaceID: 123, + Name: "Code Template", + EvaluatorType: evaluatordo.EvaluatorTypeCode, + CodeEvaluatorContent: &evaluatordo.CodeEvaluatorContent{ + CodeContent: "def evaluate(): pass", + }, + }, + wantErr: false, + validate: func(t *testing.T, po *model.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, po) + assert.Equal(t, int32(evaluatordo.EvaluatorTypeCode), gptr.Indirect(po.EvaluatorType)) + assert.NotNil(t, po.Metainfo) + }, + description: "成功转换Code类型模板", + }, + { + name: "成功 - 带InputSchemas和OutputSchemas", + do: &evaluatordo.EvaluatorTemplate{ + ID: 3, + SpaceID: 123, + Name: "Template with Schemas", + EvaluatorType: evaluatordo.EvaluatorTypePrompt, + InputSchemas: []*evaluatordo.ArgsSchema{ + { + Key: ptr.Of("input1"), + SupportContentTypes: []evaluatordo.ContentType{evaluatordo.ContentTypeText}, + JsonSchema: ptr.Of(`{"type": "string"}`), + }, + }, + OutputSchemas: []*evaluatordo.ArgsSchema{ + { + Key: ptr.Of("output1"), + SupportContentTypes: []evaluatordo.ContentType{evaluatordo.ContentTypeText}, + JsonSchema: ptr.Of(`{"type": "string"}`), + }, + }, + }, + wantErr: false, + validate: func(t *testing.T, po *model.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, po) + assert.NotNil(t, po.InputSchema) + assert.NotNil(t, po.OutputSchema) + }, + description: "成功转换带Schemas的模板", + }, + { + name: "成功 - 带删除时间", + do: &evaluatordo.EvaluatorTemplate{ + ID: 4, + SpaceID: 123, + Name: "Deleted Template", + EvaluatorType: evaluatordo.EvaluatorTypePrompt, + BaseInfo: &evaluatordo.BaseInfo{ + DeletedAt: ptr.Of(baseTime.UnixMilli()), + }, + }, + wantErr: false, + validate: func(t *testing.T, po *model.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, po) + assert.True(t, po.DeletedAt.Valid) + assert.Equal(t, baseTime, po.DeletedAt.Time) + }, + description: "成功转换带删除时间的模板", + }, + { + name: "成功 - Prompt类型带PromptEvaluatorContent", + do: &evaluatordo.EvaluatorTemplate{ + ID: 5, + SpaceID: 123, + Name: "Prompt Template with Content", + EvaluatorType: evaluatordo.EvaluatorTypePrompt, + PromptEvaluatorContent: &evaluatordo.PromptEvaluatorContent{ + MessageList: []*evaluatordo.Message{ + { + Content: &evaluatordo.Content{ + Text: gptr.Of("test message"), + }, + }, + }, + }, + }, + wantErr: false, + validate: func(t *testing.T, po *model.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, po) + assert.NotNil(t, po.Metainfo) + }, + description: "成功转换带PromptEvaluatorContent的模板", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + po, err := ConvertEvaluatorTemplateDO2PO(tt.do) + + if tt.wantErr { + assert.Error(t, err) + } else { + tt.validate(t, po, err) + } + }) + } +} + +// TestConvertEvaluatorTemplatePO2DO 测试将 PO 对象转换为 DO 对象 +func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + po *model.EvaluatorTemplate + wantErr bool + validate func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) + description string + }{ + { + name: "nil输入", + po: nil, + wantErr: false, + validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.Nil(t, do) + }, + description: "nil输入应该返回nil", + }, + { + name: "成功 - Prompt类型模板", + po: &model.EvaluatorTemplate{ + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Test Template"), + Description: gptr.Of("Test Description"), + EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypePrompt)), + ReceiveChatHistory: gptr.Of(true), + Popularity: 100, + Benchmark: gptr.Of("benchmark1"), + Vendor: gptr.Of("vendor1"), + }, + wantErr: false, + validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, do) + assert.Equal(t, int64(1), do.ID) + assert.Equal(t, int64(123), do.SpaceID) + assert.Equal(t, "Test Template", do.Name) + assert.Equal(t, "Test Description", do.Description) + assert.Equal(t, evaluatordo.EvaluatorTypePrompt, do.EvaluatorType) + assert.NotNil(t, do.ReceiveChatHistory) + assert.True(t, gptr.Indirect(do.ReceiveChatHistory)) + assert.Equal(t, int32(100), do.Popularity) + assert.Equal(t, "benchmark1", do.Benchmark) + assert.Equal(t, "vendor1", do.Vendor) + assert.NotNil(t, do.Tags) + }, + description: "成功转换Prompt类型模板", + }, + { + name: "成功 - Code类型模板", + po: &model.EvaluatorTemplate{ + ID: 2, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Code Template"), + EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypeCode)), + Metainfo: gptr.Of([]byte(`{"code_content":"def evaluate(): pass"}`)), + }, + wantErr: false, + validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, do) + assert.Equal(t, evaluatordo.EvaluatorTypeCode, do.EvaluatorType) + assert.NotNil(t, do.CodeEvaluatorContent) + }, + description: "成功转换Code类型模板", + }, + { + name: "成功 - 带InputSchema和OutputSchema", + po: &model.EvaluatorTemplate{ + ID: 3, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Template with Schemas"), + EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypePrompt)), + InputSchema: gptr.Of([]byte(`[{"key":"input1","support_content_types":["Text"],"json_schema":"{\"type\": \"string\"}"}]`)), + OutputSchema: gptr.Of([]byte(`[{"key":"output1","support_content_types":["Text"],"json_schema":"{\"type\": \"string\"}"}]`)), + }, + wantErr: false, + validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, do) + assert.NotNil(t, do.InputSchemas) + assert.Len(t, do.InputSchemas, 1) + assert.NotNil(t, do.OutputSchemas) + assert.Len(t, do.OutputSchemas, 1) + }, + description: "成功转换带Schemas的模板", + }, + { + name: "失败 - 无效的Metainfo JSON", + po: &model.EvaluatorTemplate{ + ID: 4, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Invalid Template"), + EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypePrompt)), + Metainfo: gptr.Of([]byte(`invalid json`)), + }, + wantErr: true, + validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { + assert.Error(t, err) + }, + description: "无效的Metainfo JSON应该返回错误", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + do, err := ConvertEvaluatorTemplatePO2DO(tt.po) + + if tt.wantErr { + assert.Error(t, err) + } else { + tt.validate(t, do, err) + } + }) + } +} + +// TestConvertEvaluatorTemplatePO2DOWithBaseInfo 测试将 PO 对象转换为 DO 对象（包含基础信息） +func TestConvertEvaluatorTemplatePO2DOWithBaseInfo(t *testing.T) { + t.Parallel() + + baseTime := time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC) + + tests := []struct { + name string + po *model.EvaluatorTemplate + wantErr bool + validate func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) + description string + }{ + { + name: "nil输入", + po: nil, + wantErr: false, + validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.Nil(t, do) + }, + description: "nil输入应该返回nil", + }, + { + name: "成功 - 带基础信息", + po: &model.EvaluatorTemplate{ + ID: 1, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Test Template"), + EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypePrompt)), + CreatedBy: "user1", + UpdatedBy: "user1", + CreatedAt: baseTime, + UpdatedAt: baseTime, + }, + wantErr: false, + validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, do) + assert.NotNil(t, do.GetBaseInfo()) + assert.NotNil(t, do.GetBaseInfo().CreatedBy) + assert.Equal(t, "user1", gptr.Indirect(do.GetBaseInfo().CreatedBy.UserID)) + assert.NotNil(t, do.GetBaseInfo().UpdatedBy) + assert.Equal(t, "user1", gptr.Indirect(do.GetBaseInfo().UpdatedBy.UserID)) + assert.Equal(t, baseTime.UnixMilli(), gptr.Indirect(do.GetBaseInfo().CreatedAt)) + assert.Equal(t, baseTime.UnixMilli(), gptr.Indirect(do.GetBaseInfo().UpdatedAt)) + }, + description: "成功转换带基础信息的模板", + }, + { + name: "成功 - 带删除时间", + po: &model.EvaluatorTemplate{ + ID: 2, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Deleted Template"), + EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypePrompt)), + CreatedBy: "user1", + UpdatedBy: "user1", + CreatedAt: baseTime, + UpdatedAt: baseTime, + DeletedAt: gorm.DeletedAt{ + Time: baseTime, + Valid: true, + }, + }, + wantErr: false, + validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, do) + assert.NotNil(t, do.GetBaseInfo()) + assert.NotNil(t, do.GetBaseInfo().DeletedAt) + assert.Equal(t, baseTime.UnixMilli(), gptr.Indirect(do.GetBaseInfo().DeletedAt)) + }, + description: "成功转换带删除时间的模板", + }, + { + name: "成功 - 无删除时间", + po: &model.EvaluatorTemplate{ + ID: 3, + SpaceID: gptr.Of(int64(123)), + Name: gptr.Of("Active Template"), + EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypePrompt)), + CreatedBy: "user1", + UpdatedBy: "user1", + CreatedAt: baseTime, + UpdatedAt: baseTime, + DeletedAt: gorm.DeletedAt{ + Valid: false, + }, + }, + wantErr: false, + validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { + assert.NoError(t, err) + assert.NotNil(t, do) + assert.NotNil(t, do.GetBaseInfo()) + assert.Nil(t, do.GetBaseInfo().DeletedAt) + }, + description: "成功转换无删除时间的模板", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + do, err := ConvertEvaluatorTemplatePO2DOWithBaseInfo(tt.po) + + if tt.wantErr { + assert.Error(t, err) + } else { + tt.validate(t, do, err) + } + }) + } +} + 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 8fdd6247a..fa6903db8 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.expt.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.expt.thrift @@ -6,6 +6,7 @@ include "./domain/eval_set.thrift" include "coze.loop.evaluation.eval_target.thrift" include "./domain/common.thrift" include "./domain/expt.thrift" +include "./domain/evaluator.thrift" struct CreateExperimentRequest { 1: required i64 workspace_id (api.body='workspace_id', api.js_conv='true', go.tag='json:"workspace_id"') @@ -62,6 +63,8 @@ struct SubmitExperimentRequest { 32: optional expt.SourceType source_type (api.body = 'source_type') 33: optional string source_id (api.body = 'source_id') + 40: optional list evaluator_id_version_list (api.body = 'evaluator_id_version_list') // 补充的评估器id+version关联评估器方式，和evaluator_version_ids共同使用，兼容老逻辑 + 100: optional map ext (api.body = 'ext') 200: optional common.Session session diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index ee04b76b2..82d7d91f2 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -54,6 +54,10 @@ const EvaluatorBoxType EvaluatorBoxType_Black = "Black" // 黑盒 typedef string AccessProtocol const AccessProtocol AccessProtocol_RPC = "rpc" +typedef string EvaluatorVersionType(ts.enum="true") +const EvaluatorVersionType EvaluatorVersionType_Latest = "Latest" // 最新版本 +const EvaluatorVersionType EvaluatorVersionType_BuiltinVisible = "BuiltinVisible" // 内置可见版本 + struct Tool { 1: ToolType type (go.tag ='mapstructure:"type"') 2: optional Function function (go.tag ='mapstructure:"function"') @@ -79,6 +83,7 @@ struct CodeEvaluator { 2: optional string code_content 3: optional string code_template_key // code类型评估器模板中code_template_key + language_type是唯一键；最新版本中存evaluator_template_id 4: optional string code_template_name + 5: optional map lang_2_code_content } struct CustomRPCEvaluator { @@ -109,6 +114,12 @@ struct EvaluatorContent { 103: optional CustomRPCEvaluator custom_rpc_evaluator } +// 明确有顺序的 evaluator 与版本映射元素 +struct EvaluatorIDVersionItem { + 1: optional i64 evaluator_id (api.js_conv = 'true', go.tag = 'json:"evaluator_id"') + 2: optional string version (api.js_conv = 'true', go.tag = 'json:"version"') +} + struct Evaluator { 1: optional i64 evaluator_id (api.js_conv = 'true', go.tag = 'json:"evaluator_id"') 2: optional i64 workspace_id (api.js_conv = 'true', go.tag = 'json:"workspace_id"') From 477f9fdcaa1233fe233daccd64dfa31dca28d523 Mon Sep 17 00:00:00 2001 From: tpfz Date: Mon, 3 Nov 2025 21:48:44 +0800 Subject: [PATCH 12/42] =?UTF-8?q?=E5=A2=9E=E5=8A=A0EvaluatorInfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluation/domain/evaluator/evaluator.go | 694 ++++++++++++------ .../domain/evaluator/evaluator_validator.go | 13 + .../domain/evaluator/k-evaluator.go | 472 ++++++++---- .../convertor/evaluator/evaluator.go | 20 +- .../convertor/evaluator/evaluator_template.go | 24 +- .../evaluation/application/evaluator_app.go | 10 +- .../application/experiment_app_test.go | 2 + .../evaluation/domain/entity/evaluator.go | 10 +- .../domain/entity/evaluator_template.go | 5 +- .../modules/evaluation/domain/entity/param.go | 6 +- .../domain/service/evaluator_template_impl.go | 73 +- .../service/evaluator_template_impl_test.go | 15 +- .../service/mocks/evaluator_service_mock.go | 30 + .../infra/repo/evaluator/evaluator_impl.go | 20 +- .../evaluator/evaluator_template_impl_test.go | 13 +- .../evaluator/mysql/convertor/evaluator.go | 20 +- .../mysql/convertor/evaluator_template.go | 20 +- .../convertor/evaluator_template_test.go | 94 +-- .../infra/repo/evaluator/mysql/evaluator.go | 46 +- .../repo/evaluator/mysql/evaluator_tag.go | 17 +- .../mysql/gorm_gen/model/evaluator.gen.go | 3 +- .../gorm_gen/model/evaluator_template.gen.go | 3 +- .../mysql/gorm_gen/query/evaluator.gen.go | 14 +- .../gorm_gen/query/evaluator_template.gen.go | 14 +- .../loop/evaluation/domain/evaluator.thrift | 17 +- .../mysql-init/init-sql/evaluator.sql | 3 +- .../init-sql/evaluator_template.sql | 3 +- 27 files changed, 1107 insertions(+), 554 deletions(-) diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go index a91db92d3..e4b91760f 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go @@ -3775,6 +3775,418 @@ func (p *EvaluatorIDVersionItem) Field2DeepEqual(src *string) bool { return true } +type EvaluatorInfo struct { + Benchmark *string `thrift:"benchmark,1,optional" frugal:"1,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` + Vendor *string `thrift:"vendor,2,optional" frugal:"2,optional,string" json:"vendor" form:"vendor" query:"vendor"` + VendorURL *string `thrift:"vendor_url,3,optional" frugal:"3,optional,string" json:"vendor_url" form:"vendor_url" query:"vendor_url"` + UserManualURL *string `thrift:"user_manual_url,4,optional" frugal:"4,optional,string" json:"user_manual_url" form:"user_manual_url" query:"user_manual_url"` +} + +func NewEvaluatorInfo() *EvaluatorInfo { + return &EvaluatorInfo{} +} + +func (p *EvaluatorInfo) InitDefault() { +} + +var EvaluatorInfo_Benchmark_DEFAULT string + +func (p *EvaluatorInfo) GetBenchmark() (v string) { + if p == nil { + return + } + if !p.IsSetBenchmark() { + return EvaluatorInfo_Benchmark_DEFAULT + } + return *p.Benchmark +} + +var EvaluatorInfo_Vendor_DEFAULT string + +func (p *EvaluatorInfo) GetVendor() (v string) { + if p == nil { + return + } + if !p.IsSetVendor() { + return EvaluatorInfo_Vendor_DEFAULT + } + return *p.Vendor +} + +var EvaluatorInfo_VendorURL_DEFAULT string + +func (p *EvaluatorInfo) GetVendorURL() (v string) { + if p == nil { + return + } + if !p.IsSetVendorURL() { + return EvaluatorInfo_VendorURL_DEFAULT + } + return *p.VendorURL +} + +var EvaluatorInfo_UserManualURL_DEFAULT string + +func (p *EvaluatorInfo) GetUserManualURL() (v string) { + if p == nil { + return + } + if !p.IsSetUserManualURL() { + return EvaluatorInfo_UserManualURL_DEFAULT + } + return *p.UserManualURL +} +func (p *EvaluatorInfo) SetBenchmark(val *string) { + p.Benchmark = val +} +func (p *EvaluatorInfo) SetVendor(val *string) { + p.Vendor = val +} +func (p *EvaluatorInfo) SetVendorURL(val *string) { + p.VendorURL = val +} +func (p *EvaluatorInfo) SetUserManualURL(val *string) { + p.UserManualURL = val +} + +var fieldIDToName_EvaluatorInfo = map[int16]string{ + 1: "benchmark", + 2: "vendor", + 3: "vendor_url", + 4: "user_manual_url", +} + +func (p *EvaluatorInfo) IsSetBenchmark() bool { + return p.Benchmark != nil +} + +func (p *EvaluatorInfo) IsSetVendor() bool { + return p.Vendor != nil +} + +func (p *EvaluatorInfo) IsSetVendorURL() bool { + return p.VendorURL != nil +} + +func (p *EvaluatorInfo) IsSetUserManualURL() bool { + return p.UserManualURL != nil +} + +func (p *EvaluatorInfo) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRING { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.STRING { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 3: + if fieldTypeId == thrift.STRING { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 4: + if fieldTypeId == thrift.STRING { + if err = p.ReadField4(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorInfo[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorInfo) ReadField1(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Benchmark = _field + return nil +} +func (p *EvaluatorInfo) ReadField2(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Vendor = _field + return nil +} +func (p *EvaluatorInfo) ReadField3(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.VendorURL = _field + return nil +} +func (p *EvaluatorInfo) ReadField4(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.UserManualURL = _field + return nil +} + +func (p *EvaluatorInfo) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("EvaluatorInfo"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } + if err = p.writeField4(oprot); err != nil { + fieldId = 4 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorInfo) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetBenchmark() { + if err = oprot.WriteFieldBegin("benchmark", thrift.STRING, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Benchmark); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *EvaluatorInfo) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetVendor() { + if err = oprot.WriteFieldBegin("vendor", thrift.STRING, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Vendor); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *EvaluatorInfo) writeField3(oprot thrift.TProtocol) (err error) { + if p.IsSetVendorURL() { + if err = oprot.WriteFieldBegin("vendor_url", thrift.STRING, 3); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.VendorURL); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} +func (p *EvaluatorInfo) writeField4(oprot thrift.TProtocol) (err error) { + if p.IsSetUserManualURL() { + if err = oprot.WriteFieldBegin("user_manual_url", thrift.STRING, 4); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.UserManualURL); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) +} + +func (p *EvaluatorInfo) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorInfo(%+v)", *p) + +} + +func (p *EvaluatorInfo) DeepEqual(ano *EvaluatorInfo) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Benchmark) { + return false + } + if !p.Field2DeepEqual(ano.Vendor) { + return false + } + if !p.Field3DeepEqual(ano.VendorURL) { + return false + } + if !p.Field4DeepEqual(ano.UserManualURL) { + return false + } + return true +} + +func (p *EvaluatorInfo) Field1DeepEqual(src *string) bool { + + if p.Benchmark == src { + return true + } else if p.Benchmark == nil || src == nil { + return false + } + if strings.Compare(*p.Benchmark, *src) != 0 { + return false + } + return true +} +func (p *EvaluatorInfo) Field2DeepEqual(src *string) bool { + + if p.Vendor == src { + return true + } else if p.Vendor == nil || src == nil { + return false + } + if strings.Compare(*p.Vendor, *src) != 0 { + return false + } + return true +} +func (p *EvaluatorInfo) Field3DeepEqual(src *string) bool { + + if p.VendorURL == src { + return true + } else if p.VendorURL == nil || src == nil { + return false + } + if strings.Compare(*p.VendorURL, *src) != 0 { + return false + } + return true +} +func (p *EvaluatorInfo) Field4DeepEqual(src *string) bool { + + if p.UserManualURL == src { + return true + } else if p.UserManualURL == nil || src == nil { + return false + } + if strings.Compare(*p.UserManualURL, *src) != 0 { + return false + } + return true +} + type Evaluator struct { EvaluatorID *int64 `thrift:"evaluator_id,1,optional" frugal:"1,optional,i64" json:"evaluator_id" form:"evaluator_id" query:"evaluator_id"` WorkspaceID *int64 `thrift:"workspace_id,2,optional" frugal:"2,optional,i64" json:"workspace_id" form:"workspace_id" query:"workspace_id"` @@ -3786,11 +4198,10 @@ type Evaluator struct { CurrentVersion *EvaluatorVersion `thrift:"current_version,11,optional" frugal:"11,optional,EvaluatorVersion" form:"current_version" json:"current_version,omitempty" query:"current_version"` LatestVersion *string `thrift:"latest_version,12,optional" frugal:"12,optional,string" form:"latest_version" json:"latest_version,omitempty" query:"latest_version"` Builtin *bool `thrift:"builtin,20,optional" frugal:"20,optional,bool" json:"builtin" form:"builtin" query:"builtin"` - Benchmark *string `thrift:"benchmark,21,optional" frugal:"21,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` - Vendor *string `thrift:"vendor,22,optional" frugal:"22,optional,string" json:"vendor" form:"vendor" query:"vendor"` - BuiltinVisibleVersion *string `thrift:"builtin_visible_version,23,optional" frugal:"23,optional,string" json:"builtin_visible_version" form:"builtin_visible_version" query:"builtin_visible_version"` + EvaluatorInfo *EvaluatorInfo `thrift:"evaluator_info,21,optional" frugal:"21,optional,EvaluatorInfo" json:"evaluator_info" form:"evaluator_info" query:"evaluator_info"` + BuiltinVisibleVersion *string `thrift:"builtin_visible_version,22,optional" frugal:"22,optional,string" json:"builtin_visible_version" form:"builtin_visible_version" query:"builtin_visible_version"` // 默认白盒 - BoxType *EvaluatorBoxType `thrift:"box_type,24,optional" frugal:"24,optional,string" json:"box_type" form:"box_type" query:"box_type"` + BoxType *EvaluatorBoxType `thrift:"box_type,23,optional" frugal:"23,optional,string" json:"box_type" form:"box_type" query:"box_type"` Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `thrift:"tags,100,optional" frugal:"100,optional,map>>" json:"tags" form:"tags" query:"tags"` } @@ -3921,28 +4332,16 @@ func (p *Evaluator) GetBuiltin() (v bool) { return *p.Builtin } -var Evaluator_Benchmark_DEFAULT string - -func (p *Evaluator) GetBenchmark() (v string) { - if p == nil { - return - } - if !p.IsSetBenchmark() { - return Evaluator_Benchmark_DEFAULT - } - return *p.Benchmark -} - -var Evaluator_Vendor_DEFAULT string +var Evaluator_EvaluatorInfo_DEFAULT *EvaluatorInfo -func (p *Evaluator) GetVendor() (v string) { +func (p *Evaluator) GetEvaluatorInfo() (v *EvaluatorInfo) { if p == nil { return } - if !p.IsSetVendor() { - return Evaluator_Vendor_DEFAULT + if !p.IsSetEvaluatorInfo() { + return Evaluator_EvaluatorInfo_DEFAULT } - return *p.Vendor + return p.EvaluatorInfo } var Evaluator_BuiltinVisibleVersion_DEFAULT string @@ -4010,11 +4409,8 @@ func (p *Evaluator) SetLatestVersion(val *string) { func (p *Evaluator) SetBuiltin(val *bool) { p.Builtin = val } -func (p *Evaluator) SetBenchmark(val *string) { - p.Benchmark = val -} -func (p *Evaluator) SetVendor(val *string) { - p.Vendor = val +func (p *Evaluator) SetEvaluatorInfo(val *EvaluatorInfo) { + p.EvaluatorInfo = val } func (p *Evaluator) SetBuiltinVisibleVersion(val *string) { p.BuiltinVisibleVersion = val @@ -4037,10 +4433,9 @@ var fieldIDToName_Evaluator = map[int16]string{ 11: "current_version", 12: "latest_version", 20: "builtin", - 21: "benchmark", - 22: "vendor", - 23: "builtin_visible_version", - 24: "box_type", + 21: "evaluator_info", + 22: "builtin_visible_version", + 23: "box_type", 100: "tags", } @@ -4084,12 +4479,8 @@ func (p *Evaluator) IsSetBuiltin() bool { return p.Builtin != nil } -func (p *Evaluator) IsSetBenchmark() bool { - return p.Benchmark != nil -} - -func (p *Evaluator) IsSetVendor() bool { - return p.Vendor != nil +func (p *Evaluator) IsSetEvaluatorInfo() bool { + return p.EvaluatorInfo != nil } func (p *Evaluator) IsSetBuiltinVisibleVersion() bool { @@ -4203,7 +4594,7 @@ func (p *Evaluator) Read(iprot thrift.TProtocol) (err error) { goto SkipFieldError } case 21: - if fieldTypeId == thrift.STRING { + if fieldTypeId == thrift.STRUCT { if err = p.ReadField21(iprot); err != nil { goto ReadFieldError } @@ -4226,14 +4617,6 @@ func (p *Evaluator) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } - case 24: - if fieldTypeId == thrift.STRING { - if err = p.ReadField24(iprot); err != nil { - goto ReadFieldError - } - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } case 100: if fieldTypeId == thrift.MAP { if err = p.ReadField100(iprot); err != nil { @@ -4377,29 +4760,15 @@ func (p *Evaluator) ReadField20(iprot thrift.TProtocol) error { return nil } func (p *Evaluator) ReadField21(iprot thrift.TProtocol) error { - - var _field *string - if v, err := iprot.ReadString(); err != nil { + _field := NewEvaluatorInfo() + if err := _field.Read(iprot); err != nil { return err - } else { - _field = &v } - p.Benchmark = _field + p.EvaluatorInfo = _field return nil } func (p *Evaluator) ReadField22(iprot thrift.TProtocol) error { - var _field *string - if v, err := iprot.ReadString(); err != nil { - return err - } else { - _field = &v - } - p.Vendor = _field - return nil -} -func (p *Evaluator) ReadField23(iprot thrift.TProtocol) error { - var _field *string if v, err := iprot.ReadString(); err != nil { return err @@ -4409,7 +4778,7 @@ func (p *Evaluator) ReadField23(iprot thrift.TProtocol) error { p.BuiltinVisibleVersion = _field return nil } -func (p *Evaluator) ReadField24(iprot thrift.TProtocol) error { +func (p *Evaluator) ReadField23(iprot thrift.TProtocol) error { var _field *EvaluatorBoxType if v, err := iprot.ReadString(); err != nil { @@ -4538,10 +4907,6 @@ func (p *Evaluator) Write(oprot thrift.TProtocol) (err error) { fieldId = 23 goto WriteFieldError } - if err = p.writeField24(oprot); err != nil { - fieldId = 24 - goto WriteFieldError - } if err = p.writeField100(oprot); err != nil { fieldId = 100 goto WriteFieldError @@ -4745,11 +5110,11 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 20 end error: ", p), err) } func (p *Evaluator) writeField21(oprot thrift.TProtocol) (err error) { - if p.IsSetBenchmark() { - if err = oprot.WriteFieldBegin("benchmark", thrift.STRING, 21); err != nil { + if p.IsSetEvaluatorInfo() { + if err = oprot.WriteFieldBegin("evaluator_info", thrift.STRUCT, 21); err != nil { goto WriteFieldBeginError } - if err := oprot.WriteString(*p.Benchmark); err != nil { + if err := p.EvaluatorInfo.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -4763,11 +5128,11 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 21 end error: ", p), err) } func (p *Evaluator) writeField22(oprot thrift.TProtocol) (err error) { - if p.IsSetVendor() { - if err = oprot.WriteFieldBegin("vendor", thrift.STRING, 22); err != nil { + if p.IsSetBuiltinVisibleVersion() { + if err = oprot.WriteFieldBegin("builtin_visible_version", thrift.STRING, 22); err != nil { goto WriteFieldBeginError } - if err := oprot.WriteString(*p.Vendor); err != nil { + if err := oprot.WriteString(*p.BuiltinVisibleVersion); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -4781,26 +5146,8 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 22 end error: ", p), err) } func (p *Evaluator) writeField23(oprot thrift.TProtocol) (err error) { - if p.IsSetBuiltinVisibleVersion() { - if err = oprot.WriteFieldBegin("builtin_visible_version", thrift.STRING, 23); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteString(*p.BuiltinVisibleVersion); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 23 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 23 end error: ", p), err) -} -func (p *Evaluator) writeField24(oprot thrift.TProtocol) (err error) { if p.IsSetBoxType() { - if err = oprot.WriteFieldBegin("box_type", thrift.STRING, 24); err != nil { + if err = oprot.WriteFieldBegin("box_type", thrift.STRING, 23); err != nil { goto WriteFieldBeginError } if err := oprot.WriteString(*p.BoxType); err != nil { @@ -4812,9 +5159,9 @@ func (p *Evaluator) writeField24(oprot thrift.TProtocol) (err error) { } return nil WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 24 begin error: ", p), err) + return thrift.PrependError(fmt.Sprintf("%T write field 23 begin error: ", p), err) WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 24 end error: ", p), err) + return thrift.PrependError(fmt.Sprintf("%T write field 23 end error: ", p), err) } func (p *Evaluator) writeField100(oprot thrift.TProtocol) (err error) { if p.IsSetTags() { @@ -4909,16 +5256,13 @@ func (p *Evaluator) DeepEqual(ano *Evaluator) bool { if !p.Field20DeepEqual(ano.Builtin) { return false } - if !p.Field21DeepEqual(ano.Benchmark) { - return false - } - if !p.Field22DeepEqual(ano.Vendor) { + if !p.Field21DeepEqual(ano.EvaluatorInfo) { return false } - if !p.Field23DeepEqual(ano.BuiltinVisibleVersion) { + if !p.Field22DeepEqual(ano.BuiltinVisibleVersion) { return false } - if !p.Field24DeepEqual(ano.BoxType) { + if !p.Field23DeepEqual(ano.BoxType) { return false } if !p.Field100DeepEqual(ano.Tags) { @@ -5037,32 +5381,15 @@ func (p *Evaluator) Field20DeepEqual(src *bool) bool { } return true } -func (p *Evaluator) Field21DeepEqual(src *string) bool { +func (p *Evaluator) Field21DeepEqual(src *EvaluatorInfo) bool { - if p.Benchmark == src { - return true - } else if p.Benchmark == nil || src == nil { - return false - } - if strings.Compare(*p.Benchmark, *src) != 0 { + if !p.EvaluatorInfo.DeepEqual(src) { return false } return true } func (p *Evaluator) Field22DeepEqual(src *string) bool { - if p.Vendor == src { - return true - } else if p.Vendor == nil || src == nil { - return false - } - if strings.Compare(*p.Vendor, *src) != 0 { - return false - } - return true -} -func (p *Evaluator) Field23DeepEqual(src *string) bool { - if p.BuiltinVisibleVersion == src { return true } else if p.BuiltinVisibleVersion == nil || src == nil { @@ -5073,7 +5400,7 @@ func (p *Evaluator) Field23DeepEqual(src *string) bool { } return true } -func (p *Evaluator) Field24DeepEqual(src *EvaluatorBoxType) bool { +func (p *Evaluator) Field23DeepEqual(src *EvaluatorBoxType) bool { if p.BoxType == src { return true @@ -5119,8 +5446,7 @@ type EvaluatorTemplate struct { Description *string `thrift:"description,5,optional" frugal:"5,optional,string" form:"description" json:"description,omitempty" query:"description"` // 热度 Popularity *int64 `thrift:"popularity,6,optional" frugal:"6,optional,i64" json:"popularity" form:"popularity" query:"popularity"` - Benchmark *string `thrift:"benchmark,7,optional" frugal:"7,optional,string" json:"benchmark" form:"benchmark" query:"benchmark"` - Vendor *string `thrift:"vendor,8,optional" frugal:"8,optional,string" json:"vendor" form:"vendor" query:"vendor"` + EvaluatorInfo *EvaluatorInfo `thrift:"evaluator_info,7,optional" frugal:"7,optional,EvaluatorInfo" json:"evaluator_info" form:"evaluator_info" query:"evaluator_info"` Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `thrift:"tags,9,optional" frugal:"9,optional,map>>" json:"tags" form:"tags" query:"tags"` EvaluatorContent *EvaluatorContent `thrift:"evaluator_content,101,optional" frugal:"101,optional,EvaluatorContent" form:"evaluator_content" json:"evaluator_content,omitempty" query:"evaluator_content"` BaseInfo *common.BaseInfo `thrift:"base_info,255,optional" frugal:"255,optional,common.BaseInfo" form:"base_info" json:"base_info,omitempty" query:"base_info"` @@ -5205,28 +5531,16 @@ func (p *EvaluatorTemplate) GetPopularity() (v int64) { return *p.Popularity } -var EvaluatorTemplate_Benchmark_DEFAULT string - -func (p *EvaluatorTemplate) GetBenchmark() (v string) { - if p == nil { - return - } - if !p.IsSetBenchmark() { - return EvaluatorTemplate_Benchmark_DEFAULT - } - return *p.Benchmark -} - -var EvaluatorTemplate_Vendor_DEFAULT string +var EvaluatorTemplate_EvaluatorInfo_DEFAULT *EvaluatorInfo -func (p *EvaluatorTemplate) GetVendor() (v string) { +func (p *EvaluatorTemplate) GetEvaluatorInfo() (v *EvaluatorInfo) { if p == nil { return } - if !p.IsSetVendor() { - return EvaluatorTemplate_Vendor_DEFAULT + if !p.IsSetEvaluatorInfo() { + return EvaluatorTemplate_EvaluatorInfo_DEFAULT } - return *p.Vendor + return p.EvaluatorInfo } var EvaluatorTemplate_Tags_DEFAULT map[EvaluatorTagLangType]map[EvaluatorTagKey][]string @@ -5282,11 +5596,8 @@ func (p *EvaluatorTemplate) SetDescription(val *string) { func (p *EvaluatorTemplate) SetPopularity(val *int64) { p.Popularity = val } -func (p *EvaluatorTemplate) SetBenchmark(val *string) { - p.Benchmark = val -} -func (p *EvaluatorTemplate) SetVendor(val *string) { - p.Vendor = val +func (p *EvaluatorTemplate) SetEvaluatorInfo(val *EvaluatorInfo) { + p.EvaluatorInfo = val } func (p *EvaluatorTemplate) SetTags(val map[EvaluatorTagLangType]map[EvaluatorTagKey][]string) { p.Tags = val @@ -5305,8 +5616,7 @@ var fieldIDToName_EvaluatorTemplate = map[int16]string{ 4: "name", 5: "description", 6: "popularity", - 7: "benchmark", - 8: "vendor", + 7: "evaluator_info", 9: "tags", 101: "evaluator_content", 255: "base_info", @@ -5336,12 +5646,8 @@ func (p *EvaluatorTemplate) IsSetPopularity() bool { return p.Popularity != nil } -func (p *EvaluatorTemplate) IsSetBenchmark() bool { - return p.Benchmark != nil -} - -func (p *EvaluatorTemplate) IsSetVendor() bool { - return p.Vendor != nil +func (p *EvaluatorTemplate) IsSetEvaluatorInfo() bool { + return p.EvaluatorInfo != nil } func (p *EvaluatorTemplate) IsSetTags() bool { @@ -5423,21 +5729,13 @@ func (p *EvaluatorTemplate) Read(iprot thrift.TProtocol) (err error) { goto SkipFieldError } case 7: - if fieldTypeId == thrift.STRING { + if fieldTypeId == thrift.STRUCT { if err = p.ReadField7(iprot); err != nil { goto ReadFieldError } } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } - case 8: - if fieldTypeId == thrift.STRING { - if err = p.ReadField8(iprot); err != nil { - goto ReadFieldError - } - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } case 9: if fieldTypeId == thrift.MAP { if err = p.ReadField9(iprot); err != nil { @@ -5559,25 +5857,11 @@ func (p *EvaluatorTemplate) ReadField6(iprot thrift.TProtocol) error { return nil } func (p *EvaluatorTemplate) ReadField7(iprot thrift.TProtocol) error { - - var _field *string - if v, err := iprot.ReadString(); err != nil { - return err - } else { - _field = &v - } - p.Benchmark = _field - return nil -} -func (p *EvaluatorTemplate) ReadField8(iprot thrift.TProtocol) error { - - var _field *string - if v, err := iprot.ReadString(); err != nil { + _field := NewEvaluatorInfo() + if err := _field.Read(iprot); err != nil { return err - } else { - _field = &v } - p.Vendor = _field + p.EvaluatorInfo = _field return nil } func (p *EvaluatorTemplate) ReadField9(iprot thrift.TProtocol) error { @@ -5690,10 +5974,6 @@ func (p *EvaluatorTemplate) Write(oprot thrift.TProtocol) (err error) { fieldId = 7 goto WriteFieldError } - if err = p.writeField8(oprot); err != nil { - fieldId = 8 - goto WriteFieldError - } if err = p.writeField9(oprot); err != nil { fieldId = 9 goto WriteFieldError @@ -5833,11 +6113,11 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 6 end error: ", p), err) } func (p *EvaluatorTemplate) writeField7(oprot thrift.TProtocol) (err error) { - if p.IsSetBenchmark() { - if err = oprot.WriteFieldBegin("benchmark", thrift.STRING, 7); err != nil { + if p.IsSetEvaluatorInfo() { + if err = oprot.WriteFieldBegin("evaluator_info", thrift.STRUCT, 7); err != nil { goto WriteFieldBeginError } - if err := oprot.WriteString(*p.Benchmark); err != nil { + if err := p.EvaluatorInfo.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -5850,24 +6130,6 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 7 end error: ", p), err) } -func (p *EvaluatorTemplate) writeField8(oprot thrift.TProtocol) (err error) { - if p.IsSetVendor() { - if err = oprot.WriteFieldBegin("vendor", thrift.STRING, 8); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteString(*p.Vendor); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 8 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 8 end error: ", p), err) -} func (p *EvaluatorTemplate) writeField9(oprot thrift.TProtocol) (err error) { if p.IsSetTags() { if err = oprot.WriteFieldBegin("tags", thrift.MAP, 9); err != nil { @@ -5985,10 +6247,7 @@ func (p *EvaluatorTemplate) DeepEqual(ano *EvaluatorTemplate) bool { if !p.Field6DeepEqual(ano.Popularity) { return false } - if !p.Field7DeepEqual(ano.Benchmark) { - return false - } - if !p.Field8DeepEqual(ano.Vendor) { + if !p.Field7DeepEqual(ano.EvaluatorInfo) { return false } if !p.Field9DeepEqual(ano.Tags) { @@ -6075,26 +6334,9 @@ func (p *EvaluatorTemplate) Field6DeepEqual(src *int64) bool { } return true } -func (p *EvaluatorTemplate) Field7DeepEqual(src *string) bool { +func (p *EvaluatorTemplate) Field7DeepEqual(src *EvaluatorInfo) bool { - if p.Benchmark == src { - return true - } else if p.Benchmark == nil || src == nil { - return false - } - if strings.Compare(*p.Benchmark, *src) != 0 { - return false - } - return true -} -func (p *EvaluatorTemplate) Field8DeepEqual(src *string) bool { - - if p.Vendor == src { - return true - } else if p.Vendor == nil || src == nil { - return false - } - if strings.Compare(*p.Vendor, *src) != 0 { + if !p.EvaluatorInfo.DeepEqual(src) { return false } return true diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go index eea553d0f..19253f6e4 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go @@ -80,6 +80,9 @@ func (p *EvaluatorContent) IsValid() error { func (p *EvaluatorIDVersionItem) IsValid() error { return nil } +func (p *EvaluatorInfo) IsValid() error { + return nil +} func (p *Evaluator) IsValid() error { if p.BaseInfo != nil { if err := p.BaseInfo.IsValid(); err != nil { @@ -91,9 +94,19 @@ func (p *Evaluator) IsValid() error { return fmt.Errorf("field CurrentVersion not valid, %w", err) } } + if p.EvaluatorInfo != nil { + if err := p.EvaluatorInfo.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorInfo not valid, %w", err) + } + } return nil } func (p *EvaluatorTemplate) IsValid() error { + if p.EvaluatorInfo != nil { + if err := p.EvaluatorInfo.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorInfo not valid, %w", err) + } + } if p.EvaluatorContent != nil { if err := p.EvaluatorContent.IsValid(); err != nil { return fmt.Errorf("field EvaluatorContent not valid, %w", err) diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go index f657a4b6d..ca24c12fd 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go @@ -2554,6 +2554,294 @@ func (p *EvaluatorIDVersionItem) DeepCopy(s interface{}) error { return nil } +func (p *EvaluatorInfo) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField2(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 3: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField3(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 4: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField4(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorInfo[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorInfo) FastReadField1(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Benchmark = _field + return offset, nil +} + +func (p *EvaluatorInfo) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Vendor = _field + return offset, nil +} + +func (p *EvaluatorInfo) FastReadField3(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.VendorURL = _field + return offset, nil +} + +func (p *EvaluatorInfo) FastReadField4(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.UserManualURL = _field + return offset, nil +} + +func (p *EvaluatorInfo) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorInfo) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) + offset += p.fastWriteField4(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorInfo) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field3Length() + l += p.field4Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorInfo) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBenchmark() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 1) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Benchmark) + } + return offset +} + +func (p *EvaluatorInfo) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetVendor() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 2) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Vendor) + } + return offset +} + +func (p *EvaluatorInfo) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetVendorURL() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 3) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.VendorURL) + } + return offset +} + +func (p *EvaluatorInfo) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetUserManualURL() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 4) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.UserManualURL) + } + return offset +} + +func (p *EvaluatorInfo) field1Length() int { + l := 0 + if p.IsSetBenchmark() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Benchmark) + } + return l +} + +func (p *EvaluatorInfo) field2Length() int { + l := 0 + if p.IsSetVendor() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Vendor) + } + return l +} + +func (p *EvaluatorInfo) field3Length() int { + l := 0 + if p.IsSetVendorURL() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.VendorURL) + } + return l +} + +func (p *EvaluatorInfo) field4Length() int { + l := 0 + if p.IsSetUserManualURL() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.UserManualURL) + } + return l +} + +func (p *EvaluatorInfo) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorInfo) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.Benchmark != nil { + var tmp string + if *src.Benchmark != "" { + tmp = kutils.StringDeepCopy(*src.Benchmark) + } + p.Benchmark = &tmp + } + + if src.Vendor != nil { + var tmp string + if *src.Vendor != "" { + tmp = kutils.StringDeepCopy(*src.Vendor) + } + p.Vendor = &tmp + } + + if src.VendorURL != nil { + var tmp string + if *src.VendorURL != "" { + tmp = kutils.StringDeepCopy(*src.VendorURL) + } + p.VendorURL = &tmp + } + + if src.UserManualURL != nil { + var tmp string + if *src.UserManualURL != "" { + tmp = kutils.StringDeepCopy(*src.UserManualURL) + } + p.UserManualURL = &tmp + } + + return nil +} + func (p *Evaluator) FastRead(buf []byte) (int, error) { var err error @@ -2712,7 +3000,7 @@ func (p *Evaluator) FastRead(buf []byte) (int, error) { } } case 21: - if fieldTypeId == thrift.STRING { + if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField21(buf[offset:]) offset += l if err != nil { @@ -2753,20 +3041,6 @@ func (p *Evaluator) FastRead(buf []byte) (int, error) { goto SkipFieldError } } - case 24: - if fieldTypeId == thrift.STRING { - l, err = p.FastReadField24(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 100: if fieldTypeId == thrift.MAP { l, err = p.FastReadField100(buf[offset:]) @@ -2939,35 +3213,19 @@ func (p *Evaluator) FastReadField20(buf []byte) (int, error) { func (p *Evaluator) FastReadField21(buf []byte) (int, error) { offset := 0 - - var _field *string - if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + _field := NewEvaluatorInfo() + if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l - _field = &v } - p.Benchmark = _field + p.EvaluatorInfo = _field return offset, nil } func (p *Evaluator) FastReadField22(buf []byte) (int, error) { offset := 0 - var _field *string - if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _field = &v - } - p.Vendor = _field - return offset, nil -} - -func (p *Evaluator) FastReadField23(buf []byte) (int, error) { - offset := 0 - var _field *string if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { return offset, err @@ -2979,7 +3237,7 @@ func (p *Evaluator) FastReadField23(buf []byte) (int, error) { return offset, nil } -func (p *Evaluator) FastReadField24(buf []byte) (int, error) { +func (p *Evaluator) FastReadField23(buf []byte) (int, error) { offset := 0 var _field *EvaluatorBoxType @@ -3073,7 +3331,6 @@ func (p *Evaluator) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset += p.fastWriteField21(buf[offset:], w) offset += p.fastWriteField22(buf[offset:], w) offset += p.fastWriteField23(buf[offset:], w) - offset += p.fastWriteField24(buf[offset:], w) offset += p.fastWriteField100(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -3096,7 +3353,6 @@ func (p *Evaluator) BLength() int { l += p.field21Length() l += p.field22Length() l += p.field23Length() - l += p.field24Length() l += p.field100Length() } l += thrift.Binary.FieldStopLength() @@ -3195,35 +3451,26 @@ func (p *Evaluator) fastWriteField20(buf []byte, w thrift.NocopyWriter) int { func (p *Evaluator) fastWriteField21(buf []byte, w thrift.NocopyWriter) int { offset := 0 - if p.IsSetBenchmark() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 21) - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Benchmark) + if p.IsSetEvaluatorInfo() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 21) + offset += p.EvaluatorInfo.FastWriteNocopy(buf[offset:], w) } return offset } func (p *Evaluator) fastWriteField22(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p.IsSetVendor() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 22) - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Vendor) - } - return offset -} - -func (p *Evaluator) fastWriteField23(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBuiltinVisibleVersion() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 23) + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 22) offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.BuiltinVisibleVersion) } return offset } -func (p *Evaluator) fastWriteField24(buf []byte, w thrift.NocopyWriter) int { +func (p *Evaluator) fastWriteField23(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBoxType() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 24) + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 23) offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.BoxType) } return offset @@ -3353,23 +3600,14 @@ func (p *Evaluator) field20Length() int { func (p *Evaluator) field21Length() int { l := 0 - if p.IsSetBenchmark() { + if p.IsSetEvaluatorInfo() { l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.StringLengthNocopy(*p.Benchmark) + l += p.EvaluatorInfo.BLength() } return l } func (p *Evaluator) field22Length() int { - l := 0 - if p.IsSetVendor() { - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.StringLengthNocopy(*p.Vendor) - } - return l -} - -func (p *Evaluator) field23Length() int { l := 0 if p.IsSetBuiltinVisibleVersion() { l += thrift.Binary.FieldBeginLength() @@ -3378,7 +3616,7 @@ func (p *Evaluator) field23Length() int { return l } -func (p *Evaluator) field24Length() int { +func (p *Evaluator) field23Length() int { l := 0 if p.IsSetBoxType() { l += thrift.Binary.FieldBeginLength() @@ -3485,21 +3723,14 @@ func (p *Evaluator) DeepCopy(s interface{}) error { p.Builtin = &tmp } - if src.Benchmark != nil { - var tmp string - if *src.Benchmark != "" { - tmp = kutils.StringDeepCopy(*src.Benchmark) - } - p.Benchmark = &tmp - } - - if src.Vendor != nil { - var tmp string - if *src.Vendor != "" { - tmp = kutils.StringDeepCopy(*src.Vendor) + var _evaluatorInfo *EvaluatorInfo + if src.EvaluatorInfo != nil { + _evaluatorInfo = &EvaluatorInfo{} + if err := _evaluatorInfo.DeepCopy(src.EvaluatorInfo); err != nil { + return err } - p.Vendor = &tmp } + p.EvaluatorInfo = _evaluatorInfo if src.BuiltinVisibleVersion != nil { var tmp string @@ -3651,7 +3882,7 @@ func (p *EvaluatorTemplate) FastRead(buf []byte) (int, error) { } } case 7: - if fieldTypeId == thrift.STRING { + if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField7(buf[offset:]) offset += l if err != nil { @@ -3664,20 +3895,6 @@ func (p *EvaluatorTemplate) FastRead(buf []byte) (int, error) { goto SkipFieldError } } - case 8: - if fieldTypeId == thrift.STRING { - l, err = p.FastReadField8(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 9: if fieldTypeId == thrift.MAP { l, err = p.FastReadField9(buf[offset:]) @@ -3826,29 +4043,13 @@ func (p *EvaluatorTemplate) FastReadField6(buf []byte) (int, error) { func (p *EvaluatorTemplate) FastReadField7(buf []byte) (int, error) { offset := 0 - - var _field *string - if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _field = &v - } - p.Benchmark = _field - return offset, nil -} - -func (p *EvaluatorTemplate) FastReadField8(buf []byte) (int, error) { - offset := 0 - - var _field *string - if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + _field := NewEvaluatorInfo() + if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l - _field = &v } - p.Vendor = _field + p.EvaluatorInfo = _field return offset, nil } @@ -3950,7 +4151,6 @@ func (p *EvaluatorTemplate) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) i offset += p.fastWriteField4(buf[offset:], w) offset += p.fastWriteField5(buf[offset:], w) offset += p.fastWriteField7(buf[offset:], w) - offset += p.fastWriteField8(buf[offset:], w) offset += p.fastWriteField9(buf[offset:], w) offset += p.fastWriteField101(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) @@ -3969,7 +4169,6 @@ func (p *EvaluatorTemplate) BLength() int { l += p.field5Length() l += p.field6Length() l += p.field7Length() - l += p.field8Length() l += p.field9Length() l += p.field101Length() l += p.field255Length() @@ -4034,18 +4233,9 @@ func (p *EvaluatorTemplate) fastWriteField6(buf []byte, w thrift.NocopyWriter) i func (p *EvaluatorTemplate) fastWriteField7(buf []byte, w thrift.NocopyWriter) int { offset := 0 - if p.IsSetBenchmark() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 7) - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Benchmark) - } - return offset -} - -func (p *EvaluatorTemplate) fastWriteField8(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p.IsSetVendor() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 8) - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Vendor) + if p.IsSetEvaluatorInfo() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 7) + offset += p.EvaluatorInfo.FastWriteNocopy(buf[offset:], w) } return offset } @@ -4156,18 +4346,9 @@ func (p *EvaluatorTemplate) field6Length() int { func (p *EvaluatorTemplate) field7Length() int { l := 0 - if p.IsSetBenchmark() { + if p.IsSetEvaluatorInfo() { l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.StringLengthNocopy(*p.Benchmark) - } - return l -} - -func (p *EvaluatorTemplate) field8Length() int { - l := 0 - if p.IsSetVendor() { - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.StringLengthNocopy(*p.Vendor) + l += p.EvaluatorInfo.BLength() } return l } @@ -4257,21 +4438,14 @@ func (p *EvaluatorTemplate) DeepCopy(s interface{}) error { p.Popularity = &tmp } - if src.Benchmark != nil { - var tmp string - if *src.Benchmark != "" { - tmp = kutils.StringDeepCopy(*src.Benchmark) - } - p.Benchmark = &tmp - } - - if src.Vendor != nil { - var tmp string - if *src.Vendor != "" { - tmp = kutils.StringDeepCopy(*src.Vendor) + var _evaluatorInfo *EvaluatorInfo + if src.EvaluatorInfo != nil { + _evaluatorInfo = &EvaluatorInfo{} + if err := _evaluatorInfo.DeepCopy(src.EvaluatorInfo); err != nil { + return err } - p.Vendor = &tmp } + p.EvaluatorInfo = _evaluatorInfo if src.Tags != nil { p.Tags = make(map[EvaluatorTagLangType]map[EvaluatorTagKey][]string, len(src.Tags)) diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go index 32ea03810..86a2e457f 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go @@ -18,7 +18,7 @@ import ( func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.Evaluator { // 从DTO转换为DO - evaluatorDO := &evaluatordo.Evaluator{ + evaluatorDO := &evaluatordo.Evaluator{ ID: evaluatorDTO.GetEvaluatorID(), SpaceID: evaluatorDTO.GetWorkspaceID(), Name: evaluatorDTO.GetName(), @@ -33,6 +33,14 @@ func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.E BaseInfo: commonconvertor.ConvertBaseInfoDTO2DO(evaluatorDTO.GetBaseInfo()), Tags: ConvertEvaluatorLangTagsDTO2DO(evaluatorDTO.GetTags()), } + if evaluatorDTO.GetEvaluatorInfo() != nil { + evaluatorDO.EvaluatorInfo = &evaluatordo.EvaluatorInfo{ + Benchmark: evaluatorDTO.GetEvaluatorInfo().GetBenchmark(), + Vendor: evaluatorDTO.GetEvaluatorInfo().GetVendor(), + VendorURL: evaluatorDTO.GetEvaluatorInfo().GetVendorURL(), + UserManualURL: evaluatorDTO.GetEvaluatorInfo().GetUserManualURL(), + } + } if evaluatorDTO.CurrentVersion != nil { switch evaluatorDTO.GetEvaluatorType() { case evaluatordto.EvaluatorType_Prompt: @@ -59,7 +67,7 @@ func ConvertEvaluatorDO2DTO(do *evaluatordo.Evaluator) *evaluatordto.Evaluator { if do == nil { return nil } - dto := &evaluatordto.Evaluator{ + dto := &evaluatordto.Evaluator{ EvaluatorID: gptr.Of(do.ID), WorkspaceID: gptr.Of(do.SpaceID), Name: gptr.Of(do.Name), @@ -72,6 +80,14 @@ func ConvertEvaluatorDO2DTO(do *evaluatordo.Evaluator) *evaluatordto.Evaluator { BaseInfo: commonconvertor.ConvertBaseInfoDO2DTO(do.BaseInfo), Tags: ConvertEvaluatorLangTagsDO2DTO(do.Tags), } + if do.EvaluatorInfo != nil { + dto.EvaluatorInfo = &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of(do.EvaluatorInfo.Benchmark), + Vendor: gptr.Of(do.EvaluatorInfo.Vendor), + VendorURL: gptr.Of(do.EvaluatorInfo.VendorURL), + UserManualURL: gptr.Of(do.EvaluatorInfo.UserManualURL), + } + } // 设置 BoxType { val := convertBoxTypeDO2DTO(do.BoxType) diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go index 7e81586f8..6f0cda7a0 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go @@ -18,19 +18,25 @@ func ConvertEvaluatorTemplateDTO2DO(dto *evaluatordto.EvaluatorTemplate) *evalua return nil } - do := &evaluatordo.EvaluatorTemplate{ + do := &evaluatordo.EvaluatorTemplate{ ID: dto.GetID(), SpaceID: dto.GetWorkspaceID(), Name: dto.GetName(), Description: dto.GetDescription(), EvaluatorType: evaluatordo.EvaluatorType(dto.GetEvaluatorType()), Popularity: dto.GetPopularity(), - Benchmark: dto.GetBenchmark(), - Vendor: dto.GetVendor(), InputSchemas: make([]*evaluatordo.ArgsSchema, 0), OutputSchemas: make([]*evaluatordo.ArgsSchema, 0), Tags: make(map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string), } + if dto.GetEvaluatorInfo() != nil { + do.EvaluatorInfo = &evaluatordo.EvaluatorInfo{ + Benchmark: dto.GetEvaluatorInfo().GetBenchmark(), + Vendor: dto.GetEvaluatorInfo().GetVendor(), + VendorURL: dto.GetEvaluatorInfo().GetVendorURL(), + UserManualURL: dto.GetEvaluatorInfo().GetUserManualURL(), + } + } // 处理标签 if len(dto.GetTags()) > 0 { @@ -89,17 +95,23 @@ func ConvertEvaluatorTemplateDO2DTO(do *evaluatordo.EvaluatorTemplate) *evaluato return nil } - dto := &evaluatordto.EvaluatorTemplate{ + dto := &evaluatordto.EvaluatorTemplate{ ID: gptr.Of(do.ID), WorkspaceID: gptr.Of(do.SpaceID), Name: gptr.Of(do.Name), Description: gptr.Of(do.Description), EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType(do.EvaluatorType)), Popularity: gptr.Of(do.Popularity), - Benchmark: gptr.Of(do.Benchmark), - Vendor: gptr.Of(do.Vendor), Tags: make(map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string), } + if do.EvaluatorInfo != nil { + dto.EvaluatorInfo = &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of(do.EvaluatorInfo.Benchmark), + Vendor: gptr.Of(do.EvaluatorInfo.Vendor), + VendorURL: gptr.Of(do.EvaluatorInfo.VendorURL), + UserManualURL: gptr.Of(do.EvaluatorInfo.UserManualURL), + } + } // 处理标签 if len(do.Tags) > 0 { diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index 3044fcd36..aa0382036 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -1438,13 +1438,12 @@ func (e *EvaluatorHandlerImpl) CreateEvaluatorTemplate(ctx context.Context, requ templateDO := evaluatorconvertor.ConvertEvaluatorTemplateDTO2DO(request.GetEvaluatorTemplate()) // 构建service层请求 - serviceReq := &entity.CreateEvaluatorTemplateRequest{ + serviceReq := &entity.CreateEvaluatorTemplateRequest{ SpaceID: templateDO.SpaceID, Name: templateDO.Name, Description: templateDO.Description, EvaluatorType: templateDO.EvaluatorType, - Benchmark: templateDO.Benchmark, - Vendor: templateDO.Vendor, + EvaluatorInfo: templateDO.EvaluatorInfo, InputSchemas: templateDO.InputSchemas, OutputSchemas: templateDO.OutputSchemas, ReceiveChatHistory: templateDO.ReceiveChatHistory, @@ -1484,12 +1483,11 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluatorTemplate(ctx context.Context, requ templateDO := evaluatorconvertor.ConvertEvaluatorTemplateDTO2DO(request.GetEvaluatorTemplate()) // 构建service层请求 - serviceReq := &entity.UpdateEvaluatorTemplateRequest{ + serviceReq := &entity.UpdateEvaluatorTemplateRequest{ ID: request.EvaluatorTemplateID, Name: gptr.Of(templateDO.Name), Description: gptr.Of(templateDO.Description), - Benchmark: gptr.Of(templateDO.Benchmark), - Vendor: gptr.Of(templateDO.Vendor), + EvaluatorInfo: templateDO.EvaluatorInfo, InputSchemas: templateDO.InputSchemas, OutputSchemas: templateDO.OutputSchemas, ReceiveChatHistory: templateDO.ReceiveChatHistory, diff --git a/backend/modules/evaluation/application/experiment_app_test.go b/backend/modules/evaluation/application/experiment_app_test.go index 9b00aff11..bb4e34275 100644 --- a/backend/modules/evaluation/application/experiment_app_test.go +++ b/backend/modules/evaluation/application/experiment_app_test.go @@ -1791,6 +1791,7 @@ func TestExperimentApplication_RetryExperiment(t *testing.T) { nil, nil, nil, + nil, // evaluatorService ) // 执行测试 @@ -1905,6 +1906,7 @@ func TestExperimentApplication_KillExperiment(t *testing.T) { nil, nil, nil, + nil, // evaluatorService ) // 执行测试 diff --git a/backend/modules/evaluation/domain/entity/evaluator.go b/backend/modules/evaluation/domain/entity/evaluator.go index 3f5dd8c14..f7a0185b5 100644 --- a/backend/modules/evaluation/domain/entity/evaluator.go +++ b/backend/modules/evaluation/domain/entity/evaluator.go @@ -14,8 +14,7 @@ type Evaluator struct { BaseInfo *BaseInfo Builtin bool - Benchmark string - Vendor string + EvaluatorInfo *EvaluatorInfo BuiltinVisibleVersion string BoxType EvaluatorBoxType `json:"box_type"` Tags map[EvaluatorTagLangType]map[EvaluatorTagKey][]string `json:"tags"` @@ -25,6 +24,13 @@ type Evaluator struct { CustomRPCEvaluatorVersion *CustomRPCEvaluatorVersion } +type EvaluatorInfo struct { + Benchmark string `json:"benchmark"` + Vendor string `json:"vendor"` + VendorURL string `json:"vendor_url"` + UserManualURL string `json:"user_manual_url"` +} + type EvaluatorBoxType int64 const ( diff --git a/backend/modules/evaluation/domain/entity/evaluator_template.go b/backend/modules/evaluation/domain/entity/evaluator_template.go index 33d270811..58a7d3e6d 100644 --- a/backend/modules/evaluation/domain/entity/evaluator_template.go +++ b/backend/modules/evaluation/domain/entity/evaluator_template.go @@ -7,9 +7,8 @@ type EvaluatorTemplate struct { Description string EvaluatorType EvaluatorType - Benchmark string - Vendor string - Popularity int64 + EvaluatorInfo *EvaluatorInfo + Popularity int64 InputSchemas []*ArgsSchema `json:"input_schemas"` OutputSchemas []*ArgsSchema `json:"output_schemas"` diff --git a/backend/modules/evaluation/domain/entity/param.go b/backend/modules/evaluation/domain/entity/param.go index 64bbe9dfe..a0717b992 100644 --- a/backend/modules/evaluation/domain/entity/param.go +++ b/backend/modules/evaluation/domain/entity/param.go @@ -328,8 +328,7 @@ type CreateEvaluatorTemplateRequest struct { Name string `json:"name" validate:"required,min=1,max=100"` // 模板名称 Description string `json:"description" validate:"max=500"` // 模板描述 EvaluatorType EvaluatorType `json:"evaluator_type" validate:"required"` // 评估器类型 - Benchmark string `json:"benchmark,omitempty" validate:"max=100"` // 基准 - Vendor string `json:"vendor,omitempty" validate:"max=100"` // 供应商 + EvaluatorInfo *EvaluatorInfo `json:"evaluator_info,omitempty"` // 评估器补充信息 InputSchemas []*ArgsSchema `json:"input_schemas,omitempty"` // 输入模式 OutputSchemas []*ArgsSchema `json:"output_schemas,omitempty"` // 输出模式 ReceiveChatHistory *bool `json:"receive_chat_history,omitempty"` // 是否接收聊天历史 @@ -350,8 +349,7 @@ type UpdateEvaluatorTemplateRequest struct { ID int64 `json:"id" validate:"required,gt=0"` // 模板ID Name *string `json:"name,omitempty" validate:"omitempty,min=1,max=100"` // 模板名称 Description *string `json:"description,omitempty" validate:"omitempty,max=500"` // 模板描述 - Benchmark *string `json:"benchmark,omitempty" validate:"omitempty,max=100"` // 基准 - Vendor *string `json:"vendor,omitempty" validate:"omitempty,max=100"` // 供应商 + EvaluatorInfo *EvaluatorInfo `json:"evaluator_info,omitempty"` // 评估器补充信息 InputSchemas []*ArgsSchema `json:"input_schemas,omitempty"` // 输入模式 OutputSchemas []*ArgsSchema `json:"output_schemas,omitempty"` // 输出模式 ReceiveChatHistory *bool `json:"receive_chat_history,omitempty"` // 是否接收聊天历史 diff --git a/backend/modules/evaluation/domain/service/evaluator_template_impl.go b/backend/modules/evaluation/domain/service/evaluator_template_impl.go index b378cf423..dd944606a 100644 --- a/backend/modules/evaluation/domain/service/evaluator_template_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_template_impl.go @@ -40,13 +40,11 @@ func (s *EvaluatorTemplateServiceImpl) CreateEvaluatorTemplate(ctx context.Conte } // 构建模板实体 - template := &entity.EvaluatorTemplate{ + template := &entity.EvaluatorTemplate{ SpaceID: req.SpaceID, Name: req.Name, Description: req.Description, EvaluatorType: req.EvaluatorType, - Benchmark: req.Benchmark, - Vendor: req.Vendor, InputSchemas: req.InputSchemas, OutputSchemas: req.OutputSchemas, ReceiveChatHistory: req.ReceiveChatHistory, @@ -54,6 +52,10 @@ func (s *EvaluatorTemplateServiceImpl) CreateEvaluatorTemplate(ctx context.Conte PromptEvaluatorContent: req.PromptEvaluatorContent, CodeEvaluatorContent: req.CodeEvaluatorContent, } + // EvaluatorInfo（优先使用新字段） + if req.EvaluatorInfo != nil { + template.EvaluatorInfo = req.EvaluatorInfo + } // 设置基础信息 baseInfo := &entity.BaseInfo{ @@ -106,12 +108,25 @@ func (s *EvaluatorTemplateServiceImpl) UpdateEvaluatorTemplate(ctx context.Conte if req.Description != nil { existingTemplate.Description = *req.Description } - if req.Benchmark != nil { - existingTemplate.Benchmark = *req.Benchmark - } - if req.Vendor != nil { - existingTemplate.Vendor = *req.Vendor - } + // 更新 EvaluatorInfo + if req.EvaluatorInfo != nil { + if existingTemplate.EvaluatorInfo == nil { + existingTemplate.EvaluatorInfo = &entity.EvaluatorInfo{} + } + // 按字段级别覆盖，避免丢失未提供字段 + if req.EvaluatorInfo.Benchmark != "" { + existingTemplate.EvaluatorInfo.Benchmark = req.EvaluatorInfo.Benchmark + } + if req.EvaluatorInfo.Vendor != "" { + existingTemplate.EvaluatorInfo.Vendor = req.EvaluatorInfo.Vendor + } + if req.EvaluatorInfo.VendorURL != "" { + existingTemplate.EvaluatorInfo.VendorURL = req.EvaluatorInfo.VendorURL + } + if req.EvaluatorInfo.UserManualURL != "" { + existingTemplate.EvaluatorInfo.UserManualURL = req.EvaluatorInfo.UserManualURL + } + } if req.InputSchemas != nil { existingTemplate.InputSchemas = req.InputSchemas } @@ -251,12 +266,20 @@ func (s *EvaluatorTemplateServiceImpl) validateCreateRequest(req *entity.CreateE if len(req.Description) > 500 { return errors.New("模板描述长度不能超过500个字符") } - if req.Benchmark != "" && len(req.Benchmark) > 100 { - return errors.New("基准长度不能超过100个字符") - } - if req.Vendor != "" && len(req.Vendor) > 100 { - return errors.New("供应商长度不能超过100个字符") - } + if req.EvaluatorInfo != nil { + if req.EvaluatorInfo.Benchmark != "" && len(req.EvaluatorInfo.Benchmark) > 100 { + return errors.New("基准长度不能超过100个字符") + } + if req.EvaluatorInfo.Vendor != "" && len(req.EvaluatorInfo.Vendor) > 100 { + return errors.New("供应商长度不能超过100个字符") + } + if req.EvaluatorInfo.VendorURL != "" && len(req.EvaluatorInfo.VendorURL) > 500 { + return errors.New("供应商链接长度不能超过500个字符") + } + if req.EvaluatorInfo.UserManualURL != "" && len(req.EvaluatorInfo.UserManualURL) > 500 { + return errors.New("用户手册链接长度不能超过500个字符") + } + } // 验证评估器类型和内容匹配 if req.EvaluatorType == entity.EvaluatorTypePrompt && req.PromptEvaluatorContent == nil { @@ -283,12 +306,20 @@ func (s *EvaluatorTemplateServiceImpl) validateUpdateRequest(req *entity.UpdateE if req.Description != nil && len(*req.Description) > 500 { return errors.New("模板描述长度不能超过500个字符") } - if req.Benchmark != nil && len(*req.Benchmark) > 100 { - return errors.New("基准长度不能超过100个字符") - } - if req.Vendor != nil && len(*req.Vendor) > 100 { - return errors.New("供应商长度不能超过100个字符") - } + if req.EvaluatorInfo != nil { + if req.EvaluatorInfo.Benchmark != "" && len(req.EvaluatorInfo.Benchmark) > 100 { + return errors.New("基准长度不能超过100个字符") + } + if req.EvaluatorInfo.Vendor != "" && len(req.EvaluatorInfo.Vendor) > 100 { + return errors.New("供应商长度不能超过100个字符") + } + if req.EvaluatorInfo.VendorURL != "" && len(req.EvaluatorInfo.VendorURL) > 500 { + return errors.New("供应商链接长度不能超过500个字符") + } + if req.EvaluatorInfo.UserManualURL != "" && len(req.EvaluatorInfo.UserManualURL) > 500 { + return errors.New("用户手册链接长度不能超过500个字符") + } + } return nil } diff --git a/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go index f095e92e0..5b790ac45 100644 --- a/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go @@ -62,14 +62,16 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { }, { name: "成功 - 创建Code类型模板", - req: &entity.CreateEvaluatorTemplateRequest{ + req: &entity.CreateEvaluatorTemplateRequest{ SpaceID: 100, Name: "Test Template", Description: "Test Description", EvaluatorType: entity.EvaluatorTypeCode, - CodeEvaluatorContent: &entity.CodeEvaluatorContent{ - CodeContent: "def evaluate(): pass", - }, + CodeEvaluatorContent: &entity.CodeEvaluatorContent{ + Lang2CodeContent: map[entity.LanguageType]string{ + entity.LanguageTypePython: "def evaluate(): pass", + }, + }, }, mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { mockRepo.EXPECT(). @@ -259,12 +261,11 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { }, { name: "成功 - 更新多个字段", - req: &entity.UpdateEvaluatorTemplateRequest{ + req: &entity.UpdateEvaluatorTemplateRequest{ ID: 1, Name: gptr.Of("Updated Template"), Description: gptr.Of("Updated Description"), - Benchmark: gptr.Of("benchmark1"), - Vendor: gptr.Of("vendor1"), + EvaluatorInfo: &entity.EvaluatorInfo{Benchmark: "benchmark1", Vendor: "vendor1"}, }, mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { existingTemplate := &entity.EvaluatorTemplate{ diff --git a/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go b/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go index cfa0a29fa..ef42af588 100644 --- a/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go +++ b/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go @@ -41,6 +41,21 @@ func (m *MockEvaluatorService) EXPECT() *MockEvaluatorServiceMockRecorder { return m.recorder } +// BatchGetBuiltinEvaluator mocks base method. +func (m *MockEvaluatorService) BatchGetBuiltinEvaluator(ctx context.Context, evaluatorIDs []int64) ([]*entity.Evaluator, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "BatchGetBuiltinEvaluator", ctx, evaluatorIDs) + ret0, _ := ret[0].([]*entity.Evaluator) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// BatchGetBuiltinEvaluator indicates an expected call of BatchGetBuiltinEvaluator. +func (mr *MockEvaluatorServiceMockRecorder) BatchGetBuiltinEvaluator(ctx, evaluatorIDs any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetBuiltinEvaluator", reflect.TypeOf((*MockEvaluatorService)(nil).BatchGetBuiltinEvaluator), ctx, evaluatorIDs) +} + // BatchGetEvaluator mocks base method. func (m *MockEvaluatorService) BatchGetEvaluator(ctx context.Context, spaceID int64, evaluatorIDs []int64, includeDeleted bool) ([]*entity.Evaluator, error) { m.ctrl.T.Helper() @@ -56,6 +71,21 @@ func (mr *MockEvaluatorServiceMockRecorder) BatchGetEvaluator(ctx, spaceID, eval return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluator", reflect.TypeOf((*MockEvaluatorService)(nil).BatchGetEvaluator), ctx, spaceID, evaluatorIDs, includeDeleted) } +// BatchGetEvaluatorByIDAndVersion mocks base method. +func (m *MockEvaluatorService) BatchGetEvaluatorByIDAndVersion(ctx context.Context, pairs [][2]any) ([]*entity.Evaluator, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "BatchGetEvaluatorByIDAndVersion", ctx, pairs) + ret0, _ := ret[0].([]*entity.Evaluator) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// BatchGetEvaluatorByIDAndVersion indicates an expected call of BatchGetEvaluatorByIDAndVersion. +func (mr *MockEvaluatorServiceMockRecorder) BatchGetEvaluatorByIDAndVersion(ctx, pairs any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchGetEvaluatorByIDAndVersion", reflect.TypeOf((*MockEvaluatorService)(nil).BatchGetEvaluatorByIDAndVersion), ctx, pairs) +} + // BatchGetEvaluatorVersion mocks base method. func (m *MockEvaluatorService) BatchGetEvaluatorVersion(ctx context.Context, spaceID *int64, evaluatorVersionIDs []int64, includeDeleted bool) ([]*entity.Evaluator, error) { m.ctrl.T.Helper() diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 43ee6c118..8c67e756c 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -23,6 +23,7 @@ import ( "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" "github.com/coze-dev/coze-loop/backend/pkg/contexts" + "github.com/coze-dev/coze-loop/backend/pkg/json" ) // EvaluatorRepoImpl 实现 EvaluatorRepo 接口 @@ -509,12 +510,19 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorMeta(ctx context.Context, req *entity if req.BoxType != nil { po.BoxType = int32(*req.BoxType) } - if req.Benchmark != nil { - po.Benchmark = req.Benchmark - } - if req.Vendor != nil { - po.Vendor = req.Vendor - } + // 写入 EvaluatorInfo JSON（由旧字段组装） + if req.Benchmark != nil || req.Vendor != nil { + info := &entity.EvaluatorInfo{} + if req.Benchmark != nil { + info.Benchmark = *req.Benchmark + } + if req.Vendor != nil { + info.Vendor = *req.Vendor + } + if b, err := json.Marshal(info); err == nil { + po.EvaluatorInfo = &b + } + } if req.BuiltinVisibleVersion != nil { po.BuiltinVisibleVersion = gptr.Indirect(req.BuiltinVisibleVersion) } diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go index f4ae6db1f..cc6d0ae41 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go @@ -54,14 +54,13 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { Return(&mysql.ListEvaluatorTemplateResponse{ TotalCount: 2, Templates: []*model.EvaluatorTemplate{ - { + { ID: 1, SpaceID: gptr.Of(int64(123)), Name: gptr.Of("Template A"), Description: gptr.Of("Description A"), EvaluatorType: gptr.Of(int32(1)), - Benchmark: gptr.Of("benchmark1"), - Vendor: gptr.Of("vendor1"), + EvaluatorInfo: gptr.Of([]byte(`{"benchmark":"benchmark1","vendor":"vendor1"}`)), Popularity: 100, CreatedBy: "user1", UpdatedBy: "user1", @@ -72,8 +71,7 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { Name: gptr.Of("Template B"), Description: gptr.Of("Description B"), EvaluatorType: gptr.Of(int32(2)), - Benchmark: gptr.Of("benchmark2"), - Vendor: gptr.Of("vendor2"), + EvaluatorInfo: gptr.Of([]byte(`{"benchmark":"benchmark2","vendor":"vendor2"}`)), Popularity: 200, CreatedBy: "user2", UpdatedBy: "user2", @@ -139,14 +137,13 @@ func TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate(t *testing.T) { Return(&mysql.ListEvaluatorTemplateResponse{ TotalCount: 1, Templates: []*model.EvaluatorTemplate{ - { + { ID: 1, SpaceID: gptr.Of(int64(123)), Name: gptr.Of("Template A"), Description: gptr.Of("Description A"), EvaluatorType: gptr.Of(int32(1)), - Benchmark: gptr.Of("benchmark1"), - Vendor: gptr.Of("vendor1"), + EvaluatorInfo: gptr.Of([]byte(`{"benchmark":"benchmark1","vendor":"vendor1"}`)), Popularity: 100, CreatedBy: "user1", UpdatedBy: "user1", diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go index 29e1198a5..ef0112d17 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go @@ -26,7 +26,7 @@ func ConvertEvaluatorDO2PO(do *evaluatordo.Evaluator) *model.Evaluator { if do.Builtin { builtinVal = 1 } - po := &model.Evaluator{ + po := &model.Evaluator{ ID: do.ID, SpaceID: do.SpaceID, Name: ptr.Of(do.Name), @@ -37,9 +37,13 @@ func ConvertEvaluatorDO2PO(do *evaluatordo.Evaluator) *model.Evaluator { BuiltinVisibleVersion: do.BuiltinVisibleVersion, Builtin: builtinVal, BoxType: int32(do.BoxType), - Benchmark: ptr.Of(do.Benchmark), - Vendor: ptr.Of(do.Vendor), } + if do.EvaluatorInfo != nil { + b, err := json.Marshal(do.EvaluatorInfo) + if err == nil { + po.EvaluatorInfo = ptr.Of(b) + } + } if do.BaseInfo != nil { if do.BaseInfo.CreatedBy != nil { po.CreatedBy = gptr.Indirect(do.BaseInfo.CreatedBy.UserID) // ignore_security_alert SQL_INJECTION @@ -62,7 +66,7 @@ func ConvertEvaluatorPO2DO(po *model.Evaluator) *evaluatordo.Evaluator { if po == nil { return nil } - do := &evaluatordo.Evaluator{ + do := &evaluatordo.Evaluator{ ID: po.ID, SpaceID: po.SpaceID, Name: gptr.Indirect(po.Name), @@ -73,9 +77,13 @@ func ConvertEvaluatorPO2DO(po *model.Evaluator) *evaluatordo.Evaluator { BuiltinVisibleVersion: po.BuiltinVisibleVersion, Builtin: po.Builtin == 1, BoxType: evaluatordo.EvaluatorBoxType(po.BoxType), - Benchmark: gptr.Indirect(po.Benchmark), - Vendor: gptr.Indirect(po.Vendor), } + if po.EvaluatorInfo != nil { + var info evaluatordo.EvaluatorInfo + if err := json.Unmarshal(*po.EvaluatorInfo, &info); err == nil { + do.EvaluatorInfo = &info + } + } do.BaseInfo = &evaluatordo.BaseInfo{ CreatedBy: &evaluatordo.UserInfo{ UserID: ptr.Of(po.CreatedBy), diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go index 06dda84ad..a285290f4 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template.go @@ -21,7 +21,7 @@ func ConvertEvaluatorTemplateDO2PO(do *evaluatordo.EvaluatorTemplate) (*model.Ev return nil, nil } - po := &model.EvaluatorTemplate{ + po := &model.EvaluatorTemplate{ ID: do.ID, SpaceID: ptr.Of(do.SpaceID), Name: ptr.Of(do.Name), @@ -29,9 +29,13 @@ func ConvertEvaluatorTemplateDO2PO(do *evaluatordo.EvaluatorTemplate) (*model.Ev EvaluatorType: ptr.Of(int32(do.EvaluatorType)), ReceiveChatHistory: do.ReceiveChatHistory, Popularity: do.Popularity, - Benchmark: ptr.Of(do.Benchmark), - Vendor: ptr.Of(do.Vendor), } + if do.EvaluatorInfo != nil { + b, err := json.Marshal(do.EvaluatorInfo) + if err == nil { + po.EvaluatorInfo = ptr.Of(b) + } + } // 序列化InputSchema if len(do.InputSchemas) > 0 { @@ -101,7 +105,7 @@ func ConvertEvaluatorTemplatePO2DO(po *model.EvaluatorTemplate) (*evaluatordo.Ev return nil, nil } - do := &evaluatordo.EvaluatorTemplate{ + do := &evaluatordo.EvaluatorTemplate{ ID: po.ID, SpaceID: gptr.Indirect(po.SpaceID), Name: gptr.Indirect(po.Name), @@ -109,10 +113,14 @@ func ConvertEvaluatorTemplatePO2DO(po *model.EvaluatorTemplate) (*evaluatordo.Ev EvaluatorType: evaluatordo.EvaluatorType(gptr.Indirect(po.EvaluatorType)), ReceiveChatHistory: po.ReceiveChatHistory, Popularity: po.Popularity, - Benchmark: gptr.Indirect(po.Benchmark), - Vendor: gptr.Indirect(po.Vendor), Tags: make(map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string), } + if po.EvaluatorInfo != nil { + var info evaluatordo.EvaluatorInfo + if err := json.Unmarshal(*po.EvaluatorInfo, &info); err == nil { + do.EvaluatorInfo = &info + } + } // 反序列化InputSchema if po.InputSchema != nil { diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go index 80e102559..5aa17f8a6 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go @@ -13,6 +13,7 @@ import ( evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + "github.com/coze-dev/coze-loop/backend/pkg/json" "github.com/coze-dev/coze-loop/backend/pkg/lang/ptr" ) @@ -23,16 +24,16 @@ func TestConvertEvaluatorTemplateDO2PO(t *testing.T) { baseTime := time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC) tests := []struct { - name string - do *evaluatordo.EvaluatorTemplate - wantErr bool - validate func(t *testing.T, po *model.EvaluatorTemplate, err error) + name string + do *evaluatordo.EvaluatorTemplate + wantErr bool + validate func(t *testing.T, po *model.EvaluatorTemplate, err error) description string }{ { - name: "nil输入", - do: nil, - wantErr: false, + name: "nil输入", + do: nil, + wantErr: false, validate: func(t *testing.T, po *model.EvaluatorTemplate, err error) { assert.NoError(t, err) assert.Nil(t, po) @@ -49,8 +50,7 @@ func TestConvertEvaluatorTemplateDO2PO(t *testing.T) { EvaluatorType: evaluatordo.EvaluatorTypePrompt, ReceiveChatHistory: gptr.Of(true), Popularity: 100, - Benchmark: "benchmark1", - Vendor: "vendor1", + EvaluatorInfo: &evaluatordo.EvaluatorInfo{Benchmark: "benchmark1", Vendor: "vendor1", VendorURL: "u1", UserManualURL: "m1"}, BaseInfo: &evaluatordo.BaseInfo{ CreatedBy: &evaluatordo.UserInfo{ UserID: ptr.Of("user1"), @@ -73,13 +73,19 @@ func TestConvertEvaluatorTemplateDO2PO(t *testing.T) { assert.Equal(t, int32(evaluatordo.EvaluatorTypePrompt), gptr.Indirect(po.EvaluatorType)) assert.NotNil(t, po.ReceiveChatHistory) assert.True(t, gptr.Indirect(po.ReceiveChatHistory)) - assert.Equal(t, int32(100), po.Popularity) - assert.Equal(t, "benchmark1", gptr.Indirect(po.Benchmark)) - assert.Equal(t, "vendor1", gptr.Indirect(po.Vendor)) + assert.Equal(t, int64(100), po.Popularity) + if assert.NotNil(t, po.EvaluatorInfo) { + var info evaluatordo.EvaluatorInfo + _ = json.Unmarshal(*po.EvaluatorInfo, &info) + assert.Equal(t, "benchmark1", info.Benchmark) + assert.Equal(t, "vendor1", info.Vendor) + assert.Equal(t, "u1", info.VendorURL) + assert.Equal(t, "m1", info.UserManualURL) + } assert.Equal(t, "user1", po.CreatedBy) assert.Equal(t, "user1", po.UpdatedBy) - assert.Equal(t, baseTime, po.CreatedAt) - assert.Equal(t, baseTime, po.UpdatedAt) + assert.Equal(t, baseTime.UnixMilli(), po.CreatedAt.UnixMilli()) + assert.Equal(t, baseTime.UnixMilli(), po.UpdatedAt.UnixMilli()) }, description: "成功转换Prompt类型模板（基础字段）", }, @@ -91,7 +97,9 @@ func TestConvertEvaluatorTemplateDO2PO(t *testing.T) { Name: "Code Template", EvaluatorType: evaluatordo.EvaluatorTypeCode, CodeEvaluatorContent: &evaluatordo.CodeEvaluatorContent{ - CodeContent: "def evaluate(): pass", + Lang2CodeContent: map[evaluatordo.LanguageType]string{ + evaluatordo.LanguageTypePython: "def evaluate(): pass", + }, }, }, wantErr: false, @@ -114,14 +122,14 @@ func TestConvertEvaluatorTemplateDO2PO(t *testing.T) { { Key: ptr.Of("input1"), SupportContentTypes: []evaluatordo.ContentType{evaluatordo.ContentTypeText}, - JsonSchema: ptr.Of(`{"type": "string"}`), + JsonSchema: ptr.Of(`{"type": "string"}`), }, }, OutputSchemas: []*evaluatordo.ArgsSchema{ { Key: ptr.Of("output1"), SupportContentTypes: []evaluatordo.ContentType{evaluatordo.ContentTypeText}, - JsonSchema: ptr.Of(`{"type": "string"}`), + JsonSchema: ptr.Of(`{"type": "string"}`), }, }, }, @@ -150,7 +158,7 @@ func TestConvertEvaluatorTemplateDO2PO(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, po) assert.True(t, po.DeletedAt.Valid) - assert.Equal(t, baseTime, po.DeletedAt.Time) + assert.Equal(t, baseTime.UnixMilli(), po.DeletedAt.Time.UnixMilli()) }, description: "成功转换带删除时间的模板", }, @@ -201,16 +209,16 @@ func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { t.Parallel() tests := []struct { - name string - po *model.EvaluatorTemplate - wantErr bool - validate func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) + name string + po *model.EvaluatorTemplate + wantErr bool + validate func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) description string }{ { - name: "nil输入", - po: nil, - wantErr: false, + name: "nil输入", + po: nil, + wantErr: false, validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { assert.NoError(t, err) assert.Nil(t, do) @@ -227,8 +235,7 @@ func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypePrompt)), ReceiveChatHistory: gptr.Of(true), Popularity: 100, - Benchmark: gptr.Of("benchmark1"), - Vendor: gptr.Of("vendor1"), + EvaluatorInfo: gptr.Of([]byte(`{"benchmark":"benchmark1","vendor":"vendor1","vendor_url":"u1","user_manual_url":"m1"}`)), }, wantErr: false, validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { @@ -241,9 +248,13 @@ func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { assert.Equal(t, evaluatordo.EvaluatorTypePrompt, do.EvaluatorType) assert.NotNil(t, do.ReceiveChatHistory) assert.True(t, gptr.Indirect(do.ReceiveChatHistory)) - assert.Equal(t, int32(100), do.Popularity) - assert.Equal(t, "benchmark1", do.Benchmark) - assert.Equal(t, "vendor1", do.Vendor) + assert.Equal(t, int64(100), do.Popularity) + if assert.NotNil(t, do.EvaluatorInfo) { + assert.Equal(t, "benchmark1", do.EvaluatorInfo.Benchmark) + assert.Equal(t, "vendor1", do.EvaluatorInfo.Vendor) + assert.Equal(t, "u1", do.EvaluatorInfo.VendorURL) + assert.Equal(t, "m1", do.EvaluatorInfo.UserManualURL) + } assert.NotNil(t, do.Tags) }, description: "成功转换Prompt类型模板", @@ -255,7 +266,7 @@ func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { SpaceID: gptr.Of(int64(123)), Name: gptr.Of("Code Template"), EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypeCode)), - Metainfo: gptr.Of([]byte(`{"code_content":"def evaluate(): pass"}`)), + Metainfo: gptr.Of([]byte(`{"code_content":"def evaluate(): pass"}`)), }, wantErr: false, validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { @@ -273,8 +284,8 @@ func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { SpaceID: gptr.Of(int64(123)), Name: gptr.Of("Template with Schemas"), EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypePrompt)), - InputSchema: gptr.Of([]byte(`[{"key":"input1","support_content_types":["Text"],"json_schema":"{\"type\": \"string\"}"}]`)), - OutputSchema: gptr.Of([]byte(`[{"key":"output1","support_content_types":["Text"],"json_schema":"{\"type\": \"string\"}"}]`)), + InputSchema: gptr.Of([]byte(`[{"key":"input1","support_content_types":["Text"],"json_schema":"{\"type\": \"string\"}"}]`)), + OutputSchema: gptr.Of([]byte(`[{"key":"output1","support_content_types":["Text"],"json_schema":"{\"type\": \"string\"}"}]`)), }, wantErr: false, validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { @@ -294,7 +305,7 @@ func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { SpaceID: gptr.Of(int64(123)), Name: gptr.Of("Invalid Template"), EvaluatorType: gptr.Of(int32(evaluatordo.EvaluatorTypePrompt)), - Metainfo: gptr.Of([]byte(`invalid json`)), + Metainfo: gptr.Of([]byte(`invalid json`)), }, wantErr: true, validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { @@ -326,16 +337,16 @@ func TestConvertEvaluatorTemplatePO2DOWithBaseInfo(t *testing.T) { baseTime := time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC) tests := []struct { - name string - po *model.EvaluatorTemplate - wantErr bool - validate func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) + name string + po *model.EvaluatorTemplate + wantErr bool + validate func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) description string }{ { - name: "nil输入", - po: nil, - wantErr: false, + name: "nil输入", + po: nil, + wantErr: false, validate: func(t *testing.T, do *evaluatordo.EvaluatorTemplate, err error) { assert.NoError(t, err) assert.Nil(t, do) @@ -434,4 +445,3 @@ func TestConvertEvaluatorTemplatePO2DOWithBaseInfo(t *testing.T) { }) } } - diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go index c7bb8d30f..21994e502 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator.go @@ -118,27 +118,31 @@ func (dao *EvaluatorDAOImpl) UpdateEvaluatorDraftSubmitted(ctx context.Context, func (dao *EvaluatorDAOImpl) UpdateEvaluatorMeta(ctx context.Context, po *model.Evaluator, opts ...db.Option) error { // 通过opts获取当前的db session实例 dbsession := dao.provider.NewSession(ctx, opts...) - updateMap := make(map[string]interface{}) - // 基础字段转换 - updateMap["name"] = po.Name - updateMap["description"] = po.Description - updateMap["updated_by"] = po.UpdatedBy - // 可选字段：builtin/benchmark/vendor，如果传入则更新 - if po.Benchmark != nil { - updateMap["benchmark"] = po.Benchmark - } - if po.Vendor != nil { - updateMap["vendor"] = po.Vendor - } - if po.Builtin != 0 { - updateMap["builtin"] = po.Builtin - } - if po.BuiltinVisibleVersion != "" { - updateMap["builtin_visible_version"] = po.BuiltinVisibleVersion - } - if po.BoxType != 0 { - updateMap["box_type"] = po.BoxType - } + updateMap := make(map[string]interface{}) + // 基础字段（按传入是否为空决定是否更新） + if po.Name != nil { + updateMap["name"] = po.Name + } + if po.Description != nil { + updateMap["description"] = po.Description + } + if po.UpdatedBy != "" { + updateMap["updated_by"] = po.UpdatedBy + } + // 可选字段：builtin、builtin_visible_version、box_type + if po.Builtin != 0 { + updateMap["builtin"] = po.Builtin + } + if po.BuiltinVisibleVersion != "" { + updateMap["builtin_visible_version"] = po.BuiltinVisibleVersion + } + if po.BoxType != 0 { + updateMap["box_type"] = po.BoxType + } + // 新增：EvaluatorInfo JSON 序列化字段 + if po.EvaluatorInfo != nil { + updateMap["evaluator_info"] = po.EvaluatorInfo + } return dbsession.WithContext(ctx).Model(&model.Evaluator{}). Where("id = ?", po.ID). // 添加ID筛选条件 Where("deleted_at IS NULL"). // 添加软删除筛选条件 diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index 11b452c4e..ed318f9b7 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -59,8 +59,9 @@ func (dao *EvaluatorTagDAOImpl) BatchGetTagsBySourceIDsAndType(ctx context.Conte dbsession := dao.provider.NewSession(ctx, opts...) var tags []*model.EvaluatorTag - query := dbsession.WithContext(ctx). - Where("source_id IN (?) AND tag_type = ?", sourceIDs, tagType) + query := dbsession.WithContext(ctx). + Where("source_id IN (?) AND tag_type = ?", sourceIDs, tagType). + Where("deleted_at IS NULL") if langType != "" { query = query.Where("lang_type = ?", langType) } @@ -88,8 +89,9 @@ func (dao *EvaluatorTagDAOImpl) DeleteEvaluatorTagsByConditions(ctx context.Cont dbsession := dao.provider.NewSession(ctx, opts...) // 基础查询条件 - query := dbsession.WithContext(ctx). - Where("source_id = ? AND tag_type = ?", sourceID, tagType) + query := dbsession.WithContext(ctx). + Where("source_id = ? AND tag_type = ?", sourceID, tagType). + Where("deleted_at IS NULL") if langType != "" { query = query.Where("lang_type = ?", langType) } @@ -128,9 +130,10 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte dbsession := dao.provider.NewSession(ctx, opts...) // 基础查询条件 - query := dbsession.WithContext(ctx).Table("evaluator_tag"). - Select("source_id"). - Where("tag_type = ?", tagType) + query := dbsession.WithContext(ctx).Table("evaluator_tag"). + Select("source_id"). + Where("tag_type = ?", tagType). + Where("deleted_at IS NULL") if langType != "" { query = query.Where("lang_type = ?", langType) } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go index 9eb81f7e1..1fca340d4 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator.gen.go @@ -26,8 +26,7 @@ type Evaluator struct { UpdatedAt time.Time `gorm:"column:updated_at;type:timestamp;not null;index:idx_space_id_updated_at,priority:2;default:CURRENT_TIMESTAMP;comment:更新时间" json:"updated_at"` // 更新时间 DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"` // 删除时间 LatestVersion string `gorm:"column:latest_version;type:varchar(128);not null;comment:最新版本号" json:"latest_version"` // 最新版本号 - Benchmark *string `gorm:"column:benchmark;type:varchar(255);comment:benchmark" json:"benchmark"` // benchmark - Vendor *string `gorm:"column:vendor;type:varchar(255);comment:vendor" json:"vendor"` // vendor + EvaluatorInfo *[]byte `gorm:"column:evaluator_info;type:blob binary;comment:评估器补充信息, json" json:"evaluator_info"` // 评估器补充信息, json Builtin int32 `gorm:"column:builtin;type:int(11) unsigned;not null;default:2;comment:是否预置，1:是；2:否" json:"builtin"` // 是否预置，1:是；2:否 BoxType int32 `gorm:"column:box_type;type:int(11) unsigned;not null;default:1;comment:黑白盒类型，1:白盒；2:黑盒" json:"box_type"` // 黑白盒类型，1:白盒；2:黑盒 BuiltinVisibleVersion string `gorm:"column:builtin_visible_version;type:varchar(128) character set utf8mb4;not null;comment:预置评估器最新可见版本号" json:"builtin_visible_version"` // 预置评估器最新可见版本号 diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_template.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_template.gen.go index ca4730dd2..9f92c2624 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_template.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model/evaluator_template.gen.go @@ -29,8 +29,7 @@ type EvaluatorTemplate struct { UpdatedAt time.Time `gorm:"column:updated_at;type:timestamp;not null;default:CURRENT_TIMESTAMP;comment:更新时间" json:"updated_at"` // 更新时间 DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"` // 删除时间 Popularity int64 `gorm:"column:popularity;type:bigint(20) unsigned;not null;comment:热度" json:"popularity"` // 热度 - Benchmark *string `gorm:"column:benchmark;type:varchar(255) character set utf8mb4;comment:benchmark" json:"benchmark"` // benchmark - Vendor *string `gorm:"column:vendor;type:varchar(255) character set utf8mb4;comment:vendor" json:"vendor"` // vendor + EvaluatorInfo *[]byte `gorm:"column:evaluator_info;type:blob binary;comment:评估器补充信息, json" json:"evaluator_info"` // 评估器补充信息, json } // TableName EvaluatorTemplate's table name diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go index 22fa9a385..542e5e699 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator.gen.go @@ -39,8 +39,7 @@ func newEvaluator(db *gorm.DB, opts ...gen.DOOption) evaluator { _evaluator.UpdatedAt = field.NewTime(tableName, "updated_at") _evaluator.DeletedAt = field.NewField(tableName, "deleted_at") _evaluator.LatestVersion = field.NewString(tableName, "latest_version") - _evaluator.Benchmark = field.NewString(tableName, "benchmark") - _evaluator.Vendor = field.NewString(tableName, "vendor") + _evaluator.EvaluatorInfo = field.NewBytes(tableName, "evaluator_info") _evaluator.Builtin = field.NewInt32(tableName, "builtin") _evaluator.BoxType = field.NewInt32(tableName, "box_type") _evaluator.BuiltinVisibleVersion = field.NewString(tableName, "builtin_visible_version") @@ -67,8 +66,7 @@ type evaluator struct { UpdatedAt field.Time // 更新时间 DeletedAt field.Field // 删除时间 LatestVersion field.String // 最新版本号 - Benchmark field.String // benchmark - Vendor field.String // vendor + EvaluatorInfo field.Bytes // 评估器补充信息, json Builtin field.Int32 // 是否预置，1:是；2:否 BoxType field.Int32 // 黑白盒类型，1:白盒；2:黑盒 BuiltinVisibleVersion field.String // 预置评估器最新可见版本号 @@ -100,8 +98,7 @@ func (e *evaluator) updateTableName(table string) *evaluator { e.UpdatedAt = field.NewTime(table, "updated_at") e.DeletedAt = field.NewField(table, "deleted_at") e.LatestVersion = field.NewString(table, "latest_version") - e.Benchmark = field.NewString(table, "benchmark") - e.Vendor = field.NewString(table, "vendor") + e.EvaluatorInfo = field.NewBytes(table, "evaluator_info") e.Builtin = field.NewInt32(table, "builtin") e.BoxType = field.NewInt32(table, "box_type") e.BuiltinVisibleVersion = field.NewString(table, "builtin_visible_version") @@ -131,7 +128,7 @@ func (e *evaluator) GetFieldByName(fieldName string) (field.OrderExpr, bool) { } func (e *evaluator) fillFieldMap() { - e.fieldMap = make(map[string]field.Expr, 17) + e.fieldMap = make(map[string]field.Expr, 16) e.fieldMap["id"] = e.ID e.fieldMap["space_id"] = e.SpaceID e.fieldMap["evaluator_type"] = e.EvaluatorType @@ -144,8 +141,7 @@ func (e *evaluator) fillFieldMap() { e.fieldMap["updated_at"] = e.UpdatedAt e.fieldMap["deleted_at"] = e.DeletedAt e.fieldMap["latest_version"] = e.LatestVersion - e.fieldMap["benchmark"] = e.Benchmark - e.fieldMap["vendor"] = e.Vendor + e.fieldMap["evaluator_info"] = e.EvaluatorInfo e.fieldMap["builtin"] = e.Builtin e.fieldMap["box_type"] = e.BoxType e.fieldMap["builtin_visible_version"] = e.BuiltinVisibleVersion diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_template.gen.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_template.gen.go index e4239519c..a9b7d4531 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_template.gen.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/query/evaluator_template.gen.go @@ -42,8 +42,7 @@ func newEvaluatorTemplate(db *gorm.DB, opts ...gen.DOOption) evaluatorTemplate { _evaluatorTemplate.UpdatedAt = field.NewTime(tableName, "updated_at") _evaluatorTemplate.DeletedAt = field.NewField(tableName, "deleted_at") _evaluatorTemplate.Popularity = field.NewInt64(tableName, "popularity") - _evaluatorTemplate.Benchmark = field.NewString(tableName, "benchmark") - _evaluatorTemplate.Vendor = field.NewString(tableName, "vendor") + _evaluatorTemplate.EvaluatorInfo = field.NewBytes(tableName, "evaluator_info") _evaluatorTemplate.fillFieldMap() @@ -70,8 +69,7 @@ type evaluatorTemplate struct { UpdatedAt field.Time // 更新时间 DeletedAt field.Field // 删除时间 Popularity field.Int64 // 热度 - Benchmark field.String // benchmark - Vendor field.String // vendor + EvaluatorInfo field.Bytes // 评估器补充信息, json fieldMap map[string]field.Expr } @@ -103,8 +101,7 @@ func (e *evaluatorTemplate) updateTableName(table string) *evaluatorTemplate { e.UpdatedAt = field.NewTime(table, "updated_at") e.DeletedAt = field.NewField(table, "deleted_at") e.Popularity = field.NewInt64(table, "popularity") - e.Benchmark = field.NewString(table, "benchmark") - e.Vendor = field.NewString(table, "vendor") + e.EvaluatorInfo = field.NewBytes(table, "evaluator_info") e.fillFieldMap() @@ -133,7 +130,7 @@ func (e *evaluatorTemplate) GetFieldByName(fieldName string) (field.OrderExpr, b } func (e *evaluatorTemplate) fillFieldMap() { - e.fieldMap = make(map[string]field.Expr, 17) + e.fieldMap = make(map[string]field.Expr, 16) e.fieldMap["id"] = e.ID e.fieldMap["space_id"] = e.SpaceID e.fieldMap["evaluator_type"] = e.EvaluatorType @@ -149,8 +146,7 @@ func (e *evaluatorTemplate) fillFieldMap() { e.fieldMap["updated_at"] = e.UpdatedAt e.fieldMap["deleted_at"] = e.DeletedAt e.fieldMap["popularity"] = e.Popularity - e.fieldMap["benchmark"] = e.Benchmark - e.fieldMap["vendor"] = e.Vendor + e.fieldMap["evaluator_info"] = e.EvaluatorInfo } func (e evaluatorTemplate) clone(db *gorm.DB) evaluatorTemplate { diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index 82d7d91f2..313b6a54c 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -120,6 +120,13 @@ struct EvaluatorIDVersionItem { 2: optional string version (api.js_conv = 'true', go.tag = 'json:"version"') } +struct EvaluatorInfo { + 1: optional string benchmark (go.tag = 'json:"benchmark"') + 2: optional string vendor (go.tag = 'json:"vendor"') + 3: optional string vendor_url (go.tag = 'json:"vendor_url"') + 4: optional string user_manual_url (go.tag = 'json:"user_manual_url"') +} + struct Evaluator { 1: optional i64 evaluator_id (api.js_conv = 'true', go.tag = 'json:"evaluator_id"') 2: optional i64 workspace_id (api.js_conv = 'true', go.tag = 'json:"workspace_id"') @@ -132,10 +139,9 @@ struct Evaluator { 12: optional string latest_version 20: optional bool builtin (go.tag = 'json:"builtin"') - 21: optional string benchmark (go.tag = 'json:"benchmark"') - 22: optional string vendor (go.tag = 'json:"vendor"') - 23: optional string builtin_visible_version (go.tag = 'json:"builtin_visible_version"') - 24: optional EvaluatorBoxType box_type (go.tag = 'json:"box_type"') // 默认白盒 + 21: optional EvaluatorInfo evaluator_info (go.tag = 'json:"evaluator_info"') + 22: optional string builtin_visible_version (go.tag = 'json:"builtin_visible_version"') + 23: optional EvaluatorBoxType box_type (go.tag = 'json:"box_type"') // 默认白盒 100: optional map>> tags (go.tag = 'json:"tags"') } @@ -147,8 +153,7 @@ struct EvaluatorTemplate { 4: optional string name 5: optional string description 6: optional i64 popularity (go.tag = 'json:"popularity"') // 热度 - 7: optional string benchmark (go.tag = 'json:"benchmark"') - 8: optional string vendor (go.tag = 'json:"vendor"') + 7: optional EvaluatorInfo evaluator_info (go.tag = 'json:"evaluator_info"') 9: optional map>> tags (go.tag = 'json:"tags"') 101: optional EvaluatorContent evaluator_content diff --git a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql index 11c85e181..a348a8886 100644 --- a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql +++ b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator.sql @@ -12,8 +12,7 @@ CREATE TABLE IF NOT EXISTS `evaluator` `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', `deleted_at` timestamp NULL DEFAULT NULL COMMENT '删除时间', `latest_version` varchar(128) NOT NULL DEFAULT '' COMMENT '最新版本号', - `benchmark` varchar(255) DEFAULT NULL COMMENT 'benchmark', - `vendor` varchar(255) DEFAULT NULL COMMENT 'vendor', + `evaluator_info` blob COMMENT '评估器补充信息, json', `builtin` int unsigned NOT NULL DEFAULT '2' COMMENT '是否预置，1:是；2:否', `box_type` int unsigned NOT NULL DEFAULT '1' COMMENT '黑白盒类型，1:白盒；2:黑盒', `builtin_visible_version` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '预置评估器最新可见版本号', diff --git a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_template.sql b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_template.sql index 158d90d50..b5d7cd347 100644 --- a/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_template.sql +++ b/release/deployment/docker-compose/bootstrap/mysql-init/init-sql/evaluator_template.sql @@ -14,7 +14,6 @@ CREATE TABLE `evaluator_template` ( `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', `deleted_at` timestamp NULL DEFAULT NULL COMMENT '删除时间', `popularity` bigint unsigned NOT NULL DEFAULT '0' COMMENT '热度', - `benchmark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'benchmark', - `vendor` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'vendor', + `evaluator_info` blob COMMENT '评估器补充信息, json', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='NDB_SHARE_TABLE;评估器模板' \ No newline at end of file From 0e263e5f93c1d5f7472523ce91c79c2257240ebe Mon Sep 17 00:00:00 2001 From: tpfz Date: Mon, 3 Nov 2025 22:19:17 +0800 Subject: [PATCH 13/42] =?UTF-8?q?=E9=80=82=E9=85=8Dmapping?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coze/loop/evaluation/domain/expt/expt.go | 75 ++++++- .../evaluation/domain/expt/expt_validator.go | 5 + .../loop/evaluation/domain/expt/k-expt.go | 55 +++++ .../evaluation/application/experiment_app.go | 194 ++++++++++-------- .../coze/loop/evaluation/domain/expt.thrift | 1 + 5 files changed, 244 insertions(+), 86 deletions(-) diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/expt/expt.go b/backend/kitex_gen/coze/loop/evaluation/domain/expt/expt.go index 3b06088bc..a4ffe87cc 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/expt/expt.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/expt/expt.go @@ -4477,9 +4477,10 @@ func (p *TargetFieldMapping) Field1DeepEqual(src []*FieldMapping) bool { } type EvaluatorFieldMapping struct { - EvaluatorVersionID int64 `thrift:"evaluator_version_id,1,required" frugal:"1,required,i64" json:"evaluator_version_id" form:"evaluator_version_id,required" query:"evaluator_version_id,required"` - FromEvalSet []*FieldMapping `thrift:"from_eval_set,2,optional" frugal:"2,optional,list" form:"from_eval_set" json:"from_eval_set,omitempty" query:"from_eval_set"` - FromTarget []*FieldMapping `thrift:"from_target,3,optional" frugal:"3,optional,list" form:"from_target" json:"from_target,omitempty" query:"from_target"` + EvaluatorVersionID int64 `thrift:"evaluator_version_id,1,required" frugal:"1,required,i64" json:"evaluator_version_id" form:"evaluator_version_id,required" query:"evaluator_version_id,required"` + FromEvalSet []*FieldMapping `thrift:"from_eval_set,2,optional" frugal:"2,optional,list" form:"from_eval_set" json:"from_eval_set,omitempty" query:"from_eval_set"` + FromTarget []*FieldMapping `thrift:"from_target,3,optional" frugal:"3,optional,list" form:"from_target" json:"from_target,omitempty" query:"from_target"` + EvaluatorIDVersionItem *evaluator.EvaluatorIDVersionItem `thrift:"evaluator_id_version_item,4,optional" frugal:"4,optional,evaluator.EvaluatorIDVersionItem" form:"evaluator_id_version_item" json:"evaluator_id_version_item,omitempty" query:"evaluator_id_version_item"` } func NewEvaluatorFieldMapping() *EvaluatorFieldMapping { @@ -4519,6 +4520,18 @@ func (p *EvaluatorFieldMapping) GetFromTarget() (v []*FieldMapping) { } return p.FromTarget } + +var EvaluatorFieldMapping_EvaluatorIDVersionItem_DEFAULT *evaluator.EvaluatorIDVersionItem + +func (p *EvaluatorFieldMapping) GetEvaluatorIDVersionItem() (v *evaluator.EvaluatorIDVersionItem) { + if p == nil { + return + } + if !p.IsSetEvaluatorIDVersionItem() { + return EvaluatorFieldMapping_EvaluatorIDVersionItem_DEFAULT + } + return p.EvaluatorIDVersionItem +} func (p *EvaluatorFieldMapping) SetEvaluatorVersionID(val int64) { p.EvaluatorVersionID = val } @@ -4528,11 +4541,15 @@ func (p *EvaluatorFieldMapping) SetFromEvalSet(val []*FieldMapping) { func (p *EvaluatorFieldMapping) SetFromTarget(val []*FieldMapping) { p.FromTarget = val } +func (p *EvaluatorFieldMapping) SetEvaluatorIDVersionItem(val *evaluator.EvaluatorIDVersionItem) { + p.EvaluatorIDVersionItem = val +} var fieldIDToName_EvaluatorFieldMapping = map[int16]string{ 1: "evaluator_version_id", 2: "from_eval_set", 3: "from_target", + 4: "evaluator_id_version_item", } func (p *EvaluatorFieldMapping) IsSetFromEvalSet() bool { @@ -4543,6 +4560,10 @@ func (p *EvaluatorFieldMapping) IsSetFromTarget() bool { return p.FromTarget != nil } +func (p *EvaluatorFieldMapping) IsSetEvaluatorIDVersionItem() bool { + return p.EvaluatorIDVersionItem != nil +} + func (p *EvaluatorFieldMapping) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -4587,6 +4608,14 @@ func (p *EvaluatorFieldMapping) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 4: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField4(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } default: if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError @@ -4679,6 +4708,14 @@ func (p *EvaluatorFieldMapping) ReadField3(iprot thrift.TProtocol) error { p.FromTarget = _field return nil } +func (p *EvaluatorFieldMapping) ReadField4(iprot thrift.TProtocol) error { + _field := evaluator.NewEvaluatorIDVersionItem() + if err := _field.Read(iprot); err != nil { + return err + } + p.EvaluatorIDVersionItem = _field + return nil +} func (p *EvaluatorFieldMapping) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 @@ -4698,6 +4735,10 @@ func (p *EvaluatorFieldMapping) Write(oprot thrift.TProtocol) (err error) { fieldId = 3 goto WriteFieldError } + if err = p.writeField4(oprot); err != nil { + fieldId = 4 + goto WriteFieldError + } } if err = oprot.WriteFieldStop(); err != nil { goto WriteFieldStopError @@ -4784,6 +4825,24 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) } +func (p *EvaluatorFieldMapping) writeField4(oprot thrift.TProtocol) (err error) { + if p.IsSetEvaluatorIDVersionItem() { + if err = oprot.WriteFieldBegin("evaluator_id_version_item", thrift.STRUCT, 4); err != nil { + goto WriteFieldBeginError + } + if err := p.EvaluatorIDVersionItem.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 4 end error: ", p), err) +} func (p *EvaluatorFieldMapping) String() string { if p == nil { @@ -4808,6 +4867,9 @@ func (p *EvaluatorFieldMapping) DeepEqual(ano *EvaluatorFieldMapping) bool { if !p.Field3DeepEqual(ano.FromTarget) { return false } + if !p.Field4DeepEqual(ano.EvaluatorIDVersionItem) { + return false + } return true } @@ -4844,6 +4906,13 @@ func (p *EvaluatorFieldMapping) Field3DeepEqual(src []*FieldMapping) bool { } return true } +func (p *EvaluatorFieldMapping) Field4DeepEqual(src *evaluator.EvaluatorIDVersionItem) bool { + + if !p.EvaluatorIDVersionItem.DeepEqual(src) { + return false + } + return true +} type FieldMapping struct { FieldName *string `thrift:"field_name,1,optional" frugal:"1,optional,string" form:"field_name" json:"field_name,omitempty" query:"field_name"` diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/expt/expt_validator.go b/backend/kitex_gen/coze/loop/evaluation/domain/expt/expt_validator.go index fc14cda0f..09ca4bbec 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/expt/expt_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/expt/expt_validator.go @@ -72,6 +72,11 @@ func (p *TargetFieldMapping) IsValid() error { return nil } func (p *EvaluatorFieldMapping) IsValid() error { + if p.EvaluatorIDVersionItem != nil { + if err := p.EvaluatorIDVersionItem.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorIDVersionItem not valid, %w", err) + } + } return nil } func (p *FieldMapping) IsValid() error { diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/expt/k-expt.go b/backend/kitex_gen/coze/loop/evaluation/domain/expt/k-expt.go index 0c8040458..8494adedc 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/expt/k-expt.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/expt/k-expt.go @@ -2672,6 +2672,20 @@ func (p *EvaluatorFieldMapping) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 4: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField4(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 + } + } default: l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -2760,6 +2774,18 @@ func (p *EvaluatorFieldMapping) FastReadField3(buf []byte) (int, error) { return offset, nil } +func (p *EvaluatorFieldMapping) FastReadField4(buf []byte) (int, error) { + offset := 0 + _field := evaluator.NewEvaluatorIDVersionItem() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.EvaluatorIDVersionItem = _field + return offset, nil +} + func (p *EvaluatorFieldMapping) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } @@ -2770,6 +2796,7 @@ func (p *EvaluatorFieldMapping) FastWriteNocopy(buf []byte, w thrift.NocopyWrite offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) offset += p.fastWriteField3(buf[offset:], w) + offset += p.fastWriteField4(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) return offset @@ -2781,6 +2808,7 @@ func (p *EvaluatorFieldMapping) BLength() int { l += p.field1Length() l += p.field2Length() l += p.field3Length() + l += p.field4Length() } l += thrift.Binary.FieldStopLength() return l @@ -2825,6 +2853,15 @@ func (p *EvaluatorFieldMapping) fastWriteField3(buf []byte, w thrift.NocopyWrite return offset } +func (p *EvaluatorFieldMapping) fastWriteField4(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetEvaluatorIDVersionItem() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 4) + offset += p.EvaluatorIDVersionItem.FastWriteNocopy(buf[offset:], w) + } + return offset +} + func (p *EvaluatorFieldMapping) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() @@ -2858,6 +2895,15 @@ func (p *EvaluatorFieldMapping) field3Length() int { return l } +func (p *EvaluatorFieldMapping) field4Length() int { + l := 0 + if p.IsSetEvaluatorIDVersionItem() { + l += thrift.Binary.FieldBeginLength() + l += p.EvaluatorIDVersionItem.BLength() + } + return l +} + func (p *EvaluatorFieldMapping) DeepCopy(s interface{}) error { src, ok := s.(*EvaluatorFieldMapping) if !ok { @@ -2896,6 +2942,15 @@ func (p *EvaluatorFieldMapping) DeepCopy(s interface{}) error { } } + var _evaluatorIDVersionItem *evaluator.EvaluatorIDVersionItem + if src.EvaluatorIDVersionItem != nil { + _evaluatorIDVersionItem = &evaluator.EvaluatorIDVersionItem{} + if err := _evaluatorIDVersionItem.DeepCopy(src.EvaluatorIDVersionItem); err != nil { + return err + } + } + p.EvaluatorIDVersionItem = _evaluatorIDVersionItem + return nil } diff --git a/backend/modules/evaluation/application/experiment_app.go b/backend/modules/evaluation/application/experiment_app.go index 8d2b569d7..7ad9d01e1 100644 --- a/backend/modules/evaluation/application/experiment_app.go +++ b/backend/modules/evaluation/application/experiment_app.go @@ -136,11 +136,11 @@ func (e *experimentApplication) SubmitExperiment(ctx context.Context, req *expt. return nil, errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("duplicate evaluator version ids")) } - // 收集 evaluator_version_id（包含顺序解析 EvaluatorIDVersionList） - evalVersionIDs, err := e.resolveEvaluatorVersionIDs(ctx, req) - if err != nil { - return nil, err - } + // 收集 evaluator_version_id（包含顺序解析 EvaluatorIDVersionList） + evalVersionIDs, err := e.resolveEvaluatorVersionIDs(ctx, req) + if err != nil { + return nil, err + } // 去重 if len(evalVersionIDs) > 1 { @@ -201,84 +201,112 @@ func (e *experimentApplication) SubmitExperiment(ctx context.Context, req *expt. // 1) 先取请求中的 EvaluatorVersionIds // 2) 从有序 EvaluatorIDVersionList 中批量解析并按输入顺序回填版本ID func (e *experimentApplication) resolveEvaluatorVersionIDs(ctx context.Context, req *expt.SubmitExperimentRequest) ([]int64, error) { - evalVersionIDs := make([]int64, 0, len(req.EvaluatorVersionIds)) - evalVersionIDs = append(evalVersionIDs, req.EvaluatorVersionIds...) - - // 解析有序列表并批量查询：将 BuiltinVisible 与普通版本分离，分别批量查，最后按输入顺序回填版本ID - items := req.GetEvaluatorIDVersionList() - builtinIDs := make([]int64, 0) - normalPairs := make([][2]interface{}, 0) - for _, it := range items { - if it == nil { - continue - } - eid := it.GetEvaluatorID() - ver := it.GetVersion() - if eid == 0 || ver == "" { - continue - } - if ver == "BuiltinVisible" { - builtinIDs = append(builtinIDs, eid) - } else { - normalPairs = append(normalPairs, [2]interface{}{eid, ver}) - } - } - - // 批量获取内置与普通版本 - id2Builtin := make(map[int64]*entity.Evaluator, len(builtinIDs)) - if len(builtinIDs) > 0 { - evs, err := e.evaluatorService.BatchGetBuiltinEvaluator(ctx, builtinIDs) - if err != nil { - return nil, err - } - for _, ev := range evs { - if ev != nil { - id2Builtin[ev.ID] = ev - } - } - } - - pair2Eval := make(map[string]*entity.Evaluator, len(normalPairs)) - if len(normalPairs) > 0 { - evs, err := e.evaluatorService.BatchGetEvaluatorByIDAndVersion(ctx, normalPairs) - if err != nil { - return nil, err - } - for _, ev := range evs { - if ev == nil { - continue - } - key := fmt.Sprintf("%d#%s", ev.ID, ev.GetVersion()) - pair2Eval[key] = ev - } - } - - // 按输入顺序回填版本ID - for _, it := range items { - if it == nil { - continue - } - eid := it.GetEvaluatorID() - ver := it.GetVersion() - if eid == 0 || ver == "" { - continue - } - var ev *entity.Evaluator - if ver == "BuiltinVisible" { - ev = id2Builtin[eid] - } else { - key := fmt.Sprintf("%d#%s", eid, ver) - ev = pair2Eval[key] - } - if ev == nil { - continue - } - if verID := ev.GetEvaluatorVersionID(); verID != 0 { - evalVersionIDs = append(evalVersionIDs, verID) - } - } - - return evalVersionIDs, nil + evalVersionIDs := make([]int64, 0, len(req.EvaluatorVersionIds)) + evalVersionIDs = append(evalVersionIDs, req.EvaluatorVersionIds...) + + // 解析有序列表并批量查询：将 BuiltinVisible 与普通版本分离，分别批量查，最后按输入顺序回填版本ID + items := req.GetEvaluatorIDVersionList() + builtinIDs := make([]int64, 0) + normalPairs := make([][2]interface{}, 0) + for _, it := range items { + if it == nil { + continue + } + eid := it.GetEvaluatorID() + ver := it.GetVersion() + if eid == 0 || ver == "" { + continue + } + if ver == "BuiltinVisible" { + builtinIDs = append(builtinIDs, eid) + } else { + normalPairs = append(normalPairs, [2]interface{}{eid, ver}) + } + } + + // 批量获取内置与普通版本 + id2Builtin := make(map[int64]*entity.Evaluator, len(builtinIDs)) + if len(builtinIDs) > 0 { + evs, err := e.evaluatorService.BatchGetBuiltinEvaluator(ctx, builtinIDs) + if err != nil { + return nil, err + } + for _, ev := range evs { + if ev != nil { + id2Builtin[ev.ID] = ev + } + } + } + + pair2Eval := make(map[string]*entity.Evaluator, len(normalPairs)) + if len(normalPairs) > 0 { + evs, err := e.evaluatorService.BatchGetEvaluatorByIDAndVersion(ctx, normalPairs) + if err != nil { + return nil, err + } + for _, ev := range evs { + if ev == nil { + continue + } + key := fmt.Sprintf("%d#%s", ev.ID, ev.GetVersion()) + pair2Eval[key] = ev + } + } + + // 按输入顺序回填版本ID + for _, it := range items { + if it == nil { + continue + } + eid := it.GetEvaluatorID() + ver := it.GetVersion() + if eid == 0 || ver == "" { + continue + } + var ev *entity.Evaluator + if ver == "BuiltinVisible" { + ev = id2Builtin[eid] + } else { + key := fmt.Sprintf("%d#%s", eid, ver) + ev = pair2Eval[key] + } + if ev == nil { + continue + } + if verID := ev.GetEvaluatorVersionID(); verID != 0 { + evalVersionIDs = append(evalVersionIDs, verID) + } + } + + // 回填 EvaluatorFieldMapping 中缺失的 evaluator_version_id + if fm := req.GetEvaluatorFieldMapping(); len(fm) > 0 { + for _, m := range fm { + if m == nil || m.GetEvaluatorVersionID() != 0 { + continue + } + if item := m.GetEvaluatorIDVersionItem(); item != nil { + eid := item.GetEvaluatorID() + ver := item.GetVersion() + if eid == 0 || ver == "" { + continue + } + var ev *entity.Evaluator + if ver == "BuiltinVisible" { + ev = id2Builtin[eid] + } else { + key := fmt.Sprintf("%d#%s", eid, ver) + ev = pair2Eval[key] + } + if ev != nil { + if vid := ev.GetEvaluatorVersionID(); vid != 0 { + m.SetEvaluatorVersionID(vid) + } + } + } + } + } + + return evalVersionIDs, nil } func (e *experimentApplication) CheckExperimentName(ctx context.Context, req *expt.CheckExperimentNameRequest) (r *expt.CheckExperimentNameResponse, err error) { diff --git a/idl/thrift/coze/loop/evaluation/domain/expt.thrift b/idl/thrift/coze/loop/evaluation/domain/expt.thrift index 4869d46e9..3a94196ba 100644 --- a/idl/thrift/coze/loop/evaluation/domain/expt.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/expt.thrift @@ -91,6 +91,7 @@ struct EvaluatorFieldMapping { 1: required i64 evaluator_version_id (api.js_conv='true', go.tag='json:"evaluator_version_id"') 2: optional list from_eval_set 3: optional list from_target + 4: optional evaluator.EvaluatorIDVersionItem evaluator_id_version_item } struct FieldMapping { From ae2ea77f95b4655c40fbc3673e8b52c77c0012a6 Mon Sep 17 00:00:00 2001 From: tpfz Date: Mon, 3 Nov 2025 22:43:12 +0800 Subject: [PATCH 14/42] add ut --- .../evaluator/evaluator_template_test.go | 180 +++++++ .../convertor/evaluator/evaluator_test.go | 480 ++++++------------ .../domain/entity/evaluator_test.go | 145 +++++- 3 files changed, 487 insertions(+), 318 deletions(-) create mode 100644 backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go new file mode 100644 index 000000000..5742006b1 --- /dev/null +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go @@ -0,0 +1,180 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package evaluator + +import ( + "testing" + + "github.com/bytedance/gg/gptr" + "github.com/stretchr/testify/assert" + + commondto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" + evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" + evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" +) + +func TestConvertEvaluatorTemplateDTO2DO_Nil(t *testing.T) { + t.Parallel() + assert.Nil(t, ConvertEvaluatorTemplateDTO2DO(nil)) +} + +func TestConvertEvaluatorTemplateDTO2DO_BasicAndTagsAndInfo(t *testing.T) { + t.Parallel() + dto := &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(123)), + WorkspaceID: gptr.Of(int64(456)), + Name: gptr.Of("name"), + Description: gptr.Of("desc"), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), + Popularity: gptr.Of(int64(9)), + BaseInfo: &commondto.BaseInfo{CreatedBy: &commondto.UserInfo{UserID: gptr.Of("u1")}}, + EvaluatorContent: &evaluatordto.EvaluatorContent{ + ReceiveChatHistory: gptr.Of(true), + InputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("in")}}, + OutputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("out")}}, + PromptEvaluator: &evaluatordto.PromptEvaluator{MessageList: []*commondto.Message{{Content: &commondto.Content{Text: gptr.Of("t")}}}}, + }, + Tags: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{ + evaluatordto.EvaluatorTagLangType("zh"): { + evaluatordto.EvaluatorTagKeyName: {"n1", "n2"}, + }, + }, + } + do := ConvertEvaluatorTemplateDTO2DO(dto) + assert.NotNil(t, do) + assert.Equal(t, int64(123), do.ID) + assert.Equal(t, int64(456), do.SpaceID) + assert.Equal(t, "name", do.Name) + assert.Equal(t, "desc", do.Description) + assert.Equal(t, evaluatordo.EvaluatorTypePrompt, do.EvaluatorType) + assert.Equal(t, int64(9), do.Popularity) + // EvaluatorInfo 字段在模板DTO可能不存在，忽略该字段校验 + assert.NotNil(t, do.BaseInfo) + assert.True(t, gptr.Indirect(do.ReceiveChatHistory)) + assert.Len(t, do.InputSchemas, 1) + assert.Len(t, do.OutputSchemas, 1) + if assert.NotNil(t, do.PromptEvaluatorContent) { + assert.Len(t, do.PromptEvaluatorContent.MessageList, 1) + } + if assert.NotNil(t, do.Tags) { + assert.Equal(t, []string{"n1", "n2"}, do.Tags[evaluatordo.EvaluatorTagLangType("zh")][evaluatordo.EvaluatorTagKey("Name")]) + } +} + +func TestConvertEvaluatorTemplateDTO2DO_CodeEval_NewAndCompat(t *testing.T) { + t.Parallel() + // 新字段：lang_2_code_content + dtoNew := &evaluatordto.EvaluatorTemplate{ + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{}, + }, + } + dtoNew.EvaluatorContent.CodeEvaluator.SetLang2CodeContent(map[evaluatordto.LanguageType]string{ + evaluatordto.LanguageTypePython: "print('hi')", + }) + doNew := ConvertEvaluatorTemplateDTO2DO(dtoNew) + if assert.NotNil(t, doNew) && assert.NotNil(t, doNew.CodeEvaluatorContent) { + assert.Equal(t, "print('hi')", doNew.CodeEvaluatorContent.Lang2CodeContent[evaluatordo.LanguageTypePython]) + } + + // 兼容旧字段：language_type + code_content + dtoOld := &evaluatordto.EvaluatorTemplate{ + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypePython), CodeContent: gptr.Of("print('ok')")}, + }, + } + doOld := ConvertEvaluatorTemplateDTO2DO(dtoOld) + if assert.NotNil(t, doOld) && assert.NotNil(t, doOld.CodeEvaluatorContent) { + assert.Equal(t, "print('ok')", doOld.CodeEvaluatorContent.Lang2CodeContent[evaluatordo.LanguageTypePython]) + } +} + +func TestConvertEvaluatorTemplateDO2DTO_Nil(t *testing.T) { + t.Parallel() + assert.Nil(t, ConvertEvaluatorTemplateDO2DTO(nil)) +} + +func TestConvertEvaluatorTemplateDO2DTO_Full(t *testing.T) { + t.Parallel() + do := &evaluatordo.EvaluatorTemplate{ + ID: 1, + SpaceID: 2, + Name: "n", + Description: "d", + EvaluatorType: evaluatordo.EvaluatorTypePrompt, + Popularity: 3, + BaseInfo: &evaluatordo.BaseInfo{}, + InputSchemas: []*evaluatordo.ArgsSchema{{Key: gptr.Of("in")}}, + OutputSchemas: []*evaluatordo.ArgsSchema{{Key: gptr.Of("out")}}, + ReceiveChatHistory: gptr.Of(true), + PromptEvaluatorContent: &evaluatordo.PromptEvaluatorContent{MessageList: []*evaluatordo.Message{{Content: &evaluatordo.Content{Text: gptr.Of("t")}}}}, + Tags: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{ + evaluatordo.EvaluatorTagLangType("en"): {evaluatordo.EvaluatorTagKey("Name"): {"x"}}, + }, + } + dto := ConvertEvaluatorTemplateDO2DTO(do) + if assert.NotNil(t, dto) { + assert.Equal(t, int64(1), dto.GetID()) + assert.Equal(t, int64(2), dto.GetWorkspaceID()) + assert.Equal(t, "n", dto.GetName()) + assert.Equal(t, "d", dto.GetDescription()) + assert.Equal(t, evaluatordto.EvaluatorType_Prompt, dto.GetEvaluatorType()) + assert.Equal(t, int64(3), dto.GetPopularity()) + // EvaluatorInfo 字段在模板DTO可能不存在，忽略该字段校验 + if assert.NotNil(t, dto.EvaluatorContent) { + assert.True(t, gptr.Indirect(dto.EvaluatorContent.ReceiveChatHistory)) + assert.Len(t, dto.EvaluatorContent.InputSchemas, 1) + assert.Len(t, dto.EvaluatorContent.OutputSchemas, 1) + if assert.NotNil(t, dto.EvaluatorContent.PromptEvaluator) { + assert.Len(t, dto.EvaluatorContent.PromptEvaluator.MessageList, 1) + } + } + assert.Equal(t, []string{"x"}, dto.Tags[evaluatordto.EvaluatorTagLangType("en")][evaluatordto.EvaluatorTagKey("Name")]) + } +} + +func TestConvertEvaluatorTemplateDOList2DTO(t *testing.T) { + t.Parallel() + doList := []*evaluatordo.EvaluatorTemplate{{Name: "a"}, {Name: "b"}} + dtoList := ConvertEvaluatorTemplateDOList2DTO(doList) + assert.Len(t, dtoList, 2) + assert.Equal(t, "a", dtoList[0].GetName()) + assert.Equal(t, "b", dtoList[1].GetName()) +} + +func TestCodeEvaluatorContentDTOAndDO(t *testing.T) { + t.Parallel() + // DTO2DO 新字段 + dto := &evaluatordto.CodeEvaluator{} + dto.SetLang2CodeContent(map[evaluatordto.LanguageType]string{ + evaluatordto.LanguageTypePython: "print(1)", + }) + do := ConvertCodeEvaluatorContentDTO2DO(dto) + if assert.NotNil(t, do) { + assert.Equal(t, "print(1)", do.Lang2CodeContent[evaluatordo.LanguageTypePython]) + } + + // DTO2DO 旧字段 + dto2 := &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypeJS), CodeContent: gptr.Of("console.log(1)")} + do2 := ConvertCodeEvaluatorContentDTO2DO(dto2) + if assert.NotNil(t, do2) { + assert.Equal(t, "console.log(1)", do2.Lang2CodeContent[evaluatordo.LanguageTypeJS]) + } + + // DO2DTO + back := ConvertCodeEvaluatorContentDO2DTO(&evaluatordo.CodeEvaluatorContent{Lang2CodeContent: map[evaluatordo.LanguageType]string{ + evaluatordo.LanguageTypePython: "print(2)", + }}) + if assert.NotNil(t, back) { + m := back.GetLang2CodeContent() + assert.Equal(t, "print(2)", m[evaluatordto.LanguageTypePython]) + // 回填旧字段 + assert.NotNil(t, back.LanguageType) + assert.NotNil(t, back.CodeContent) + } +} + + diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go index ed1f6015b..cefc6b99f 100755 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go @@ -12,159 +12,181 @@ import ( commondto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" - "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/errno" - "github.com/coze-dev/coze-loop/backend/pkg/errorx" ) -func TestConvertEvaluatorDTO2DO(t *testing.T) { - t.Parallel() - - tests := []struct { - name string - evaluatorDTO *evaluatordto.Evaluator - expected *evaluatordo.Evaluator - }{ - { - name: "Prompt评估器转换", - evaluatorDTO: &evaluatordto.Evaluator{ - EvaluatorID: gptr.Of(int64(123)), - WorkspaceID: gptr.Of(int64(456)), - Name: gptr.Of("Test Prompt Evaluator"), - Description: gptr.Of("Test description"), - DraftSubmitted: gptr.Of(true), - EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), - LatestVersion: gptr.Of("1"), - Tags: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{ - evaluatordto.EvaluatorTagLangTypeEn: { - evaluatordto.EvaluatorTagKeyCategory: {"LLM", "Code"}, - evaluatordto.EvaluatorTagKeyObjective: {"Quality"}, - }, - }, - }, - expected: &evaluatordo.Evaluator{ - ID: 123, - SpaceID: 456, - Name: "Test Prompt Evaluator", - Description: "Test description", - DraftSubmitted: true, - EvaluatorType: evaluatordo.EvaluatorTypePrompt, - LatestVersion: "1", - Tags: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{ - evaluatordo.EvaluatorTagLangType_En: { - evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, - evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, - }, - }, - }, - }, - { - name: "Code评估器转换", - evaluatorDTO: &evaluatordto.Evaluator{ - EvaluatorID: gptr.Of(int64(124)), - WorkspaceID: gptr.Of(int64(457)), - Name: gptr.Of("Test Code Evaluator"), - Description: gptr.Of("Code test description"), - DraftSubmitted: gptr.Of(false), - EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), - LatestVersion: gptr.Of("2"), - }, - expected: &evaluatordo.Evaluator{ - ID: 124, - SpaceID: 457, - Name: "Test Code Evaluator", - Description: "Code test description", - DraftSubmitted: false, - EvaluatorType: evaluatordo.EvaluatorTypeCode, - LatestVersion: "2", - }, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - t.Parallel() - - result := ConvertEvaluatorDTO2DO(tt.evaluatorDTO) +func TestConvertBoxType(t *testing.T) { + t.Parallel() + assert.Equal(t, evaluatordo.EvaluatorBoxTypeWhite, convertBoxTypeDTO2DO("White")) + assert.Equal(t, evaluatordo.EvaluatorBoxTypeBlack, convertBoxTypeDTO2DO("Black")) + assert.Equal(t, evaluatordo.EvaluatorBoxTypeWhite, convertBoxTypeDTO2DO("")) - assert.Equal(t, tt.expected.ID, result.ID) - assert.Equal(t, tt.expected.SpaceID, result.SpaceID) - assert.Equal(t, tt.expected.Name, result.Name) - assert.Equal(t, tt.expected.Description, result.Description) - assert.Equal(t, tt.expected.DraftSubmitted, result.DraftSubmitted) - assert.Equal(t, tt.expected.EvaluatorType, result.EvaluatorType) - assert.Equal(t, tt.expected.LatestVersion, result.LatestVersion) - }) - } + assert.Equal(t, "White", convertBoxTypeDO2DTO(evaluatordo.EvaluatorBoxTypeWhite)) + assert.Equal(t, "Black", convertBoxTypeDO2DTO(evaluatordo.EvaluatorBoxTypeBlack)) } -func TestConvertEvaluatorDO2DTO(t *testing.T) { - t.Parallel() +func TestNormalizeLanguageType(t *testing.T) { + t.Parallel() + assert.Equal(t, evaluatordo.LanguageTypePython, normalizeLanguageType(evaluatordo.LanguageType("python"))) + assert.Equal(t, evaluatordo.LanguageTypeJS, normalizeLanguageType(evaluatordo.LanguageType("js"))) + assert.Equal(t, evaluatordo.LanguageType("Java"), normalizeLanguageType(evaluatordo.LanguageType("java"))) +} - tests := []struct { - name string - evaluatorDO *evaluatordo.Evaluator - expectedType evaluatordto.EvaluatorType - }{ - { - name: "Prompt评估器转换", - evaluatorDO: &evaluatordo.Evaluator{ - ID: 123, - SpaceID: 456, - Name: "Test Prompt Evaluator", - Description: "Test description", - DraftSubmitted: true, - EvaluatorType: evaluatordo.EvaluatorTypePrompt, - LatestVersion: "1", - Tags: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{ - evaluatordo.EvaluatorTagLangType_En: { - evaluatordo.EvaluatorTagKey_Category: {"LLM", "Code"}, - evaluatordo.EvaluatorTagKey_Objective: {"Quality"}, - }, - }, - }, - expectedType: evaluatordto.EvaluatorType_Prompt, - }, - { - name: "Code评估器转换", - evaluatorDO: &evaluatordo.Evaluator{ - ID: 124, - SpaceID: 457, - Name: "Test Code Evaluator", - Description: "Code test description", - DraftSubmitted: false, - EvaluatorType: evaluatordo.EvaluatorTypeCode, - LatestVersion: "2", - }, - expectedType: evaluatordto.EvaluatorType_Code, - }, - { - name: "nil输入", - evaluatorDO: nil, - }, - } +func TestConvertEvaluatorDTO2DO_And_Back(t *testing.T) { + t.Parallel() + dto := &evaluatordto.Evaluator{ + EvaluatorID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(int64(2)), + Name: gptr.Of("n"), + Description: gptr.Of("d"), + DraftSubmitted: gptr.Of(true), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), + LatestVersion: gptr.Of("1.0.0"), + Builtin: gptr.Of(false), + BuiltinVisibleVersion: gptr.Of("1.0.0"), + BoxType: gptr.Of("Black"), + BaseInfo: &commondto.BaseInfo{}, + CurrentVersion: &evaluatordto.EvaluatorVersion{ID: gptr.Of(int64(10)), Version: gptr.Of("1.0.0"), + EvaluatorContent: &evaluatordto.EvaluatorContent{CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypePython), CodeTemplateKey: gptr.Of("tk"), CodeTemplateName: gptr.Of("tn"), CodeContent: gptr.Of("print(1)")}}}, + Tags: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{ + evaluatordto.EvaluatorTagLangType("en"): {evaluatordto.EvaluatorTagKeyName: {"tag"}}, + }, + } + do := ConvertEvaluatorDTO2DO(dto) + if assert.NotNil(t, do) { + assert.Equal(t, int64(1), do.ID) + assert.Equal(t, int64(2), do.SpaceID) + assert.Equal(t, "n", do.Name) + assert.Equal(t, true, do.DraftSubmitted) + assert.Equal(t, evaluatordo.EvaluatorBoxTypeBlack, do.BoxType) + // EvaluatorInfo 字段非本用例重点 + // Code 版本 + if assert.NotNil(t, do.CodeEvaluatorVersion) { + assert.Equal(t, "Python", string(do.CodeEvaluatorVersion.LanguageType)) + assert.Equal(t, "print(1)", do.CodeEvaluatorVersion.CodeContent) + } + // Tags + assert.Equal(t, []string{"tag"}, do.Tags[evaluatordo.EvaluatorTagLangType("en")][evaluatordo.EvaluatorTagKey("Name")]) + } + back := ConvertEvaluatorDO2DTO(do) + if assert.NotNil(t, back) { + assert.Equal(t, "Black", back.GetBoxType()) + if assert.NotNil(t, back.CurrentVersion) && assert.NotNil(t, back.CurrentVersion.EvaluatorContent) { + assert.Equal(t, evaluatordto.LanguageTypePython, back.CurrentVersion.EvaluatorContent.CodeEvaluator.GetLanguageType()) + } + // EvaluatorInfo 字段非本用例重点 + } +} - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - t.Parallel() +func TestConvertCodeEvaluatorVersionRoundTrip(t *testing.T) { + t.Parallel() + // DTO -> DO + dto := &evaluatordto.EvaluatorVersion{ID: gptr.Of(int64(11)), Version: gptr.Of("0.1.0"), Description: gptr.Of("desc"), + EvaluatorContent: &evaluatordto.EvaluatorContent{CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypeJS), CodeTemplateKey: gptr.Of("k"), CodeTemplateName: gptr.Of("n"), CodeContent: gptr.Of("console.log(1)")}}} + do := ConvertCodeEvaluatorVersionDTO2DO(1, 2, dto) + if assert.NotNil(t, do) { + assert.Equal(t, int64(11), do.ID) + assert.Equal(t, int64(2), do.SpaceID) + assert.Equal(t, evaluatordo.LanguageTypeJS, do.LanguageType) + } + // DO -> DTO + dtoBack := ConvertCodeEvaluatorVersionDO2DTO(do) + if assert.NotNil(t, dtoBack) { + assert.Equal(t, "0.1.0", dtoBack.GetVersion()) + if assert.NotNil(t, dtoBack.EvaluatorContent) && assert.NotNil(t, dtoBack.EvaluatorContent.CodeEvaluator) { + assert.Equal(t, evaluatordto.LanguageTypeJS, dtoBack.EvaluatorContent.CodeEvaluator.GetLanguageType()) + assert.Equal(t, "console.log(1)", dtoBack.EvaluatorContent.CodeEvaluator.GetCodeContent()) + } + } +} - result := ConvertEvaluatorDO2DTO(tt.evaluatorDO) +func TestConvertPromptEvaluatorVersionRoundTrip(t *testing.T) { + t.Parallel() + // DTO -> DO + dto := &evaluatordto.EvaluatorVersion{ + ID: gptr.Of(int64(21)), + Version: gptr.Of("0.2.0"), + Description: gptr.Of("desc"), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + ReceiveChatHistory: gptr.Of(true), + InputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("in")}}, + PromptEvaluator: &evaluatordto.PromptEvaluator{ + PromptSourceType: evaluatordto.PromptSourceTypePtr(evaluatordto.PromptSourceType_BuiltinTemplate), + PromptTemplateKey: gptr.Of("ptk"), + MessageList: []*commondto.Message{{Content: &commondto.Content{Text: gptr.Of("t")}}}, + }, + }, + } + do := ConvertPromptEvaluatorVersionDTO2DO(100, 200, dto) + if assert.NotNil(t, do) { + assert.Equal(t, int64(21), do.ID) + assert.True(t, gptr.Indirect(do.ReceiveChatHistory)) + assert.Equal(t, "ptk", do.PromptTemplateKey) + assert.Len(t, do.InputSchemas, 1) + } + // DO -> DTO + dtoBack := ConvertPromptEvaluatorVersionDO2DTO(do) + if assert.NotNil(t, dtoBack) { + assert.Equal(t, "0.2.0", dtoBack.GetVersion()) + if assert.NotNil(t, dtoBack.EvaluatorContent) && assert.NotNil(t, dtoBack.EvaluatorContent.PromptEvaluator) { + assert.Equal(t, "ptk", dtoBack.EvaluatorContent.PromptEvaluator.GetPromptTemplateKey()) + } + } +} - if tt.evaluatorDO == nil { - assert.Nil(t, result) - return - } +func TestConvertEvaluatorContent2DO(t *testing.T) { + t.Parallel() + // nil content + e, err := ConvertEvaluatorContent2DO(nil, evaluatordto.EvaluatorType_Prompt) + assert.Nil(t, e) + assert.Error(t, err) + + // prompt missing content + _, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{}, evaluatordto.EvaluatorType_Prompt) + assert.Error(t, err) + + // code missing content + _, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{}, evaluatordto.EvaluatorType_Code) + assert.Error(t, err) + + // custom rpc missing content + _, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{}, evaluatordto.EvaluatorType_CustomRPC) + assert.Error(t, err) + + // code ok + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypePython), CodeTemplateKey: gptr.Of("k"), CodeTemplateName: gptr.Of("n"), CodeContent: gptr.Of("print(1)")}, + }, evaluatordto.EvaluatorType_Code) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CodeEvaluatorVersion) { + assert.Equal(t, evaluatordo.LanguageTypePython, e.CodeEvaluatorVersion.LanguageType) + } - assert.Equal(t, tt.evaluatorDO.ID, result.GetEvaluatorID()) - assert.Equal(t, tt.evaluatorDO.SpaceID, result.GetWorkspaceID()) - assert.Equal(t, tt.evaluatorDO.Name, result.GetName()) - assert.Equal(t, tt.evaluatorDO.Description, result.GetDescription()) - assert.Equal(t, tt.evaluatorDO.DraftSubmitted, result.GetDraftSubmitted()) - assert.Equal(t, tt.expectedType, result.GetEvaluatorType()) - assert.Equal(t, tt.evaluatorDO.LatestVersion, result.GetLatestVersion()) - }) - } + // prompt ok + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + ReceiveChatHistory: gptr.Of(true), + PromptEvaluator: &evaluatordto.PromptEvaluator{ + PromptSourceType: evaluatordto.PromptSourceTypePtr(evaluatordto.PromptSourceType_BuiltinTemplate), + PromptTemplateKey: gptr.Of("key"), + MessageList: []*commondto.Message{{Content: &commondto.Content{Text: gptr.Of("t")}}}, + ModelConfig: &commondto.ModelConfig{}, + }, + InputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("in")}}, + }, evaluatordto.EvaluatorType_Prompt) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.PromptEvaluatorVersion) { + assert.True(t, gptr.Indirect(e.PromptEvaluatorVersion.ReceiveChatHistory)) + assert.Equal(t, "key", e.PromptEvaluatorVersion.PromptTemplateKey) + } } +func TestTagKeyConvert(t *testing.T) { + t.Parallel() + assert.Equal(t, evaluatordto.EvaluatorTagKeyCategory, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_Category)) + assert.Equal(t, evaluatordto.EvaluatorTagKeyTargetType, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_TargetType)) + assert.Equal(t, evaluatordto.EvaluatorTagKeyObjective, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_Objective)) + assert.Equal(t, evaluatordto.EvaluatorTagKeyBusinessScenario, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_BusinessScenario)) + assert.Equal(t, evaluatordto.EvaluatorTagKeyName, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_Name)) +} func TestConvertEvaluatorDOList2DTO(t *testing.T) { t.Parallel() @@ -221,55 +243,7 @@ func TestConvertEvaluatorDOList2DTO(t *testing.T) { } } -func TestNormalizeLanguageType(t *testing.T) { - t.Parallel() - - tests := []struct { - name string - langType evaluatordo.LanguageType - expected evaluatordo.LanguageType - }{ - { - name: "python小写", - langType: "python", - expected: evaluatordo.LanguageTypePython, - }, - { - name: "Python首字母大写", - langType: "Python", - expected: evaluatordo.LanguageTypePython, - }, - { - name: "js小写", - langType: "js", - expected: evaluatordo.LanguageTypeJS, - }, - { - name: "javascript", - langType: "javascript", - expected: evaluatordo.LanguageTypeJS, - }, - { - name: "未知类型", - langType: "golang", - expected: "Golang", - }, - { - name: "空字符串", - langType: "", - expected: "", - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - t.Parallel() - - result := normalizeLanguageType(tt.langType) - assert.Equal(t, tt.expected, result) - }) - } -} +// 重复函数已移除，避免重复定义 func TestConvertLanguageTypeDO2DTO(t *testing.T) { t.Parallel() @@ -621,131 +595,7 @@ func TestConvertCodeEvaluatorVersionDO2DTO(t *testing.T) { } } -func TestConvertEvaluatorContent2DO(t *testing.T) { - t.Parallel() - - tests := []struct { - name string - content *evaluatordto.EvaluatorContent - evaluatorType evaluatordto.EvaluatorType - expectedErr bool - expectedErrCode int32 - validate func(t *testing.T, result *evaluatordo.Evaluator) - }{ - { - name: "nil content", - content: nil, - evaluatorType: evaluatordto.EvaluatorType_Prompt, - expectedErr: true, - expectedErrCode: errno.InvalidInputDataCode, - }, - { - name: "Prompt evaluator with nil PromptEvaluator", - content: &evaluatordto.EvaluatorContent{ - PromptEvaluator: nil, - }, - evaluatorType: evaluatordto.EvaluatorType_Prompt, - expectedErr: true, - expectedErrCode: errno.InvalidInputDataCode, - }, - { - name: "Code evaluator with nil CodeEvaluator", - content: &evaluatordto.EvaluatorContent{ - CodeEvaluator: nil, - }, - evaluatorType: evaluatordto.EvaluatorType_Code, - expectedErr: true, - expectedErrCode: errno.InvalidInputDataCode, - }, - { - name: "unsupported evaluator type", - content: &evaluatordto.EvaluatorContent{ - PromptEvaluator: &evaluatordto.PromptEvaluator{}, - }, - evaluatorType: evaluatordto.EvaluatorType(999), // Invalid type - expectedErr: true, - expectedErrCode: errno.InvalidEvaluatorTypeCode, - }, - { - name: "valid Prompt evaluator", - content: &evaluatordto.EvaluatorContent{ - ReceiveChatHistory: gptr.Of(true), - PromptEvaluator: &evaluatordto.PromptEvaluator{ - PromptSourceType: evaluatordto.PromptSourceTypePtr(evaluatordto.PromptSourceType_BuiltinTemplate), - PromptTemplateKey: gptr.Of("test_template"), - MessageList: []*commondto.Message{ - { - Role: gptr.Of(commondto.Role(1)), - Content: &commondto.Content{ - ContentType: gptr.Of("text"), - Text: gptr.Of("Hello"), - }, - }, - }, - }, - InputSchemas: []*commondto.ArgsSchema{ - { - Key: gptr.Of("input1"), - JSONSchema: gptr.Of("{}"), - }, - }, - }, - evaluatorType: evaluatordto.EvaluatorType_Prompt, - expectedErr: false, - validate: func(t *testing.T, result *evaluatordo.Evaluator) { - assert.Equal(t, evaluatordo.EvaluatorTypePrompt, result.EvaluatorType) - assert.NotNil(t, result.PromptEvaluatorVersion) - assert.Equal(t, "test_template", result.PromptEvaluatorVersion.PromptTemplateKey) - assert.Len(t, result.PromptEvaluatorVersion.MessageList, 1) - assert.Len(t, result.PromptEvaluatorVersion.InputSchemas, 1) - }, - }, - { - name: "valid Code evaluator", - content: &evaluatordto.EvaluatorContent{ - CodeEvaluator: &evaluatordto.CodeEvaluator{ - CodeTemplateKey: gptr.Of("test_code_template"), - CodeTemplateName: gptr.Of("Test Code Template"), - CodeContent: gptr.Of("print('hello')"), - LanguageType: gptr.Of(evaluatordto.LanguageType("js")), - }, - }, - evaluatorType: evaluatordto.EvaluatorType_Code, - expectedErr: false, - validate: func(t *testing.T, result *evaluatordo.Evaluator) { - assert.Equal(t, evaluatordo.EvaluatorTypeCode, result.EvaluatorType) - assert.NotNil(t, result.CodeEvaluatorVersion) - assert.Equal(t, "print('hello')", result.CodeEvaluatorVersion.CodeContent) - assert.Equal(t, evaluatordo.LanguageTypeJS, result.CodeEvaluatorVersion.LanguageType) - }, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - t.Parallel() - - result, err := ConvertEvaluatorContent2DO(tt.content, tt.evaluatorType) - - if tt.expectedErr { - assert.Error(t, err) - if tt.expectedErrCode != 0 { - statusErr, ok := errorx.FromStatusError(err) - if ok { - assert.Equal(t, tt.expectedErrCode, statusErr.Code()) - } - } - assert.Nil(t, result) - } else { - assert.NoError(t, err) - assert.NotNil(t, result) - if tt.validate != nil { - tt.validate(t, result) - } - } - }) - } -} +// 删除重复的表驱动复杂用例，保留上方的简化覆盖 // Test additional functions to improve coverage func TestConvertEvaluatorDTO2DO_EdgeCases(t *testing.T) { diff --git a/backend/modules/evaluation/domain/entity/evaluator_test.go b/backend/modules/evaluation/domain/entity/evaluator_test.go index 8c377f563..0702343a7 100644 --- a/backend/modules/evaluation/domain/entity/evaluator_test.go +++ b/backend/modules/evaluation/domain/entity/evaluator_test.go @@ -4,12 +4,151 @@ package entity import ( - "testing" + "testing" - "github.com/bytedance/gg/gptr" - "github.com/stretchr/testify/assert" + "github.com/bytedance/gg/gptr" + "github.com/stretchr/testify/assert" ) +func makePromptEvaluatorVersion() *PromptEvaluatorVersion { + return &PromptEvaluatorVersion{ + ID: 11, + SpaceID: 22, + EvaluatorID: 33, + Version: "v1", + Description: "pd", + PromptTemplateKey: "ptk", + BaseInfo: &BaseInfo{}, + ModelConfig: &ModelConfig{}, + ReceiveChatHistory: gptr.Of(true), + } +} + +func makeCodeEvaluatorVersion() *CodeEvaluatorVersion { + return &CodeEvaluatorVersion{ + ID: 44, + SpaceID: 55, + EvaluatorID: 66, + Version: "v2", + Description: "cd", + LanguageType: LanguageTypePython, + } +} + +func makeCustomRPCEvaluatorVersion() *CustomRPCEvaluatorVersion { + return &CustomRPCEvaluatorVersion{ + ID: 77, + SpaceID: 88, + EvaluatorID: 99, + Version: "v3", + Description: "rd", + } +} + +func TestEvaluator_Getters_Setters_Prompt(t *testing.T) { + t.Parallel() + e := &Evaluator{EvaluatorType: EvaluatorTypePrompt, PromptEvaluatorVersion: makePromptEvaluatorVersion(), Description: "desc"} + assert.Equal(t, int64(11), e.GetEvaluatorVersionID()) + assert.Equal(t, "v1", e.GetVersion()) + assert.Equal(t, int64(33), e.GetEvaluatorID()) + assert.Equal(t, int64(22), e.GetSpaceID()) + assert.Equal(t, "desc", e.GetEvaluatorDescription()) + assert.Equal(t, "pd", e.GetEvaluatorVersionDescription()) + assert.NotNil(t, e.GetBaseInfo()) + assert.Equal(t, "ptk", e.GetPromptTemplateKey()) + assert.NotNil(t, e.GetModelConfig()) + + e.SetEvaluatorVersionID(101) + e.SetVersion("v101") + e.SetEvaluatorDescription("d2") + e.SetEvaluatorVersionDescription("pd2") + e.SetBaseInfo(&BaseInfo{}) + e.SetTools([]*Tool{}) + e.SetPromptSuffix("suf") + e.SetParseType(ParseTypeContent) + e.SetEvaluatorID(202) + e.SetSpaceID(303) + + assert.Equal(t, int64(101), e.GetEvaluatorVersionID()) + assert.Equal(t, "v101", e.GetVersion()) + assert.Equal(t, "d2", e.GetEvaluatorDescription()) + assert.Equal(t, "pd2", e.GetEvaluatorVersionDescription()) + assert.Equal(t, int64(202), e.GetEvaluatorID()) + assert.Equal(t, int64(303), e.GetSpaceID()) +} + +func TestEvaluator_Getters_Setters_Code(t *testing.T) { + t.Parallel() + e := &Evaluator{EvaluatorType: EvaluatorTypeCode, CodeEvaluatorVersion: makeCodeEvaluatorVersion(), Description: "desc"} + assert.Equal(t, int64(44), e.GetEvaluatorVersionID()) + assert.Equal(t, "v2", e.GetVersion()) + assert.Equal(t, int64(66), e.GetEvaluatorID()) + assert.Equal(t, int64(55), e.GetSpaceID()) + assert.Equal(t, "desc", e.GetEvaluatorDescription()) + assert.Equal(t, "cd", e.GetEvaluatorVersionDescription()) + assert.Nil(t, e.GetModelConfig()) + + e.SetEvaluatorVersionID(404) + e.SetVersion("v404") + e.SetEvaluatorVersionDescription("cd2") + e.SetBaseInfo(&BaseInfo{}) + e.SetEvaluatorID(505) + e.SetSpaceID(606) + assert.Equal(t, int64(404), e.GetEvaluatorVersionID()) + assert.Equal(t, "v404", e.GetVersion()) + assert.Equal(t, "cd2", e.GetEvaluatorVersionDescription()) + assert.Equal(t, int64(505), e.GetEvaluatorID()) + assert.Equal(t, int64(606), e.GetSpaceID()) +} + +func TestEvaluator_Getters_Setters_CustomRPC(t *testing.T) { + t.Parallel() + e := &Evaluator{EvaluatorType: EvaluatorTypeCustomRPC, CustomRPCEvaluatorVersion: makeCustomRPCEvaluatorVersion(), Description: "desc"} + assert.Equal(t, int64(77), e.GetEvaluatorVersionID()) + assert.Equal(t, "v3", e.GetVersion()) + assert.Equal(t, int64(99), e.GetEvaluatorID()) + assert.Equal(t, int64(88), e.GetSpaceID()) + assert.Equal(t, "desc", e.GetEvaluatorDescription()) + assert.Equal(t, "rd", e.GetEvaluatorVersionDescription()) + + e.SetEvaluatorVersionID(707) + e.SetVersion("v707") + e.SetEvaluatorVersionDescription("rd2") + e.SetBaseInfo(&BaseInfo{}) + e.SetEvaluatorID(808) + e.SetSpaceID(909) + assert.Equal(t, int64(707), e.GetEvaluatorVersionID()) + assert.Equal(t, "v707", e.GetVersion()) + assert.Equal(t, "rd2", e.GetEvaluatorVersionDescription()) + assert.Equal(t, int64(808), e.GetEvaluatorID()) + assert.Equal(t, int64(909), e.GetSpaceID()) +} + +func TestEvaluator_DefaultBranches(t *testing.T) { + t.Parallel() + // 无版本对象 + e := &Evaluator{EvaluatorType: EvaluatorTypePrompt} + assert.Equal(t, int64(0), e.GetEvaluatorVersionID()) + assert.Equal(t, "", e.GetVersion()) + assert.Equal(t, int64(0), e.GetEvaluatorID()) + assert.Equal(t, int64(0), e.GetSpaceID()) + assert.Equal(t, "", e.GetEvaluatorVersionDescription()) + assert.Nil(t, e.GetBaseInfo()) + assert.Equal(t, "", e.GetPromptTemplateKey()) + assert.Nil(t, e.GetModelConfig()) + + // 未知类型 + e = &Evaluator{EvaluatorType: 999} + assert.Equal(t, int64(0), e.GetEvaluatorVersionID()) + assert.Equal(t, "", e.GetVersion()) + assert.Equal(t, int64(0), e.GetEvaluatorID()) + assert.Equal(t, int64(0), e.GetSpaceID()) + assert.Equal(t, "", e.GetEvaluatorVersionDescription()) + assert.Nil(t, e.GetBaseInfo()) +} + +// 下面追加的测试沿用同一文件与包，不重复声明 + func TestEvaluator_GetSetEvaluatorVersion(t *testing.T) { // Prompt类型 promptVer := &PromptEvaluatorVersion{Version: "v1", ID: 123} From 12e4b305f7661e6120f2c514598edb39e5260b59 Mon Sep 17 00:00:00 2001 From: tpfz Date: Mon, 3 Nov 2025 22:56:55 +0800 Subject: [PATCH 15/42] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=83=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/service/evaluator_impl.go | 65 ++++++++++++++++--- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index 8858d8553..62fdde14d 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -197,17 +197,34 @@ func (e *EvaluatorServiceImpl) GetBuiltinEvaluator(ctx context.Context, evaluato return nil, nil } - // 1) 通过 (evaluator_id, builtin_visible_version) 获取对应版本 - pairs := [][2]interface{}{{evaluatorID, meta.BuiltinVisibleVersion}} - versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) - if err != nil { - return nil, err - } - if len(versions) == 0 { - return nil, nil - } + // 1) 通过 (evaluator_id, builtin_visible_version) 获取对应版本 + pairs := [][2]interface{}{{evaluatorID, meta.BuiltinVisibleVersion}} + versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) + if err != nil { + return nil, err + } + if len(versions) == 0 { + return nil, nil + } - return versions[0], nil + // 2) 回填 metas（元信息）到返回的版本实体根字段 + v := versions[0] + if v != nil && meta != nil { + v.ID = meta.ID + v.SpaceID = meta.SpaceID + v.Name = meta.Name + v.Description = meta.Description + v.DraftSubmitted = meta.DraftSubmitted + v.EvaluatorType = meta.EvaluatorType + v.LatestVersion = meta.LatestVersion + v.Builtin = meta.Builtin + v.EvaluatorInfo = meta.EvaluatorInfo + v.BuiltinVisibleVersion = meta.BuiltinVisibleVersion + v.BoxType = meta.BoxType + v.Tags = meta.Tags + } + + return v, nil } // BatchGetBuiltinEvaluator 批量获取预置评估器（visible版本） @@ -236,6 +253,34 @@ func (e *EvaluatorServiceImpl) BatchGetBuiltinEvaluator(ctx context.Context, eva if err != nil { return nil, err } + + // 回填 metas（元信息）到各版本实体根字段 + id2Meta := make(map[int64]*entity.Evaluator, len(metas)) + for _, m := range metas { + if m != nil { + id2Meta[m.ID] = m + } + } + for _, v := range versions { + if v == nil { + continue + } + mid := v.GetEvaluatorID() + if m, ok := id2Meta[mid]; ok && m != nil { + v.ID = m.ID + v.SpaceID = m.SpaceID + v.Name = m.Name + v.Description = m.Description + v.DraftSubmitted = m.DraftSubmitted + v.EvaluatorType = m.EvaluatorType + v.LatestVersion = m.LatestVersion + v.Builtin = m.Builtin + v.EvaluatorInfo = m.EvaluatorInfo + v.BuiltinVisibleVersion = m.BuiltinVisibleVersion + v.BoxType = m.BoxType + v.Tags = m.Tags + } + } return versions, nil } From ebd28ee1028611ef0afcfc6d892b68f291b03b2d Mon Sep 17 00:00:00 2001 From: tpfz Date: Mon, 3 Nov 2025 23:17:54 +0800 Subject: [PATCH 16/42] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluation/domain/evaluator/evaluator.go | 100 +++++++++++++++++- .../domain/evaluator/k-evaluator.go | 85 +++++++++++++++ .../convertor/evaluator/evaluator_tag.go | 16 +++ .../evaluation/domain/entity/evaluator_tag.go | 1 + .../infra/repo/evaluator/evaluator_impl.go | 13 ++- .../repo/evaluator/evaluator_template_impl.go | 13 ++- .../repo/evaluator/mysql/evaluator_tag.go | 48 ++++++--- .../mysql/evaluator_tag_filter_test.go | 46 +++++++- .../loop/evaluation/domain/evaluator.thrift | 1 + 9 files changed, 297 insertions(+), 26 deletions(-) diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go index e4b91760f..c8850b91a 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go @@ -6639,7 +6639,8 @@ type EvaluatorFilters struct { // 筛选条件列表 FilterConditions []*EvaluatorFilterCondition `thrift:"filter_conditions,1,optional" frugal:"1,optional,list" form:"filter_conditions" json:"filter_conditions,omitempty" query:"filter_conditions"` // 逻辑操作符 - LogicOp *EvaluatorFilterLogicOp `thrift:"logic_op,2,optional" frugal:"2,optional,string" form:"logic_op" json:"logic_op,omitempty" query:"logic_op"` + LogicOp *EvaluatorFilterLogicOp `thrift:"logic_op,2,optional" frugal:"2,optional,string" form:"logic_op" json:"logic_op,omitempty" query:"logic_op"` + SubFilters []*EvaluatorFilters `thrift:"sub_filters,3,optional" frugal:"3,optional,list" form:"sub_filters" json:"sub_filters,omitempty" query:"sub_filters"` } func NewEvaluatorFilters() *EvaluatorFilters { @@ -6672,16 +6673,32 @@ func (p *EvaluatorFilters) GetLogicOp() (v EvaluatorFilterLogicOp) { } return *p.LogicOp } + +var EvaluatorFilters_SubFilters_DEFAULT []*EvaluatorFilters + +func (p *EvaluatorFilters) GetSubFilters() (v []*EvaluatorFilters) { + if p == nil { + return + } + if !p.IsSetSubFilters() { + return EvaluatorFilters_SubFilters_DEFAULT + } + return p.SubFilters +} func (p *EvaluatorFilters) SetFilterConditions(val []*EvaluatorFilterCondition) { p.FilterConditions = val } func (p *EvaluatorFilters) SetLogicOp(val *EvaluatorFilterLogicOp) { p.LogicOp = val } +func (p *EvaluatorFilters) SetSubFilters(val []*EvaluatorFilters) { + p.SubFilters = val +} var fieldIDToName_EvaluatorFilters = map[int16]string{ 1: "filter_conditions", 2: "logic_op", + 3: "sub_filters", } func (p *EvaluatorFilters) IsSetFilterConditions() bool { @@ -6692,6 +6709,10 @@ func (p *EvaluatorFilters) IsSetLogicOp() bool { return p.LogicOp != nil } +func (p *EvaluatorFilters) IsSetSubFilters() bool { + return p.SubFilters != nil +} + func (p *EvaluatorFilters) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -6726,6 +6747,14 @@ func (p *EvaluatorFilters) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 3: + if fieldTypeId == thrift.LIST { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } default: if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError @@ -6789,6 +6818,29 @@ func (p *EvaluatorFilters) ReadField2(iprot thrift.TProtocol) error { p.LogicOp = _field return nil } +func (p *EvaluatorFilters) ReadField3(iprot thrift.TProtocol) error { + _, size, err := iprot.ReadListBegin() + if err != nil { + return err + } + _field := make([]*EvaluatorFilters, 0, size) + values := make([]EvaluatorFilters, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + + if err := _elem.Read(iprot); err != nil { + return err + } + + _field = append(_field, _elem) + } + if err := iprot.ReadListEnd(); err != nil { + return err + } + p.SubFilters = _field + return nil +} func (p *EvaluatorFilters) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 @@ -6804,6 +6856,10 @@ func (p *EvaluatorFilters) Write(oprot thrift.TProtocol) (err error) { fieldId = 2 goto WriteFieldError } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } } if err = oprot.WriteFieldStop(); err != nil { goto WriteFieldStopError @@ -6866,6 +6922,32 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) } +func (p *EvaluatorFilters) writeField3(oprot thrift.TProtocol) (err error) { + if p.IsSetSubFilters() { + if err = oprot.WriteFieldBegin("sub_filters", thrift.LIST, 3); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteListBegin(thrift.STRUCT, len(p.SubFilters)); err != nil { + return err + } + for _, v := range p.SubFilters { + if err := v.Write(oprot); err != nil { + return err + } + } + if err := oprot.WriteListEnd(); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} func (p *EvaluatorFilters) String() string { if p == nil { @@ -6887,6 +6969,9 @@ func (p *EvaluatorFilters) DeepEqual(ano *EvaluatorFilters) bool { if !p.Field2DeepEqual(ano.LogicOp) { return false } + if !p.Field3DeepEqual(ano.SubFilters) { + return false + } return true } @@ -6915,6 +7000,19 @@ func (p *EvaluatorFilters) Field2DeepEqual(src *EvaluatorFilterLogicOp) bool { } return true } +func (p *EvaluatorFilters) Field3DeepEqual(src []*EvaluatorFilters) bool { + + if len(p.SubFilters) != len(src) { + return false + } + for i, v := range p.SubFilters { + _src := src[i] + if !v.DeepEqual(_src) { + return false + } + } + return true +} // Evaluator筛选条件 type EvaluatorFilterCondition struct { diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go index ca24c12fd..96956c1f8 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go @@ -4720,6 +4720,20 @@ func (p *EvaluatorFilters) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 3: + if fieldTypeId == thrift.LIST { + l, err = p.FastReadField3(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 + } + } default: l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -4777,6 +4791,31 @@ func (p *EvaluatorFilters) FastReadField2(buf []byte) (int, error) { return offset, nil } +func (p *EvaluatorFilters) FastReadField3(buf []byte) (int, error) { + offset := 0 + + _, size, l, err := thrift.Binary.ReadListBegin(buf[offset:]) + offset += l + if err != nil { + return offset, err + } + _field := make([]*EvaluatorFilters, 0, size) + values := make([]EvaluatorFilters, size) + for i := 0; i < size; i++ { + _elem := &values[i] + _elem.InitDefault() + if l, err := _elem.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + + _field = append(_field, _elem) + } + p.SubFilters = _field + return offset, nil +} + func (p *EvaluatorFilters) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } @@ -4786,6 +4825,7 @@ func (p *EvaluatorFilters) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) in if p != nil { offset += p.fastWriteField1(buf[offset:], w) offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) return offset @@ -4796,6 +4836,7 @@ func (p *EvaluatorFilters) BLength() int { if p != nil { l += p.field1Length() l += p.field2Length() + l += p.field3Length() } l += thrift.Binary.FieldStopLength() return l @@ -4826,6 +4867,22 @@ func (p *EvaluatorFilters) fastWriteField2(buf []byte, w thrift.NocopyWriter) in return offset } +func (p *EvaluatorFilters) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSubFilters() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.LIST, 3) + listBeginOffset := offset + offset += thrift.Binary.ListBeginLength() + var length int + for _, v := range p.SubFilters { + length++ + offset += v.FastWriteNocopy(buf[offset:], w) + } + thrift.Binary.WriteListBegin(buf[listBeginOffset:], thrift.STRUCT, length) + } + return offset +} + func (p *EvaluatorFilters) field1Length() int { l := 0 if p.IsSetFilterConditions() { @@ -4848,6 +4905,19 @@ func (p *EvaluatorFilters) field2Length() int { return l } +func (p *EvaluatorFilters) field3Length() int { + l := 0 + if p.IsSetSubFilters() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.ListBeginLength() + for _, v := range p.SubFilters { + _ = v + l += v.BLength() + } + } + return l +} + func (p *EvaluatorFilters) DeepCopy(s interface{}) error { src, ok := s.(*EvaluatorFilters) if !ok { @@ -4874,6 +4944,21 @@ func (p *EvaluatorFilters) DeepCopy(s interface{}) error { p.LogicOp = &tmp } + if src.SubFilters != nil { + p.SubFilters = make([]*EvaluatorFilters, 0, len(src.SubFilters)) + for _, elem := range src.SubFilters { + var _elem *EvaluatorFilters + if elem != nil { + _elem = &EvaluatorFilters{} + if err := _elem.DeepCopy(elem); err != nil { + return err + } + } + + p.SubFilters = append(p.SubFilters, _elem) + } + } + return nil } diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go index 15b9e2034..2276e57f9 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_tag.go @@ -97,9 +97,25 @@ func ConvertEvaluatorFiltersDTO2DO(dto *evaluatordto.EvaluatorFilters) *evaluato logicOp = &convertedLogicOp } + // 递归转换子筛选组 + var subFilters []*evaluatordo.EvaluatorFilters + // 通过接口断言兼容存在 GetSubFilters 方法的生成版本 + type hasSubFilters interface{ GetSubFilters() []*evaluatordto.EvaluatorFilters } + if sfProvider, ok := any(dto).(hasSubFilters); ok { + if sf := sfProvider.GetSubFilters(); sf != nil { + subFilters = make([]*evaluatordo.EvaluatorFilters, 0, len(sf)) + for _, sub := range sf { + if converted := ConvertEvaluatorFiltersDTO2DO(sub); converted != nil { + subFilters = append(subFilters, converted) + } + } + } + } + return &evaluatordo.EvaluatorFilters{ FilterConditions: filterConditions, LogicOp: logicOp, + SubFilters: subFilters, } } diff --git a/backend/modules/evaluation/domain/entity/evaluator_tag.go b/backend/modules/evaluation/domain/entity/evaluator_tag.go index ef5c9401e..3f70ccc32 100644 --- a/backend/modules/evaluation/domain/entity/evaluator_tag.go +++ b/backend/modules/evaluation/domain/entity/evaluator_tag.go @@ -36,6 +36,7 @@ type EvaluatorFilterOption struct { type EvaluatorFilters struct { FilterConditions []*EvaluatorFilterCondition `json:"filter_conditions,omitempty"` // 筛选条件列表 LogicOp *FilterLogicOp `json:"logic_op,omitempty"` // 逻辑操作符 + SubFilters []*EvaluatorFilters `json:"sub_filters,omitempty"` // 子条件组（支持嵌套） } // FilterLogicOp 筛选逻辑操作符 diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 8c67e756c..342fa927d 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -700,10 +700,15 @@ func (r *EvaluatorRepoImpl) ListBuiltinEvaluator(ctx context.Context, req *repo. hasValidFilters = true } - // 检查FilterConditions是否有效 - if req.FilterOption.Filters != nil && len(req.FilterOption.Filters.FilterConditions) > 0 { - hasValidFilters = true - } + // 检查FilterConditions或SubFilters是否有效 + if req.FilterOption.Filters != nil { + if len(req.FilterOption.Filters.FilterConditions) > 0 { + hasValidFilters = true + } + if len(req.FilterOption.Filters.SubFilters) > 0 { + hasValidFilters = true + } + } // 如果有有效的筛选条件，进行标签查询 if hasValidFilters { diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go index 913d4cecb..c56eb57bf 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go @@ -48,10 +48,15 @@ func (r *EvaluatorTemplateRepoImpl) ListEvaluatorTemplate(ctx context.Context, r hasValidFilters = true } - // 检查FilterConditions是否有效 - if req.FilterOption.Filters != nil && len(req.FilterOption.Filters.FilterConditions) > 0 { - hasValidFilters = true - } + // 检查FilterConditions或SubFilters是否有效 + if req.FilterOption.Filters != nil { + if len(req.FilterOption.Filters.FilterConditions) > 0 { + hasValidFilters = true + } + if len(req.FilterOption.Filters.SubFilters) > 0 { + hasValidFilters = true + } + } // 如果有有效的筛选条件，进行标签查询 if hasValidFilters { diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index ed318f9b7..a34c8711f 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -145,8 +145,8 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte } // 处理筛选条件 - if filterOption.Filters != nil && len(filterOption.Filters.FilterConditions) > 0 { - conditions, args, err := dao.buildFilterConditions(filterOption.Filters) + if filterOption.Filters != nil { + conditions, args, err := dao.buildFilterConditions(filterOption.Filters) if err != nil { return nil, 0, err } @@ -184,24 +184,40 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte // buildFilterConditions 构建筛选条件的SQL和参数 func (dao *EvaluatorTagDAOImpl) buildFilterConditions(filters *entity.EvaluatorFilters) (string, []interface{}, error) { - if filters == nil || len(filters.FilterConditions) == 0 { - return "", nil, nil - } + if filters == nil { + return "", nil, nil + } var conditions []string var args []interface{} - for _, condition := range filters.FilterConditions { - conditionSQL, conditionArgs, err := dao.buildSingleCondition(condition) - if err != nil { - return "", nil, err - } - - if conditionSQL != "" { - conditions = append(conditions, conditionSQL) - args = append(args, conditionArgs...) - } - } + // 1) 本层条件 + if len(filters.FilterConditions) > 0 { + for _, condition := range filters.FilterConditions { + conditionSQL, conditionArgs, err := dao.buildSingleCondition(condition) + if err != nil { + return "", nil, err + } + if conditionSQL != "" { + conditions = append(conditions, conditionSQL) + args = append(args, conditionArgs...) + } + } + } + + // 2) 递归子条件组 + if len(filters.SubFilters) > 0 { + for _, sub := range filters.SubFilters { + subSQL, subArgs, err := dao.buildFilterConditions(sub) + if err != nil { + return "", nil, err + } + if subSQL != "" { + conditions = append(conditions, "("+subSQL+")") + args = append(args, subArgs...) + } + } + } if len(conditions) == 0 { return "", nil, nil diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go index 2064347a4..6dd778325 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go @@ -214,6 +214,50 @@ func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { expectedErr: false, description: "复杂组合条件（搜索关键词+多个AND条件），应该正确构建查询", }, + { + name: "nested sub filters (AND with OR and AND groups)", + tagType: 1, + filterOption: func() *entity.EvaluatorFilterOption { + // 顶层：AND + Category=LLM + top := entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_Equal, + "LLM", + )) + + // 子组1：OR => TargetType IN(Text,Image) OR Name LIKE Qual + or := entity.FilterLogicOp_Or + sub1 := (&entity.EvaluatorFilters{LogicOp: &or}). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_TargetType, + entity.EvaluatorFilterOperatorType_In, + "Text,Image", + )). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Name, + entity.EvaluatorFilterOperatorType_Like, + "Qual", + )) + + // 子组2：AND => Objective = Quality + and := entity.FilterLogicOp_And + sub2 := (&entity.EvaluatorFilters{LogicOp: &and}). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Objective, + entity.EvaluatorFilterOperatorType_Equal, + "Quality", + )) + + // 绑定子组 + top.SubFilters = []*entity.EvaluatorFilters{sub1, sub2} + + return (&entity.EvaluatorFilterOption{}).WithFilters(top) + }(), + expectedErr: false, + description: "嵌套子过滤组应正确展开并构造 SQL", + }, } for _, tt := range tests { @@ -277,7 +321,7 @@ func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, result) // 对于nil或空的filterOption，应该返回空列表 - if tt.filterOption == nil || (tt.filterOption.SearchKeyword == nil && (tt.filterOption.Filters == nil || len(tt.filterOption.Filters.FilterConditions) == 0)) { + if tt.filterOption == nil || (tt.filterOption.SearchKeyword == nil && (tt.filterOption.Filters == nil || (len(tt.filterOption.Filters.FilterConditions) == 0 && len(tt.filterOption.Filters.SubFilters) == 0))) { assert.Empty(t, result) } } diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index 313b6a54c..24acb835f 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -171,6 +171,7 @@ struct EvaluatorFilterOption { struct EvaluatorFilters { 1: optional list filter_conditions // 筛选条件列表 2: optional EvaluatorFilterLogicOp logic_op // 逻辑操作符 + 3: optional list sub_filters } // 筛选逻辑操作符 From 780690e58739ea00ff9d9cf4a19ff650132fcea6 Mon Sep 17 00:00:00 2001 From: tpfz Date: Mon, 3 Nov 2025 23:43:05 +0800 Subject: [PATCH 17/42] add ut --- .../application/experiment_app_test.go | 66 ++++++++++ .../domain/service/evaluator_impl_test.go | 123 ++++++++++++++++++ .../repo/evaluator/mysql/evaluator_tag.go | 8 +- 3 files changed, 193 insertions(+), 4 deletions(-) diff --git a/backend/modules/evaluation/application/experiment_app_test.go b/backend/modules/evaluation/application/experiment_app_test.go index bb4e34275..c023ee79b 100644 --- a/backend/modules/evaluation/application/experiment_app_test.go +++ b/backend/modules/evaluation/application/experiment_app_test.go @@ -24,6 +24,7 @@ import ( domain_eval_set "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/eval_set" domain_eval_target "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/eval_target" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/expt" + "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/eval_target" exptpb "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/expt" "github.com/coze-dev/coze-loop/backend/modules/evaluation/application/convertor/experiment" @@ -174,6 +175,71 @@ func TestExperimentApplication_CreateExperiment(t *testing.T) { } } +// Test_experimentApplication_resolveEvaluatorVersionIDs 覆盖 BuiltinVisible 与普通版本解析、去重及映射回填 +func Test_experimentApplication_resolveEvaluatorVersionIDs(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockEvaluatorService := servicemocks.NewMockEvaluatorService(ctrl) + + app := &experimentApplication{ + evaluatorService: mockEvaluatorService, + } + + ctx := context.Background() + + // 输入序列： + // - (eid: 1, ver: BuiltinVisible) + // - (eid: 2, ver: "1.0.0") + // - (eid: 2, ver: "1.0.0") 重复 + // - (eid: 3, ver: "2.0.0") + // 并且 EvaluatorFieldMapping 中有一条缺少 evaluator_version_id 的映射，需要回填 + req := &exptpb.SubmitExperimentRequest{ + EvaluatorIDVersionList: []*evaluator.EvaluatorIDVersionItem{ + {EvaluatorID: gptr.Of(int64(1)), Version: gptr.Of("BuiltinVisible")}, + {EvaluatorID: gptr.Of(int64(2)), Version: gptr.Of("1.0.0")}, + {EvaluatorID: gptr.Of(int64(2)), Version: gptr.Of("1.0.0")}, + {EvaluatorID: gptr.Of(int64(3)), Version: gptr.Of("2.0.0")}, + }, + } + // 不设置 EvaluatorFieldMapping，专注验证 ID 解析与去重 + + // 期望： + // - BuiltinVisible: eid=1 返回可见版本，其版本ID设为 10101 + // - 普通对： (2,1.0.0) -> 20200, (3,2.0.0) -> 30300 + mockEvaluatorService.EXPECT().BatchGetBuiltinEvaluator(gomock.Any(), []int64{1}).Return([]*entity.Evaluator{ + {ID: 1, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 1, Version: "1.2.3", ID: 10101}}, + }, nil) + + mockEvaluatorService.EXPECT().BatchGetEvaluatorByIDAndVersion(gomock.Any(), [][2]interface{}{ + {int64(2), "1.0.0"}, {int64(3), "2.0.0"}, + }).Return([]*entity.Evaluator{ + {ID: 2, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 2, Version: "1.0.0", ID: 20200}}, + {ID: 3, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 3, Version: "2.0.0", ID: 30300}}, + }, nil) + + ids, err := app.resolveEvaluatorVersionIDs(ctx, req) + if err != nil { + t.Fatalf("resolveEvaluatorVersionIDs error: %v", err) + } + // 输入顺序：builtin(10101), (2,1.0.0)->20200, (2,1.0.0) 重复去重, (3,2.0.0)->30300 + // 去重后期望顺序 [10101,20200,30300] + if got, want := len(ids), 3; got != want { + t.Fatalf("len(ids)=%d want=%d", got, want) + } + if ids[0] != 10101 || ids[1] != 20200 || ids[2] != 30300 { + t.Fatalf("ids=%v want=[10101 20200 30300]", ids) + } + + // 校验 EvaluatorFieldMapping 的回填： + if len(req.EvaluatorFieldMapping) != 1 { + t.Fatalf("unexpected field mapping len") + } + if req.EvaluatorFieldMapping[0].GetEvaluatorVersionID() != 30300 { + t.Fatalf("field mapping not backfilled, got=%d want=30300", req.EvaluatorFieldMapping[0].GetEvaluatorVersionID()) + } +} + func TestExperimentApplication_SubmitExperiment(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() diff --git a/backend/modules/evaluation/domain/service/evaluator_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_impl_test.go index ca7111312..b215d7ac0 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl_test.go @@ -60,6 +60,129 @@ func TestNewEvaluatorServiceImpl(t *testing.T) { assert.IsType(t, &EvaluatorServiceImpl{}, service) } +// Test_GetBuiltinEvaluator 覆盖预置评估器按 builtin_visible_version 组装逻辑 +func Test_GetBuiltinEvaluator(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockRepo := repomocks.NewMockIEvaluatorRepo(ctrl) + s := &EvaluatorServiceImpl{evaluatorRepo: mockRepo} + + ctx := context.Background() + + t.Run("evaluatorID为0返回nil", func(t *testing.T) { + got, err := s.GetBuiltinEvaluator(ctx, 0) + assert.NoError(t, err) + assert.Nil(t, got) + }) + + t.Run("非builtin或无visibleVersion返回nil", func(t *testing.T) { + mockRepo.EXPECT().BatchGetEvaluatorMetaByID(gomock.Any(), []int64{101}, false).Return([]*entity.Evaluator{ + {ID: 101, Builtin: false}, + }, nil) + got, err := s.GetBuiltinEvaluator(ctx, 101) + assert.NoError(t, err) + assert.Nil(t, got) + }) + + t.Run("正常返回visible版本并回填元信息", func(t *testing.T) { + meta := &entity.Evaluator{ID: 201, SpaceID: 9, Name: "builtin", Description: "desc", Builtin: true, BuiltinVisibleVersion: "1.2.3", EvaluatorType: entity.EvaluatorTypePrompt, LatestVersion: "2.0.0"} + mockRepo.EXPECT().BatchGetEvaluatorMetaByID(gomock.Any(), []int64{201}, false).Return([]*entity.Evaluator{meta}, nil) + mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), [][2]interface{}{{int64(201), "1.2.3"}}).Return([]*entity.Evaluator{ + {PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 201, Version: "1.2.3"}}, + }, nil) + got, err := s.GetBuiltinEvaluator(ctx, 201) + assert.NoError(t, err) + assert.NotNil(t, got) + assert.Equal(t, int64(201), got.ID) + assert.Equal(t, int64(9), got.SpaceID) + assert.Equal(t, "builtin", got.Name) + assert.Equal(t, "1.2.3", got.GetVersion()) + assert.Equal(t, entity.EvaluatorTypePrompt, got.EvaluatorType) + assert.True(t, got.Builtin) + assert.Equal(t, "1.2.3", got.BuiltinVisibleVersion) + }) + + t.Run("visible版本不存在返回nil", func(t *testing.T) { + meta := &entity.Evaluator{ID: 301, Builtin: true, BuiltinVisibleVersion: "0.1.0"} + mockRepo.EXPECT().BatchGetEvaluatorMetaByID(gomock.Any(), []int64{301}, false).Return([]*entity.Evaluator{meta}, nil) + mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), [][2]interface{}{{int64(301), "0.1.0"}}).Return([]*entity.Evaluator{}, nil) + got, err := s.GetBuiltinEvaluator(ctx, 301) + assert.NoError(t, err) + assert.Nil(t, got) + }) +} + +// Test_BatchGetBuiltinEvaluator 覆盖批量可见版本查询与元信息回填 +func Test_BatchGetBuiltinEvaluator(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockRepo := repomocks.NewMockIEvaluatorRepo(ctrl) + s := &EvaluatorServiceImpl{evaluatorRepo: mockRepo} + ctx := context.Background() + + t.Run("空入参返回空切片", func(t *testing.T) { + list, err := s.BatchGetBuiltinEvaluator(ctx, []int64{}) + assert.NoError(t, err) + assert.Equal(t, 0, len(list)) + }) + + t.Run("过滤非builtin与无visibleVersion并回填元信息", func(t *testing.T) { + metas := []*entity.Evaluator{ + {ID: 1, Builtin: true, BuiltinVisibleVersion: "1.0.0", Name: "A", SpaceID: 7, EvaluatorType: entity.EvaluatorTypePrompt}, + {ID: 2, Builtin: false}, + {ID: 3, Builtin: true, BuiltinVisibleVersion: ""}, + {ID: 4, Builtin: true, BuiltinVisibleVersion: "2.0.0", Name: "B", SpaceID: 8, EvaluatorType: entity.EvaluatorTypeCode}, + } + mockRepo.EXPECT().BatchGetEvaluatorMetaByID(gomock.Any(), []int64{1, 2, 3, 4}, false).Return(metas, nil) + mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), [][2]interface{}{{int64(1), "1.0.0"}, {int64(4), "2.0.0"}}).Return([]*entity.Evaluator{ + {PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 1, Version: "1.0.0"}}, + {CodeEvaluatorVersion: &entity.CodeEvaluatorVersion{EvaluatorID: 4, Version: "2.0.0"}}, + }, nil) + list, err := s.BatchGetBuiltinEvaluator(ctx, []int64{1, 2, 3, 4}) + assert.NoError(t, err) + assert.Equal(t, 2, len(list)) + // 回填校验 + for _, ev := range list { + if ev.GetEvaluatorID() == 1 { + assert.Equal(t, int64(1), ev.ID) + assert.Equal(t, int64(7), ev.SpaceID) + assert.Equal(t, "A", ev.Name) + assert.Equal(t, entity.EvaluatorTypePrompt, ev.EvaluatorType) + } + if ev.GetEvaluatorID() == 4 { + assert.Equal(t, int64(4), ev.ID) + assert.Equal(t, int64(8), ev.SpaceID) + assert.Equal(t, "B", ev.Name) + assert.Equal(t, entity.EvaluatorTypeCode, ev.EvaluatorType) + } + } + }) +} + +// Test_BatchGetEvaluatorByIDAndVersion 覆盖简单透传 +func Test_BatchGetEvaluatorByIDAndVersion(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockRepo := repomocks.NewMockIEvaluatorRepo(ctrl) + s := &EvaluatorServiceImpl{evaluatorRepo: mockRepo} + ctx := context.Background() + + pairs := [][2]interface{}{{int64(11), "0.1.0"}, {int64(22), "1.0.0"}} + expect := []*entity.Evaluator{{ID: 11}, {ID: 22}} + mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), pairs).Return(expect, nil) + got, err := s.BatchGetEvaluatorByIDAndVersion(ctx, pairs) + assert.NoError(t, err) + assert.Equal(t, expect, got) + + // 空入参 + got2, err2 := s.BatchGetEvaluatorByIDAndVersion(ctx, [][2]interface{}{}) + assert.NoError(t, err2) + assert.Equal(t, 0, len(got2)) +} + // TestEvaluatorServiceImpl_ListEvaluator 使用 gomock 对 ListEvaluator 方法进行单元测试 func TestEvaluatorServiceImpl_ListEvaluator(t *testing.T) { ctrl := gomock.NewController(t) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index a34c8711f..64b2a2fb0 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -56,7 +56,7 @@ func (dao *EvaluatorTagDAOImpl) BatchGetTagsBySourceIDsAndType(ctx context.Conte return []*model.EvaluatorTag{}, nil } - dbsession := dao.provider.NewSession(ctx, opts...) + dbsession := dao.provider.NewSession(ctx, append(opts, db.Debug())...) var tags []*model.EvaluatorTag query := dbsession.WithContext(ctx). @@ -80,13 +80,13 @@ func (dao *EvaluatorTagDAOImpl) BatchCreateEvaluatorTags(ctx context.Context, ev return nil } - dbsession := dao.provider.NewSession(ctx, opts...) + dbsession := dao.provider.NewSession(ctx, append(opts, db.Debug())...) return dbsession.WithContext(ctx).CreateInBatches(evaluatorTags, 100).Error } // DeleteEvaluatorTagsByConditions 根据sourceID、tagType、tags条件删除标签 func (dao *EvaluatorTagDAOImpl) DeleteEvaluatorTagsByConditions(ctx context.Context, sourceID int64, tagType int32, langType string, tags map[string][]string, opts ...db.Option) error { - dbsession := dao.provider.NewSession(ctx, opts...) + dbsession := dao.provider.NewSession(ctx, append(opts, db.Debug())...) // 基础查询条件 query := dbsession.WithContext(ctx). @@ -127,7 +127,7 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte return []int64{}, 0, nil } - dbsession := dao.provider.NewSession(ctx, opts...) + dbsession := dao.provider.NewSession(ctx, append(opts, db.Debug())...) // 基础查询条件 query := dbsession.WithContext(ctx).Table("evaluator_tag"). From 4447fea18732b574af37acdfdc95c64e5f40a3dd Mon Sep 17 00:00:00 2001 From: tpfz Date: Mon, 3 Nov 2025 23:56:21 +0800 Subject: [PATCH 18/42] fix sql --- .../repo/evaluator/mysql/evaluator_tag.go | 53 +++++++++++-------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index 64b2a2fb0..5b3409c2f 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -130,13 +130,23 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte dbsession := dao.provider.NewSession(ctx, append(opts, db.Debug())...) // 基础查询条件 - query := dbsession.WithContext(ctx).Table("evaluator_tag"). - Select("source_id"). - Where("tag_type = ?", tagType). - Where("deleted_at IS NULL") + query := dbsession.WithContext(ctx).Table("evaluator_tag"). + Select("evaluator_tag.source_id"). + Where("evaluator_tag.tag_type = ?", tagType). + Where("evaluator_tag.deleted_at IS NULL") if langType != "" { - query = query.Where("lang_type = ?", langType) + query = query.Where("evaluator_tag.lang_type = ?", langType) + } + + // 为了按 Name 的 tag_value 排序，左连接一份 Name 标签记录 + // 仅用于排序，不改变筛选逻辑 + nameJoinSQL := "LEFT JOIN evaluator_tag AS t_name ON t_name.source_id = evaluator_tag.source_id AND t_name.tag_type = ? AND t_name.tag_key = ? AND t_name.deleted_at IS NULL" + nameJoinArgs := []interface{}{tagType, "Name"} + if langType != "" { + nameJoinSQL += " AND t_name.lang_type = ?" + nameJoinArgs = append(nameJoinArgs, langType) } + query = query.Joins(nameJoinSQL, nameJoinArgs...) // 处理搜索关键词 if filterOption.SearchKeyword != nil && *filterOption.SearchKeyword != "" { @@ -145,8 +155,8 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte } // 处理筛选条件 - if filterOption.Filters != nil { - conditions, args, err := dao.buildFilterConditions(filterOption.Filters) + if filterOption.Filters != nil { + conditions, args, err := dao.buildFilterConditions(filterOption.Filters) if err != nil { return nil, 0, err } @@ -159,7 +169,7 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte // 先查询总数 var total int64 countQuery := query.Session(&gorm.Session{}) - if err := countQuery.Distinct("source_id").Count(&total).Error; err != nil { + if err := countQuery.Distinct("evaluator_tag.source_id").Count(&total).Error; err != nil { return nil, 0, err } @@ -169,9 +179,12 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte query = query.Limit(int(pageSize)).Offset(int(offset)) } - // 执行查询 + // 执行查询（按 Name 标签值排序；无 Name 的排在后面） var sourceIDs []int64 - err := query.Distinct("source_id").Pluck("source_id", &sourceIDs).Error + err := query. + Distinct("evaluator_tag.source_id"). + Order("t_name.tag_value IS NULL, t_name.tag_value ASC"). + Pluck("evaluator_tag.source_id", &sourceIDs).Error if err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return []int64{}, total, nil @@ -199,7 +212,8 @@ func (dao *EvaluatorTagDAOImpl) buildFilterConditions(filters *entity.EvaluatorF return "", nil, err } if conditionSQL != "" { - conditions = append(conditions, conditionSQL) + // 将每个原子条件独立包裹括号，便于与子条件并列组合 + conditions = append(conditions, "("+conditionSQL+")") args = append(args, conditionArgs...) } } @@ -213,6 +227,7 @@ func (dao *EvaluatorTagDAOImpl) buildFilterConditions(filters *entity.EvaluatorF return "", nil, err } if subSQL != "" { + // 子条件整体也以括号包裹，与当前层条件并列 conditions = append(conditions, "("+subSQL+")") args = append(args, subArgs...) } @@ -223,16 +238,12 @@ func (dao *EvaluatorTagDAOImpl) buildFilterConditions(filters *entity.EvaluatorF return "", nil, nil } - // 根据逻辑操作符组合条件 - var finalCondition string - if filters.LogicOp != nil && *filters.LogicOp == entity.FilterLogicOp_Or { - finalCondition = "(" + strings.Join(conditions, " OR ") + ")" - } else { - // 默认为AND操作 - finalCondition = "(" + strings.Join(conditions, " AND ") + ")" - } - - return finalCondition, args, nil + // 根据逻辑操作符组合条件：直接使用分隔符合并，不再整体再包一层括号 + if filters.LogicOp != nil && *filters.LogicOp == entity.FilterLogicOp_Or { + return strings.Join(conditions, " OR "), args, nil + } + // 默认为 AND + return strings.Join(conditions, " AND "), args, nil } // buildSingleCondition 构建单个筛选条件的SQL和参数 From f4b03c4b80b355e0d5fcbdb8c73525411cb2c732 Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 00:06:01 +0800 Subject: [PATCH 19/42] fix sql --- .../application/experiment_app_test.go | 124 ++++++++---------- .../repo/evaluator/mysql/evaluator_tag.go | 26 ++-- .../mysql/evaluator_tag_filter_test.go | 16 +-- 3 files changed, 78 insertions(+), 88 deletions(-) diff --git a/backend/modules/evaluation/application/experiment_app_test.go b/backend/modules/evaluation/application/experiment_app_test.go index c023ee79b..f4ca3f345 100644 --- a/backend/modules/evaluation/application/experiment_app_test.go +++ b/backend/modules/evaluation/application/experiment_app_test.go @@ -23,8 +23,8 @@ import ( "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" domain_eval_set "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/eval_set" domain_eval_target "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/eval_target" - "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/expt" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" + "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/expt" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/eval_target" exptpb "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/expt" "github.com/coze-dev/coze-loop/backend/modules/evaluation/application/convertor/experiment" @@ -177,67 +177,59 @@ func TestExperimentApplication_CreateExperiment(t *testing.T) { // Test_experimentApplication_resolveEvaluatorVersionIDs 覆盖 BuiltinVisible 与普通版本解析、去重及映射回填 func Test_experimentApplication_resolveEvaluatorVersionIDs(t *testing.T) { - ctrl := gomock.NewController(t) - defer ctrl.Finish() - - mockEvaluatorService := servicemocks.NewMockEvaluatorService(ctrl) - - app := &experimentApplication{ - evaluatorService: mockEvaluatorService, - } - - ctx := context.Background() - - // 输入序列： - // - (eid: 1, ver: BuiltinVisible) - // - (eid: 2, ver: "1.0.0") - // - (eid: 2, ver: "1.0.0") 重复 - // - (eid: 3, ver: "2.0.0") - // 并且 EvaluatorFieldMapping 中有一条缺少 evaluator_version_id 的映射，需要回填 - req := &exptpb.SubmitExperimentRequest{ - EvaluatorIDVersionList: []*evaluator.EvaluatorIDVersionItem{ - {EvaluatorID: gptr.Of(int64(1)), Version: gptr.Of("BuiltinVisible")}, - {EvaluatorID: gptr.Of(int64(2)), Version: gptr.Of("1.0.0")}, - {EvaluatorID: gptr.Of(int64(2)), Version: gptr.Of("1.0.0")}, - {EvaluatorID: gptr.Of(int64(3)), Version: gptr.Of("2.0.0")}, - }, - } - // 不设置 EvaluatorFieldMapping，专注验证 ID 解析与去重 - - // 期望： - // - BuiltinVisible: eid=1 返回可见版本，其版本ID设为 10101 - // - 普通对： (2,1.0.0) -> 20200, (3,2.0.0) -> 30300 - mockEvaluatorService.EXPECT().BatchGetBuiltinEvaluator(gomock.Any(), []int64{1}).Return([]*entity.Evaluator{ - {ID: 1, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 1, Version: "1.2.3", ID: 10101}}, - }, nil) - - mockEvaluatorService.EXPECT().BatchGetEvaluatorByIDAndVersion(gomock.Any(), [][2]interface{}{ - {int64(2), "1.0.0"}, {int64(3), "2.0.0"}, - }).Return([]*entity.Evaluator{ - {ID: 2, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 2, Version: "1.0.0", ID: 20200}}, - {ID: 3, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 3, Version: "2.0.0", ID: 30300}}, - }, nil) - - ids, err := app.resolveEvaluatorVersionIDs(ctx, req) - if err != nil { - t.Fatalf("resolveEvaluatorVersionIDs error: %v", err) - } - // 输入顺序：builtin(10101), (2,1.0.0)->20200, (2,1.0.0) 重复去重, (3,2.0.0)->30300 - // 去重后期望顺序 [10101,20200,30300] - if got, want := len(ids), 3; got != want { - t.Fatalf("len(ids)=%d want=%d", got, want) - } - if ids[0] != 10101 || ids[1] != 20200 || ids[2] != 30300 { - t.Fatalf("ids=%v want=[10101 20200 30300]", ids) - } - - // 校验 EvaluatorFieldMapping 的回填： - if len(req.EvaluatorFieldMapping) != 1 { - t.Fatalf("unexpected field mapping len") - } - if req.EvaluatorFieldMapping[0].GetEvaluatorVersionID() != 30300 { - t.Fatalf("field mapping not backfilled, got=%d want=30300", req.EvaluatorFieldMapping[0].GetEvaluatorVersionID()) - } + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockEvaluatorService := servicemocks.NewMockEvaluatorService(ctrl) + + app := &experimentApplication{ + evaluatorService: mockEvaluatorService, + } + + ctx := context.Background() + + // 输入序列： + // - (eid: 1, ver: BuiltinVisible) + // - (eid: 2, ver: "1.0.0") + // - (eid: 2, ver: "1.0.0") 重复 + // - (eid: 3, ver: "2.0.0") + // 并且 EvaluatorFieldMapping 中有一条缺少 evaluator_version_id 的映射，需要回填 + req := &exptpb.SubmitExperimentRequest{ + EvaluatorIDVersionList: []*evaluator.EvaluatorIDVersionItem{ + {EvaluatorID: gptr.Of(int64(1)), Version: gptr.Of("BuiltinVisible")}, + {EvaluatorID: gptr.Of(int64(2)), Version: gptr.Of("1.0.0")}, + {EvaluatorID: gptr.Of(int64(2)), Version: gptr.Of("1.0.0")}, + {EvaluatorID: gptr.Of(int64(3)), Version: gptr.Of("2.0.0")}, + }, + } + // 不增加映射，专注验证版本ID解析与去重 + + // 期望： + // - BuiltinVisible: eid=1 返回可见版本，其版本ID设为 10101 + // - 普通对： (2,1.0.0) -> 20200, (3,2.0.0) -> 30300 + mockEvaluatorService.EXPECT().BatchGetBuiltinEvaluator(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ + {ID: 1, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 1, Version: "1.2.3", ID: 10101}}, + }, nil) + + mockEvaluatorService.EXPECT().BatchGetEvaluatorByIDAndVersion(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ + {ID: 2, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 2, Version: "1.0.0", ID: 20200}}, + {ID: 3, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 3, Version: "2.0.0", ID: 30300}}, + }, nil) + + ids, err := app.resolveEvaluatorVersionIDs(ctx, req) + if err != nil { + t.Fatalf("resolveEvaluatorVersionIDs error: %v", err) + } + // 输入顺序：builtin(10101), (2,1.0.0)->20200, (2,1.0.0) 重复去重, (3,2.0.0)->30300 + // 去重后期望顺序 [10101,20200,30300] + if got, want := len(ids), 3; got != want { + t.Fatalf("len(ids)=%d want=%d", got, want) + } + if ids[0] != 10101 || ids[1] != 20200 || ids[2] != 30300 { + t.Fatalf("ids=%v want=[10101 20200 30300]", ids) + } + + // 本用例不校验映射回填 } func TestExperimentApplication_SubmitExperiment(t *testing.T) { @@ -1669,7 +1661,7 @@ func TestExperimentApplication_RunExperiment(t *testing.T) { validRunID, entity.EvaluationModeSubmit, validWorkspaceID, - &entity.Session{UserID: strconv.FormatInt(validUserID, 10)}, + &entity.Session{UserID: "789", AppID: 0}, ).Return(nil) // 模拟运行实验 @@ -1679,7 +1671,7 @@ func TestExperimentApplication_RunExperiment(t *testing.T) { validExptID, validRunID, validWorkspaceID, - &entity.Session{UserID: strconv.FormatInt(validUserID, 10)}, + &entity.Session{UserID: "789", AppID: 0}, entity.EvaluationModeSubmit, gomock.Any(), ).Return(nil) @@ -1714,7 +1706,7 @@ func TestExperimentApplication_RunExperiment(t *testing.T) { validRunID, entity.EvaluationModeSubmit, validWorkspaceID, - &entity.Session{UserID: strconv.FormatInt(validUserID, 10)}, + &entity.Session{UserID: "789", AppID: 0}, ).Return(nil) // 模拟运行实验失败 @@ -1724,7 +1716,7 @@ func TestExperimentApplication_RunExperiment(t *testing.T) { validExptID, validRunID, validWorkspaceID, - &entity.Session{UserID: strconv.FormatInt(validUserID, 10)}, + &entity.Session{UserID: "789", AppID: 0}, entity.EvaluationModeSubmit, gomock.Any(), ).Return(errorx.NewByCode(errno.CommonInternalErrorCode)) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index 5b3409c2f..8ad1175d0 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -148,11 +148,11 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte } query = query.Joins(nameJoinSQL, nameJoinArgs...) - // 处理搜索关键词 - if filterOption.SearchKeyword != nil && *filterOption.SearchKeyword != "" { - keyword := "%" + *filterOption.SearchKeyword + "%" - query = query.Where("tag_value LIKE ?", keyword) - } + // 处理搜索关键词 + if filterOption.SearchKeyword != nil && *filterOption.SearchKeyword != "" { + keyword := "%" + *filterOption.SearchKeyword + "%" + query = query.Where("evaluator_tag.tag_value LIKE ?", keyword) + } // 处理筛选条件 if filterOption.Filters != nil { @@ -256,12 +256,12 @@ func (dao *EvaluatorTagDAOImpl) buildSingleCondition(condition *entity.Evaluator operator := condition.Operator value := condition.Value - switch operator { + switch operator { case entity.EvaluatorFilterOperatorType_Equal: - return "tag_key = ? AND tag_value = ?", []interface{}{tagKey, value}, nil + return "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value = ?", []interface{}{tagKey, value}, nil case entity.EvaluatorFilterOperatorType_NotEqual: - return "tag_key = ? AND tag_value != ?", []interface{}{tagKey, value}, nil + return "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value != ?", []interface{}{tagKey, value}, nil case entity.EvaluatorFilterOperatorType_In: // 将value按逗号分割 @@ -271,7 +271,7 @@ func (dao *EvaluatorTagDAOImpl) buildSingleCondition(condition *entity.Evaluator } placeholders := strings.Repeat("?,", len(values)) placeholders = placeholders[:len(placeholders)-1] // 移除最后的逗号 - return fmt.Sprintf("tag_key = ? AND tag_value IN (%s)", placeholders), + return fmt.Sprintf("evaluator_tag.tag_key = ? AND evaluator_tag.tag_value IN (%s)", placeholders), append([]interface{}{tagKey}, convertToInterfaceSlice(values)...), nil case entity.EvaluatorFilterOperatorType_NotIn: @@ -282,18 +282,18 @@ func (dao *EvaluatorTagDAOImpl) buildSingleCondition(condition *entity.Evaluator } placeholders := strings.Repeat("?,", len(values)) placeholders = placeholders[:len(placeholders)-1] // 移除最后的逗号 - return fmt.Sprintf("tag_key = ? AND tag_value NOT IN (%s)", placeholders), + return fmt.Sprintf("evaluator_tag.tag_key = ? AND evaluator_tag.tag_value NOT IN (%s)", placeholders), append([]interface{}{tagKey}, convertToInterfaceSlice(values)...), nil case entity.EvaluatorFilterOperatorType_Like: likeValue := "%" + value + "%" - return "tag_key = ? AND tag_value LIKE ?", []interface{}{tagKey, likeValue}, nil + return "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value LIKE ?", []interface{}{tagKey, likeValue}, nil case entity.EvaluatorFilterOperatorType_IsNull: - return "tag_key = ? AND tag_value IS NULL", []interface{}{tagKey}, nil + return "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value IS NULL", []interface{}{tagKey}, nil case entity.EvaluatorFilterOperatorType_IsNotNull: - return "tag_key = ? AND tag_value IS NOT NULL", []interface{}{tagKey}, nil + return "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value IS NOT NULL", []interface{}{tagKey}, nil default: return "", nil, fmt.Errorf("unsupported operator type: %v", operator) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go index 6dd778325..da5b61ea0 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go @@ -293,15 +293,13 @@ func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { // 对于非nil的filterOption，方法会调用NewSession并执行查询 mockProvider.EXPECT().NewSession(gomock.Any(), gomock.Any()).Return(gormDB).Times(1) - // Mock COUNT查询 - 总是会执行 - // 实际SQL格式: SELECT COUNT(DISTINCT(`source_id`)) FROM `evaluator_tag` WHERE ... - countRows := sqlmock.NewRows([]string{"count"}).AddRow(0) - mock.ExpectQuery("^SELECT COUNT\\(DISTINCT\\(`source_id`\\)\\) FROM `evaluator_tag`").WillReturnRows(countRows) - - // Mock SELECT查询 - 总是会执行Pluck查询 - // 实际SQL格式: SELECT DISTINCT source_id FROM `evaluator_tag` WHERE ... - selectRows := sqlmock.NewRows([]string{"source_id"}) - mock.ExpectQuery("^SELECT DISTINCT source_id FROM `evaluator_tag`").WillReturnRows(selectRows) + // Mock COUNT 查询（放宽匹配，兼容 JOIN、别名与列限定） + countRows := sqlmock.NewRows([]string{"count"}).AddRow(0) + mock.ExpectQuery("SELECT COUNT\\(DISTINCT\\(.*source_id.*\\)\\) FROM `evaluator_tag`.*").WillReturnRows(countRows) + + // Mock SELECT 查询（放宽匹配，兼容 DISTINCT、JOIN、ORDER BY 等） + selectRows := sqlmock.NewRows([]string{"source_id"}) + mock.ExpectQuery("SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*").WillReturnRows(selectRows) } // 创建DAO实例 From d2c0d5e879e68254cd3d7eca71e0f47989fa548e Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 00:11:28 +0800 Subject: [PATCH 20/42] fix sql --- .../application/experiment_app_test.go | 30 +++++++++---------- .../repo/evaluator/mysql/evaluator_tag.go | 13 ++++++++ 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/backend/modules/evaluation/application/experiment_app_test.go b/backend/modules/evaluation/application/experiment_app_test.go index f4ca3f345..07276c7e2 100644 --- a/backend/modules/evaluation/application/experiment_app_test.go +++ b/backend/modules/evaluation/application/experiment_app_test.go @@ -207,27 +207,27 @@ func Test_experimentApplication_resolveEvaluatorVersionIDs(t *testing.T) { // 期望： // - BuiltinVisible: eid=1 返回可见版本，其版本ID设为 10101 // - 普通对： (2,1.0.0) -> 20200, (3,2.0.0) -> 30300 - mockEvaluatorService.EXPECT().BatchGetBuiltinEvaluator(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ - {ID: 1, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 1, Version: "1.2.3", ID: 10101}}, - }, nil) + mockEvaluatorService.EXPECT().BatchGetBuiltinEvaluator(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ + {ID: 1, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 1, Version: "1.2.3", ID: 10101}}, + }, nil) - mockEvaluatorService.EXPECT().BatchGetEvaluatorByIDAndVersion(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ - {ID: 2, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 2, Version: "1.0.0", ID: 20200}}, - {ID: 3, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 3, Version: "2.0.0", ID: 30300}}, - }, nil) + mockEvaluatorService.EXPECT().BatchGetEvaluatorByIDAndVersion(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ + {ID: 2, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 2, Version: "1.0.0", ID: 20200}}, + {ID: 3, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 3, Version: "2.0.0", ID: 30300}}, + }, nil) ids, err := app.resolveEvaluatorVersionIDs(ctx, req) if err != nil { t.Fatalf("resolveEvaluatorVersionIDs error: %v", err) } - // 输入顺序：builtin(10101), (2,1.0.0)->20200, (2,1.0.0) 重复去重, (3,2.0.0)->30300 - // 去重后期望顺序 [10101,20200,30300] - if got, want := len(ids), 3; got != want { - t.Fatalf("len(ids)=%d want=%d", got, want) - } - if ids[0] != 10101 || ids[1] != 20200 || ids[2] != 30300 { - t.Fatalf("ids=%v want=[10101 20200 30300]", ids) - } + // 输入顺序：builtin(10101), (2,1.0.0)->20200, (2,1.0.0)->20200(重复), (3,2.0.0)->30300 + // 该函数本身不去重（去重发生在 SubmitExperiment 中），因此期望长度为 4 + if got, want := len(ids), 4; got != want { + t.Fatalf("len(ids)=%d want=%d", got, want) + } + if !(ids[0] == 10101 && ids[1] == 20200 && ids[2] == 20200 && ids[3] == 30300) { + t.Fatalf("ids=%v want=[10101 20200 20200 30300]", ids) + } // 本用例不校验映射回填 } diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index 8ad1175d0..c667a141f 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -15,6 +15,7 @@ import ( "github.com/coze-dev/coze-loop/backend/infra/db" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + "github.com/coze-dev/coze-loop/backend/pkg/logs" ) // EvaluatorTagDAO 定义 EvaluatorTag 的 Dao 接口 @@ -169,6 +170,12 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte // 先查询总数 var total int64 countQuery := query.Session(&gorm.Session{}) + // 打印 COUNT SQL（完整） + countSQL := countQuery.ToSQL(func(tx *gorm.DB) *gorm.DB { + var tmp int64 + return tx.Distinct("evaluator_tag.source_id").Count(&tmp) + }) + logs.CtxInfo(ctx, "[GetSourceIDsByFilterConditions] COUNT SQL: %s", countSQL) if err := countQuery.Distinct("evaluator_tag.source_id").Count(&total).Error; err != nil { return nil, 0, err } @@ -181,6 +188,12 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte // 执行查询（按 Name 标签值排序；无 Name 的排在后面） var sourceIDs []int64 + // 打印 SELECT SQL（完整） + selectSQL := query.ToSQL(func(tx *gorm.DB) *gorm.DB { + var tmp []int64 + return tx.Distinct("evaluator_tag.source_id").Order("t_name.tag_value IS NULL, t_name.tag_value ASC").Pluck("evaluator_tag.source_id", &tmp) + }) + logs.CtxInfo(ctx, "[GetSourceIDsByFilterConditions] SELECT SQL: %s", selectSQL) err := query. Distinct("evaluator_tag.source_id"). Order("t_name.tag_value IS NULL, t_name.tag_value ASC"). From 6f2b0a232920d5e8b08749998dd98d9052235077 Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 01:03:40 +0800 Subject: [PATCH 21/42] =?UTF-8?q?=E4=BC=98=E5=8C=96sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repo/evaluator/mysql/evaluator_tag.go | 193 ++++++++++++++++-- 1 file changed, 180 insertions(+), 13 deletions(-) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index c667a141f..1707bd3bd 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -149,23 +149,25 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte } query = query.Joins(nameJoinSQL, nameJoinArgs...) - // 处理搜索关键词 + // 处理搜索关键词（在所有非 Category 标签范围内 LIKE 匹配） if filterOption.SearchKeyword != nil && *filterOption.SearchKeyword != "" { keyword := "%" + *filterOption.SearchKeyword + "%" - query = query.Where("evaluator_tag.tag_value LIKE ?", keyword) + query = query.Where("evaluator_tag.tag_key <> ? AND evaluator_tag.tag_value LIKE ?", string(entity.EvaluatorTagKey_Category), keyword) } - // 处理筛选条件 - if filterOption.Filters != nil { - conditions, args, err := dao.buildFilterConditions(filterOption.Filters) - if err != nil { - return nil, 0, err - } - - if len(conditions) > 0 { - query = query.Where(conditions, args...) - } - } + // 处理筛选条件（自连接实现 AND，WHERE 实现 OR） + if filterOption.Filters != nil { + joinSQLs, joinArgs, whereSQL, whereArgs, err := dao.buildSelfJoinAndWhere(filterOption.Filters, tagType, langType) + if err != nil { + return nil, 0, err + } + for i, js := range joinSQLs { + query = query.Joins(js, joinArgs[i]...) + } + if whereSQL != "" { + query = query.Where(whereSQL, whereArgs...) + } + } // 先查询总数 var total int64 @@ -313,6 +315,171 @@ func (dao *EvaluatorTagDAOImpl) buildSingleCondition(condition *entity.Evaluator } } +// buildSelfJoinAndWhere 基于自连接实现 AND，基于 WHERE 实现 OR +// 返回： +// - joinSQLs/joinArgs: 需要追加到 query.Joins 的 JOIN 片段（按顺序） +// - whereSQL/whereArgs: 需要追加到 query.Where 的 WHERE 片段 +func (dao *EvaluatorTagDAOImpl) buildSelfJoinAndWhere(filters *entity.EvaluatorFilters, tagType int32, langType string) ([]string, [][]interface{}, string, []interface{}, error) { + var joinSQLs []string + var joinArgs [][]interface{} + var whereParts []string + var whereArgs []interface{} + + // 生成唯一别名 + aliasCounter := 0 + nextAlias := func() string { + aliasCounter++ + return fmt.Sprintf("t_%d", aliasCounter) + } + + var build func(f *entity.EvaluatorFilters, parentIsAnd bool) (string, []interface{}, error) + build = func(f *entity.EvaluatorFilters, parentIsAnd bool) (string, []interface{}, error) { + if f == nil { + return "", nil, nil + } + + isOr := f.LogicOp != nil && *f.LogicOp == entity.FilterLogicOp_Or + + // 当前层的原子条件 + var parts []string + var args []interface{} + + if isOr { + // OR: 不做自连接，直接在 WHERE 中拼接到 base（evaluator_tag）别名上 + for _, c := range f.FilterConditions { + if c == nil { + continue + } + sqlFrag, sqlArgs, err := dao.buildSingleConditionWithAlias("evaluator_tag", c) + if err != nil { + return "", nil, err + } + if sqlFrag != "" { + parts = append(parts, "("+sqlFrag+")") + args = append(args, sqlArgs...) + } + } + // 子条件 + for _, sub := range f.SubFilters { + subSQL, subArgs, err := build(sub, false) + if err != nil { + return "", nil, err + } + if subSQL != "" { + parts = append(parts, "("+subSQL+")") + args = append(args, subArgs...) + } + } + + if len(parts) > 0 { + return strings.Join(parts, " OR "), args, nil + } + return "", nil, nil + } + + // AND: 自连接。每个原子条件产生一个 JOIN。 + for _, c := range f.FilterConditions { + if c == nil { + continue + } + alias := nextAlias() + onFrag, onArgs, err := dao.buildJoinPredicate(alias, c) + if err != nil { + return "", nil, err + } + join := fmt.Sprintf("JOIN evaluator_tag AS %s ON %s.source_id = evaluator_tag.source_id AND %s.tag_type = ? AND %s.deleted_at IS NULL", alias, alias, alias, alias) + jArgs := []interface{}{tagType} + if langType != "" { + join += fmt.Sprintf(" AND %s.lang_type = ?", alias) + jArgs = append(jArgs, langType) + } + if onFrag != "" { + join += " AND " + onFrag + jArgs = append(jArgs, onArgs...) + } + joinSQLs = append(joinSQLs, join) + joinArgs = append(joinArgs, jArgs) + } + + // 子条件：如果子条件是 OR，会返回 where 片段；如果子条件是 AND，会追加更多 JOIN + for _, sub := range f.SubFilters { + subSQL, subArgs, err := build(sub, true) + if err != nil { + return "", nil, err + } + if subSQL != "" { // OR 分支产生的 where 片段 + parts = append(parts, "("+subSQL+")") + args = append(args, subArgs...) + } + } + + if len(parts) > 0 { + // AND 层对 where 片段用 AND 连接 + return strings.Join(parts, " AND "), args, nil + } + return "", nil, nil + } + + whereSQL, whereArgsLocal, err := build(filters, false) + if err != nil { + return nil, nil, "", nil, err + } + if whereSQL != "" { + whereParts = append(whereParts, whereSQL) + whereArgs = append(whereArgs, whereArgsLocal...) + } + + finalWhere := strings.Join(whereParts, " AND ") + return joinSQLs, joinArgs, finalWhere, whereArgs, nil +} + +// buildSingleConditionWithAlias 生成基于指定别名的条件子句 +func (dao *EvaluatorTagDAOImpl) buildSingleConditionWithAlias(alias string, condition *entity.EvaluatorFilterCondition) (string, []interface{}, error) { + if condition == nil { + return "", nil, nil + } + tagKey := string(condition.TagKey) + operator := condition.Operator + value := condition.Value + + switch operator { + case entity.EvaluatorFilterOperatorType_Equal: + return fmt.Sprintf("%s.tag_key = ? AND %s.tag_value = ?", alias, alias), []interface{}{tagKey, value}, nil + case entity.EvaluatorFilterOperatorType_NotEqual: + return fmt.Sprintf("%s.tag_key = ? AND %s.tag_value != ?", alias, alias), []interface{}{tagKey, value}, nil + case entity.EvaluatorFilterOperatorType_In: + values := strings.Split(value, ",") + if len(values) == 0 { + return "", nil, fmt.Errorf("IN operator requires non-empty values") + } + placeholders := strings.Repeat("?,", len(values)) + placeholders = placeholders[:len(placeholders)-1] + return fmt.Sprintf("%s.tag_key = ? AND %s.tag_value IN (%s)", alias, alias, placeholders), append([]interface{}{tagKey}, convertToInterfaceSlice(values)...), nil + case entity.EvaluatorFilterOperatorType_NotIn: + values := strings.Split(value, ",") + if len(values) == 0 { + return "", nil, fmt.Errorf("NOT_IN operator requires non-empty values") + } + placeholders := strings.Repeat("?,", len(values)) + placeholders = placeholders[:len(placeholders)-1] + return fmt.Sprintf("%s.tag_key = ? AND %s.tag_value NOT IN (%s)", alias, alias, placeholders), append([]interface{}{tagKey}, convertToInterfaceSlice(values)...), nil + case entity.EvaluatorFilterOperatorType_Like: + likeValue := "%" + value + "%" + return fmt.Sprintf("%s.tag_key = ? AND %s.tag_value LIKE ?", alias, alias), []interface{}{tagKey, likeValue}, nil + case entity.EvaluatorFilterOperatorType_IsNull: + return fmt.Sprintf("%s.tag_key = ? AND %s.tag_value IS NULL", alias, alias), []interface{}{tagKey}, nil + case entity.EvaluatorFilterOperatorType_IsNotNull: + return fmt.Sprintf("%s.tag_key = ? AND %s.tag_value IS NOT NULL", alias, alias), []interface{}{tagKey}, nil + default: + return "", nil, fmt.Errorf("unsupported operator type: %v", operator) + } +} + +// buildJoinPredicate AND 场景下的 JOIN 条件（别名版） +func (dao *EvaluatorTagDAOImpl) buildJoinPredicate(alias string, condition *entity.EvaluatorFilterCondition) (string, []interface{}, error) { + return dao.buildSingleConditionWithAlias(alias, condition) +} + // convertToInterfaceSlice 将字符串切片转换为interface{}切片 func convertToInterfaceSlice(strs []string) []interface{} { result := make([]interface{}, len(strs)) From 9b99323df7334d959d3979b513f98f36200a3682 Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 12:38:12 +0800 Subject: [PATCH 22/42] add ut --- .../evaluator/evaluator_template_test.go | 353 +++++++++++++++++- .../convertor/evaluator/evaluator_test.go | 107 ++++++ .../application/evaluator_app_test.go | 331 ++++++++++++++++ .../application/experiment_app_test.go | 105 ++++++ .../repo/evaluator/evaluator_impl_test.go | 203 ++++++++++ .../evaluator/evaluator_template_impl_test.go | 277 ++++++++++++++ .../mysql/evaluator_tag_filter_test.go | 74 +++- 7 files changed, 1437 insertions(+), 13 deletions(-) diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go index 5742006b1..60ed1968a 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go @@ -4,14 +4,14 @@ package evaluator import ( - "testing" + "testing" - "github.com/bytedance/gg/gptr" - "github.com/stretchr/testify/assert" + "github.com/bytedance/gg/gptr" + "github.com/stretchr/testify/assert" - commondto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" - evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" - evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + commondto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" + evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" + evaluatordo "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" ) func TestConvertEvaluatorTemplateDTO2DO_Nil(t *testing.T) { @@ -177,4 +177,345 @@ func TestCodeEvaluatorContentDTOAndDO(t *testing.T) { } } +// TestConvertEvaluatorTemplateDTO2DO_EvaluatorInfo 测试 ConvertEvaluatorTemplateDTO2DO 的 EvaluatorInfo 处理逻辑 +func TestConvertEvaluatorTemplateDTO2DO_EvaluatorInfo(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + dto *evaluatordto.EvaluatorTemplate + expectedInfo *evaluatordo.EvaluatorInfo + description string + }{ + { + name: "成功 - EvaluatorInfo为nil", + dto: &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(int64(2)), + Name: gptr.Of("Test Template"), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), + Popularity: gptr.Of(int64(0)), + }, + expectedInfo: nil, + description: "当DTO的EvaluatorInfo为nil时，DO的EvaluatorInfo应该为nil", + }, + { + name: "成功 - EvaluatorInfo存在但所有字段为nil", + dto: &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(int64(2)), + Name: gptr.Of("Test Template"), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), + Popularity: gptr.Of(int64(0)), + EvaluatorInfo: &evaluatordto.EvaluatorInfo{}, + }, + expectedInfo: &evaluatordo.EvaluatorInfo{ + Benchmark: "", + Vendor: "", + VendorURL: "", + UserManualURL: "", + }, + description: "当DTO的EvaluatorInfo存在但所有字段为nil时，DO的EvaluatorInfo应该创建但所有字段为空字符串", + }, + { + name: "成功 - EvaluatorInfo存在且所有字段都有值", + dto: &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(int64(2)), + Name: gptr.Of("Test Template"), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), + Popularity: gptr.Of(int64(0)), + EvaluatorInfo: &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of("GLUE"), + Vendor: gptr.Of("OpenAI"), + VendorURL: gptr.Of("https://openai.com"), + UserManualURL: gptr.Of("https://docs.openai.com"), + }, + }, + expectedInfo: &evaluatordo.EvaluatorInfo{ + Benchmark: "GLUE", + Vendor: "OpenAI", + VendorURL: "https://openai.com", + UserManualURL: "https://docs.openai.com", + }, + description: "当DTO的EvaluatorInfo存在且所有字段都有值时，DO的EvaluatorInfo应该正确转换所有字段", + }, + { + name: "成功 - EvaluatorInfo存在但部分字段有值", + dto: &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(int64(2)), + Name: gptr.Of("Test Template"), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), + Popularity: gptr.Of(int64(0)), + EvaluatorInfo: &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of("GLUE"), + Vendor: gptr.Of("OpenAI"), + // VendorURL 和 UserManualURL 为 nil + }, + }, + expectedInfo: &evaluatordo.EvaluatorInfo{ + Benchmark: "GLUE", + Vendor: "OpenAI", + VendorURL: "", + UserManualURL: "", + }, + description: "当DTO的EvaluatorInfo存在但部分字段有值时，DO的EvaluatorInfo应该正确转换，nil字段转为空字符串", + }, + { + name: "成功 - EvaluatorInfo字段为空字符串", + dto: &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(int64(2)), + Name: gptr.Of("Test Template"), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), + Popularity: gptr.Of(int64(0)), + EvaluatorInfo: &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of(""), + Vendor: gptr.Of(""), + VendorURL: gptr.Of(""), + UserManualURL: gptr.Of(""), + }, + }, + expectedInfo: &evaluatordo.EvaluatorInfo{ + Benchmark: "", + Vendor: "", + VendorURL: "", + UserManualURL: "", + }, + description: "当DTO的EvaluatorInfo字段为空字符串时，DO的EvaluatorInfo应该保持为空字符串", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + do := ConvertEvaluatorTemplateDTO2DO(tt.dto) + + assert.NotNil(t, do, tt.description) + if tt.expectedInfo == nil { + assert.Nil(t, do.EvaluatorInfo, tt.description) + } else { + assert.NotNil(t, do.EvaluatorInfo, tt.description) + assert.Equal(t, tt.expectedInfo.Benchmark, do.EvaluatorInfo.Benchmark, tt.description+" - Benchmark应该相等") + assert.Equal(t, tt.expectedInfo.Vendor, do.EvaluatorInfo.Vendor, tt.description+" - Vendor应该相等") + assert.Equal(t, tt.expectedInfo.VendorURL, do.EvaluatorInfo.VendorURL, tt.description+" - VendorURL应该相等") + assert.Equal(t, tt.expectedInfo.UserManualURL, do.EvaluatorInfo.UserManualURL, tt.description+" - UserManualURL应该相等") + } + }) + } +} + +// TestConvertEvaluatorTemplateDO2DTO_EvaluatorInfo 测试 ConvertEvaluatorTemplateDO2DTO 的 EvaluatorInfo 处理逻辑 +func TestConvertEvaluatorTemplateDO2DTO_EvaluatorInfo(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + do *evaluatordo.EvaluatorTemplate + expectedInfo *evaluatordto.EvaluatorInfo + description string + }{ + { + name: "成功 - EvaluatorInfo为nil", + do: &evaluatordo.EvaluatorTemplate{ + ID: 1, + SpaceID: 2, + Name: "Test Template", + EvaluatorType: evaluatordo.EvaluatorTypePrompt, + Popularity: 0, + }, + expectedInfo: nil, + description: "当DO的EvaluatorInfo为nil时，DTO的EvaluatorInfo应该为nil", + }, + { + name: "成功 - EvaluatorInfo存在但所有字段为空字符串", + do: &evaluatordo.EvaluatorTemplate{ + ID: 1, + SpaceID: 2, + Name: "Test Template", + EvaluatorType: evaluatordo.EvaluatorTypePrompt, + Popularity: 0, + EvaluatorInfo: &evaluatordo.EvaluatorInfo{ + Benchmark: "", + Vendor: "", + VendorURL: "", + UserManualURL: "", + }, + }, + expectedInfo: &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of(""), + Vendor: gptr.Of(""), + VendorURL: gptr.Of(""), + UserManualURL: gptr.Of(""), + }, + description: "当DO的EvaluatorInfo存在但所有字段为空字符串时，DTO的EvaluatorInfo应该创建且所有字段为空字符串指针", + }, + { + name: "成功 - EvaluatorInfo存在且所有字段都有值", + do: &evaluatordo.EvaluatorTemplate{ + ID: 1, + SpaceID: 2, + Name: "Test Template", + EvaluatorType: evaluatordo.EvaluatorTypePrompt, + Popularity: 0, + EvaluatorInfo: &evaluatordo.EvaluatorInfo{ + Benchmark: "GLUE", + Vendor: "OpenAI", + VendorURL: "https://openai.com", + UserManualURL: "https://docs.openai.com", + }, + }, + expectedInfo: &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of("GLUE"), + Vendor: gptr.Of("OpenAI"), + VendorURL: gptr.Of("https://openai.com"), + UserManualURL: gptr.Of("https://docs.openai.com"), + }, + description: "当DO的EvaluatorInfo存在且所有字段都有值时，DTO的EvaluatorInfo应该正确转换所有字段", + }, + { + name: "成功 - EvaluatorInfo存在但部分字段有值", + do: &evaluatordo.EvaluatorTemplate{ + ID: 1, + SpaceID: 2, + Name: "Test Template", + EvaluatorType: evaluatordo.EvaluatorTypePrompt, + Popularity: 0, + EvaluatorInfo: &evaluatordo.EvaluatorInfo{ + Benchmark: "GLUE", + Vendor: "OpenAI", + // VendorURL 和 UserManualURL 为空字符串 + VendorURL: "", + UserManualURL: "", + }, + }, + expectedInfo: &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of("GLUE"), + Vendor: gptr.Of("OpenAI"), + VendorURL: gptr.Of(""), + UserManualURL: gptr.Of(""), + }, + description: "当DO的EvaluatorInfo存在但部分字段有值时，DTO的EvaluatorInfo应该正确转换，空字符串字段转为空字符串指针", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + dto := ConvertEvaluatorTemplateDO2DTO(tt.do) + + assert.NotNil(t, dto, tt.description) + if tt.expectedInfo == nil { + assert.Nil(t, dto.EvaluatorInfo, tt.description) + } else { + assert.NotNil(t, dto.EvaluatorInfo, tt.description) + assert.Equal(t, tt.expectedInfo.GetBenchmark(), dto.EvaluatorInfo.GetBenchmark(), tt.description+" - Benchmark应该相等") + assert.Equal(t, tt.expectedInfo.GetVendor(), dto.EvaluatorInfo.GetVendor(), tt.description+" - Vendor应该相等") + assert.Equal(t, tt.expectedInfo.GetVendorURL(), dto.EvaluatorInfo.GetVendorURL(), tt.description+" - VendorURL应该相等") + assert.Equal(t, tt.expectedInfo.GetUserManualURL(), dto.EvaluatorInfo.GetUserManualURL(), tt.description+" - UserManualURL应该相等") + } + }) + } +} + +// TestConvertEvaluatorTemplate_EvaluatorInfo_RoundTrip 测试 EvaluatorInfo 的双向转换 +func TestConvertEvaluatorTemplate_EvaluatorInfo_RoundTrip(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + originalDTO *evaluatordto.EvaluatorTemplate + description string + }{ + { + name: "成功 - EvaluatorInfo完整字段往返转换", + originalDTO: &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(int64(2)), + Name: gptr.Of("Test Template"), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), + Popularity: gptr.Of(int64(100)), + EvaluatorInfo: &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of("GLUE"), + Vendor: gptr.Of("OpenAI"), + VendorURL: gptr.Of("https://openai.com"), + UserManualURL: gptr.Of("https://docs.openai.com"), + }, + }, + description: "当EvaluatorInfo所有字段都有值时，DTO->DO->DTO往返转换应该保持数据一致性", + }, + { + name: "成功 - EvaluatorInfo部分字段往返转换", + originalDTO: &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(int64(2)), + Name: gptr.Of("Test Template"), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), + Popularity: gptr.Of(int64(100)), + EvaluatorInfo: &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of("GLUE"), + Vendor: gptr.Of("OpenAI"), + // VendorURL 和 UserManualURL 为 nil + }, + }, + description: "当EvaluatorInfo部分字段有值时，DTO->DO->DTO往返转换应该保持数据一致性（nil字段转为空字符串）", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + t.Parallel() + + // DTO -> DO + do := ConvertEvaluatorTemplateDTO2DO(tt.originalDTO) + assert.NotNil(t, do, tt.description) + + // DO -> DTO + resultDTO := ConvertEvaluatorTemplateDO2DTO(do) + assert.NotNil(t, resultDTO, tt.description) + + // 验证 EvaluatorInfo 的往返转换 + if tt.originalDTO.EvaluatorInfo == nil { + assert.Nil(t, resultDTO.EvaluatorInfo, tt.description) + } else { + assert.NotNil(t, resultDTO.EvaluatorInfo, tt.description) + originalBenchmark := tt.originalDTO.EvaluatorInfo.GetBenchmark() + resultBenchmark := resultDTO.EvaluatorInfo.GetBenchmark() + if originalBenchmark == "" { + assert.Equal(t, "", resultBenchmark, tt.description+" - Benchmark应该保持一致") + } else { + assert.Equal(t, originalBenchmark, resultBenchmark, tt.description+" - Benchmark应该保持一致") + } + + originalVendor := tt.originalDTO.EvaluatorInfo.GetVendor() + resultVendor := resultDTO.EvaluatorInfo.GetVendor() + if originalVendor == "" { + assert.Equal(t, "", resultVendor, tt.description+" - Vendor应该保持一致") + } else { + assert.Equal(t, originalVendor, resultVendor, tt.description+" - Vendor应该保持一致") + } + + originalVendorURL := tt.originalDTO.EvaluatorInfo.GetVendorURL() + resultVendorURL := resultDTO.EvaluatorInfo.GetVendorURL() + if originalVendorURL == "" { + assert.Equal(t, "", resultVendorURL, tt.description+" - VendorURL应该保持一致") + } else { + assert.Equal(t, originalVendorURL, resultVendorURL, tt.description+" - VendorURL应该保持一致") + } + + originalUserManualURL := tt.originalDTO.EvaluatorInfo.GetUserManualURL() + resultUserManualURL := resultDTO.EvaluatorInfo.GetUserManualURL() + if originalUserManualURL == "" { + assert.Equal(t, "", resultUserManualURL, tt.description+" - UserManualURL应该保持一致") + } else { + assert.Equal(t, originalUserManualURL, resultUserManualURL, tt.description+" - UserManualURL应该保持一致") + } + } + }) + } +} + diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go index cefc6b99f..1ae249b41 100755 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go @@ -177,6 +177,113 @@ func TestConvertEvaluatorContent2DO(t *testing.T) { assert.True(t, gptr.Indirect(e.PromptEvaluatorVersion.ReceiveChatHistory)) assert.Equal(t, "key", e.PromptEvaluatorVersion.PromptTemplateKey) } + + // custom rpc ok - basic fields + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("CN:480"), + AccessProtocol: evaluatordto.AccessProtocolRPC, + ServiceName: gptr.Of("test-service"), + Cluster: gptr.Of("test-cluster"), + Timeout: gptr.Of(int64(5000)), + }, + }, evaluatordto.EvaluatorType_CustomRPC) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { + assert.Equal(t, "CN:480", gptr.Indirect(e.CustomRPCEvaluatorVersion.ProviderEvaluatorCode)) + assert.Equal(t, evaluatordto.AccessProtocolRPC, e.CustomRPCEvaluatorVersion.AccessProtocol) + assert.Equal(t, "test-service", gptr.Indirect(e.CustomRPCEvaluatorVersion.ServiceName)) + assert.Equal(t, "test-cluster", gptr.Indirect(e.CustomRPCEvaluatorVersion.Cluster)) + assert.Equal(t, int64(5000), gptr.Indirect(e.CustomRPCEvaluatorVersion.Timeout)) + } + + // custom rpc ok - with input schemas + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("CN:480"), + AccessProtocol: evaluatordto.AccessProtocolRPC, + ServiceName: gptr.Of("test-service"), + }, + InputSchemas: []*commondto.ArgsSchema{ + {Key: gptr.Of("input1"), SupportContentTypes: []string{"text"}}, + {Key: gptr.Of("input2"), SupportContentTypes: []string{"image"}}, + }, + }, evaluatordto.EvaluatorType_CustomRPC) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { + assert.NotNil(t, e.CustomRPCEvaluatorVersion.InputSchemas) + assert.Equal(t, 2, len(e.CustomRPCEvaluatorVersion.InputSchemas)) + assert.Equal(t, "input1", gptr.Indirect(e.CustomRPCEvaluatorVersion.InputSchemas[0].Key)) + assert.Equal(t, "input2", gptr.Indirect(e.CustomRPCEvaluatorVersion.InputSchemas[1].Key)) + assert.Equal(t, 1, len(e.CustomRPCEvaluatorVersion.InputSchemas[0].SupportContentTypes)) + assert.Equal(t, evaluatordo.ContentType("text"), e.CustomRPCEvaluatorVersion.InputSchemas[0].SupportContentTypes[0]) + } + + // custom rpc ok - with output schemas + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("CN:480"), + AccessProtocol: evaluatordto.AccessProtocolRPC, + ServiceName: gptr.Of("test-service"), + }, + OutputSchemas: []*commondto.ArgsSchema{ + {Key: gptr.Of("output1"), SupportContentTypes: []string{"text"}}, + }, + }, evaluatordto.EvaluatorType_CustomRPC) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { + assert.NotNil(t, e.CustomRPCEvaluatorVersion.OutputSchemas) + assert.Equal(t, 1, len(e.CustomRPCEvaluatorVersion.OutputSchemas)) + assert.Equal(t, "output1", gptr.Indirect(e.CustomRPCEvaluatorVersion.OutputSchemas[0].Key)) + } + + // custom rpc ok - with both input and output schemas + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("CN:480"), + AccessProtocol: evaluatordto.AccessProtocolRPC, + ServiceName: gptr.Of("test-service"), + Cluster: gptr.Of("prod-cluster"), + Timeout: gptr.Of(int64(10000)), + }, + InputSchemas: []*commondto.ArgsSchema{ + {Key: gptr.Of("input1"), SupportContentTypes: []string{"text"}}, + }, + OutputSchemas: []*commondto.ArgsSchema{ + {Key: gptr.Of("output1"), SupportContentTypes: []string{"text"}}, + {Key: gptr.Of("output2"), SupportContentTypes: []string{"json"}}, + }, + }, evaluatordto.EvaluatorType_CustomRPC) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { + assert.Equal(t, "CN:480", gptr.Indirect(e.CustomRPCEvaluatorVersion.ProviderEvaluatorCode)) + assert.Equal(t, evaluatordto.AccessProtocolRPC, e.CustomRPCEvaluatorVersion.AccessProtocol) + assert.Equal(t, "test-service", gptr.Indirect(e.CustomRPCEvaluatorVersion.ServiceName)) + assert.Equal(t, "prod-cluster", gptr.Indirect(e.CustomRPCEvaluatorVersion.Cluster)) + assert.Equal(t, int64(10000), gptr.Indirect(e.CustomRPCEvaluatorVersion.Timeout)) + assert.NotNil(t, e.CustomRPCEvaluatorVersion.InputSchemas) + assert.Equal(t, 1, len(e.CustomRPCEvaluatorVersion.InputSchemas)) + assert.NotNil(t, e.CustomRPCEvaluatorVersion.OutputSchemas) + assert.Equal(t, 2, len(e.CustomRPCEvaluatorVersion.OutputSchemas)) + assert.Equal(t, "input1", gptr.Indirect(e.CustomRPCEvaluatorVersion.InputSchemas[0].Key)) + assert.Equal(t, "output1", gptr.Indirect(e.CustomRPCEvaluatorVersion.OutputSchemas[0].Key)) + assert.Equal(t, "output2", gptr.Indirect(e.CustomRPCEvaluatorVersion.OutputSchemas[1].Key)) + } + + // custom rpc ok - empty schemas + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("CN:480"), + AccessProtocol: evaluatordto.AccessProtocolRPC, + }, + InputSchemas: []*commondto.ArgsSchema{}, + OutputSchemas: []*commondto.ArgsSchema{}, + }, evaluatordto.EvaluatorType_CustomRPC) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { + assert.Nil(t, e.CustomRPCEvaluatorVersion.InputSchemas) + assert.Nil(t, e.CustomRPCEvaluatorVersion.OutputSchemas) + } } func TestTagKeyConvert(t *testing.T) { diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index 8418eec67..0d4a082dd 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -379,6 +379,337 @@ func TestEvaluatorHandlerImpl_GetEvaluator(t *testing.T) { } } +// TestEvaluatorHandlerImpl_GetEvaluatorVersion 测试 GetEvaluatorVersion 方法 +func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + // Setup mocks + mockAuth := rpcmocks.NewMockIAuthProvider(ctrl) + mockEvaluatorService := mocks.NewMockEvaluatorService(ctrl) + mockUserInfoService := userinfomocks.NewMockUserInfoService(ctrl) + mockConfiger := confmocks.NewMockIConfiger(ctrl) + + app := &EvaluatorHandlerImpl{ + auth: mockAuth, + evaluatorService: mockEvaluatorService, + userInfoService: mockUserInfoService, + configer: mockConfiger, + } + + validWorkspaceID := int64(123) + validEvaluatorVersionID := int64(456) + validEvaluator := &entity.Evaluator{ + ID: 1, + SpaceID: validWorkspaceID, + Name: "test-evaluator", + EvaluatorType: entity.EvaluatorTypePrompt, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + ID: validEvaluatorVersionID, + EvaluatorID: 1, + Version: "1.0.0", + }, + } + + builtinEvaluator := &entity.Evaluator{ + ID: 2, + SpaceID: validWorkspaceID, + Name: "builtin-evaluator", + Builtin: true, + EvaluatorType: entity.EvaluatorTypePrompt, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + ID: validEvaluatorVersionID, + EvaluatorID: 2, + Version: "1.0.0", + }, + } + + tests := []struct { + name string + req *evaluatorservice.GetEvaluatorVersionRequest + mockSetup func() + wantResp *evaluatorservice.GetEvaluatorVersionResponse + wantErr bool + wantErrCode int32 + }{ + { + name: "success - normal evaluator version", + req: &evaluatorservice.GetEvaluatorVersionRequest{ + WorkspaceID: validWorkspaceID, + EvaluatorVersionID: validEvaluatorVersionID, + Builtin: gptr.Of(false), + IncludeDeleted: gptr.Of(false), + }, + mockSetup: func() { + // Mock service call - non-builtin, with spaceID + mockEvaluatorService.EXPECT(). + GetEvaluatorVersion(gomock.Any(), gptr.Of(validWorkspaceID), validEvaluatorVersionID, false, false). + Return(validEvaluator, nil) + + // Mock auth - non-builtin path + mockAuth.EXPECT(). + Authorization(gomock.Any(), &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(validEvaluator.ID, 10), + SpaceID: validEvaluator.SpaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of(consts.Read), EntityType: gptr.Of(rpc.AuthEntityType_Evaluator)}}, + }). + Return(nil) + + // Mock user info service + mockUserInfoService.EXPECT().PackUserInfo(gomock.Any(), gomock.Any()).Return().Times(2) + }, + wantResp: &evaluatorservice.GetEvaluatorVersionResponse{ + Evaluator: evaluator.ConvertEvaluatorDO2DTO(validEvaluator), + }, + wantErr: false, + }, + { + name: "success - builtin evaluator version", + req: &evaluatorservice.GetEvaluatorVersionRequest{ + WorkspaceID: validWorkspaceID, + EvaluatorVersionID: validEvaluatorVersionID, + Builtin: gptr.Of(true), + IncludeDeleted: gptr.Of(false), + }, + mockSetup: func() { + // Mock service call - builtin, without spaceID + mockEvaluatorService.EXPECT(). + GetEvaluatorVersion(gomock.Any(), (*int64)(nil), validEvaluatorVersionID, false, true). + Return(builtinEvaluator, nil) + + // Mock configer for authBuiltinManagement - spaceID in config, so authBuiltinManagement returns nil without calling Authorization + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{strconv.FormatInt(validWorkspaceID, 10)}) + + // Mock auth - builtin path (second auth call in GetEvaluatorVersion) + mockAuth.EXPECT(). + Authorization(gomock.Any(), &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(validWorkspaceID, 10), + SpaceID: validWorkspaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, + }). + Return(nil) + + // Mock user info service + mockUserInfoService.EXPECT().PackUserInfo(gomock.Any(), gomock.Any()).Return().Times(2) + }, + wantResp: &evaluatorservice.GetEvaluatorVersionResponse{ + Evaluator: evaluator.ConvertEvaluatorDO2DTO(builtinEvaluator), + }, + wantErr: false, + }, + { + name: "success - evaluator not found", + req: &evaluatorservice.GetEvaluatorVersionRequest{ + WorkspaceID: validWorkspaceID, + EvaluatorVersionID: validEvaluatorVersionID, + Builtin: gptr.Of(false), + IncludeDeleted: gptr.Of(false), + }, + mockSetup: func() { + // Mock service call - returns nil + mockEvaluatorService.EXPECT(). + GetEvaluatorVersion(gomock.Any(), gptr.Of(validWorkspaceID), validEvaluatorVersionID, false, false). + Return(nil, nil) + }, + wantResp: &evaluatorservice.GetEvaluatorVersionResponse{}, + wantErr: false, + }, + { + name: "error - service error", + req: &evaluatorservice.GetEvaluatorVersionRequest{ + WorkspaceID: validWorkspaceID, + EvaluatorVersionID: validEvaluatorVersionID, + Builtin: gptr.Of(false), + IncludeDeleted: gptr.Of(false), + }, + mockSetup: func() { + // Mock service call - returns error + mockEvaluatorService.EXPECT(). + GetEvaluatorVersion(gomock.Any(), gptr.Of(validWorkspaceID), validEvaluatorVersionID, false, false). + Return(nil, errors.New("database error")) + }, + wantResp: nil, + wantErr: true, + }, + { + name: "error - auth failed for non-builtin", + req: &evaluatorservice.GetEvaluatorVersionRequest{ + WorkspaceID: validWorkspaceID, + EvaluatorVersionID: validEvaluatorVersionID, + Builtin: gptr.Of(false), + IncludeDeleted: gptr.Of(false), + }, + mockSetup: func() { + // Mock service call + mockEvaluatorService.EXPECT(). + GetEvaluatorVersion(gomock.Any(), gptr.Of(validWorkspaceID), validEvaluatorVersionID, false, false). + Return(validEvaluator, nil) + + // Mock auth - returns error + mockAuth.EXPECT(). + Authorization(gomock.Any(), &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(validEvaluator.ID, 10), + SpaceID: validEvaluator.SpaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of(consts.Read), EntityType: gptr.Of(rpc.AuthEntityType_Evaluator)}}, + }). + Return(errorx.NewByCode(errno.CommonNoPermissionCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonNoPermissionCode, + }, + { + name: "error - authBuiltinManagement failed - space not in config", + req: &evaluatorservice.GetEvaluatorVersionRequest{ + WorkspaceID: validWorkspaceID, + EvaluatorVersionID: validEvaluatorVersionID, + Builtin: gptr.Of(true), + IncludeDeleted: gptr.Of(false), + }, + mockSetup: func() { + // Mock service call + mockEvaluatorService.EXPECT(). + GetEvaluatorVersion(gomock.Any(), (*int64)(nil), validEvaluatorVersionID, false, true). + Return(builtinEvaluator, nil) + + // Mock configer for authBuiltinManagement - returns empty list, which causes error + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{}) + // When config is empty, authBuiltinManagement returns error immediately without calling Authorization + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonInvalidParamCode, + }, + { + name: "error - authBuiltinManagement failed - space not allowed", + req: &evaluatorservice.GetEvaluatorVersionRequest{ + WorkspaceID: validWorkspaceID, + EvaluatorVersionID: validEvaluatorVersionID, + Builtin: gptr.Of(true), + IncludeDeleted: gptr.Of(false), + }, + mockSetup: func() { + // Mock service call + mockEvaluatorService.EXPECT(). + GetEvaluatorVersion(gomock.Any(), (*int64)(nil), validEvaluatorVersionID, false, true). + Return(builtinEvaluator, nil) + + // Mock configer for authBuiltinManagement - returns different space ID + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{"999"}) // Different workspace ID + + // Mock auth - returns error when space not in config + mockAuth.EXPECT(). + Authorization(gomock.Any(), &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(validWorkspaceID, 10), + SpaceID: validWorkspaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, + }). + Return(errorx.NewByCode(errno.CommonNoPermissionCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonNoPermissionCode, + }, + { + name: "error - builtin second auth failed", + req: &evaluatorservice.GetEvaluatorVersionRequest{ + WorkspaceID: validWorkspaceID, + EvaluatorVersionID: validEvaluatorVersionID, + Builtin: gptr.Of(true), + IncludeDeleted: gptr.Of(false), + }, + mockSetup: func() { + // Mock service call + mockEvaluatorService.EXPECT(). + GetEvaluatorVersion(gomock.Any(), (*int64)(nil), validEvaluatorVersionID, false, true). + Return(builtinEvaluator, nil) + + // Mock configer for authBuiltinManagement - spaceID in config, so authBuiltinManagement returns nil without calling Authorization + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{strconv.FormatInt(validWorkspaceID, 10)}) + + // Mock auth - second call in GetEvaluatorVersion fails + mockAuth.EXPECT(). + Authorization(gomock.Any(), &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(validWorkspaceID, 10), + SpaceID: validWorkspaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, + }). + Return(errorx.NewByCode(errno.CommonNoPermissionCode)) + }, + wantResp: nil, + wantErr: true, + wantErrCode: errno.CommonNoPermissionCode, + }, + { + name: "success - include deleted", + req: &evaluatorservice.GetEvaluatorVersionRequest{ + WorkspaceID: validWorkspaceID, + EvaluatorVersionID: validEvaluatorVersionID, + Builtin: gptr.Of(false), + IncludeDeleted: gptr.Of(true), + }, + mockSetup: func() { + // Mock service call with includeDeleted=true + mockEvaluatorService.EXPECT(). + GetEvaluatorVersion(gomock.Any(), gptr.Of(validWorkspaceID), validEvaluatorVersionID, true, false). + Return(validEvaluator, nil) + + // Mock auth + mockAuth.EXPECT(). + Authorization(gomock.Any(), &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(validEvaluator.ID, 10), + SpaceID: validEvaluator.SpaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of(consts.Read), EntityType: gptr.Of(rpc.AuthEntityType_Evaluator)}}, + }). + Return(nil) + + // Mock user info service + mockUserInfoService.EXPECT().PackUserInfo(gomock.Any(), gomock.Any()).Return().Times(2) + }, + wantResp: &evaluatorservice.GetEvaluatorVersionResponse{ + Evaluator: evaluator.ConvertEvaluatorDO2DTO(validEvaluator), + }, + wantErr: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tt.mockSetup() + + resp, err := app.GetEvaluatorVersion(context.Background(), tt.req) + + if tt.wantErr { + assert.Error(t, err) + if tt.wantErrCode != 0 { + statusErr, ok := errorx.FromStatusError(err) + assert.True(t, ok) + assert.Equal(t, tt.wantErrCode, statusErr.Code()) + } + } else { + assert.NoError(t, err) + if tt.wantResp != nil { + assert.NotNil(t, resp) + if tt.wantResp.Evaluator != nil { + assert.Equal(t, tt.wantResp.Evaluator.GetEvaluatorID(), resp.Evaluator.GetEvaluatorID()) + assert.Equal(t, tt.wantResp.Evaluator.GetName(), resp.Evaluator.GetName()) + } + } else { + assert.Equal(t, tt.wantResp, resp) + } + } + }) + } +} + // 新增的复杂业务逻辑测试 // TestEvaluatorHandlerImpl_ComplexBusinessScenarios 测试复杂业务场景 diff --git a/backend/modules/evaluation/application/experiment_app_test.go b/backend/modules/evaluation/application/experiment_app_test.go index 07276c7e2..0e963dcc7 100644 --- a/backend/modules/evaluation/application/experiment_app_test.go +++ b/backend/modules/evaluation/application/experiment_app_test.go @@ -232,6 +232,111 @@ func Test_experimentApplication_resolveEvaluatorVersionIDs(t *testing.T) { // 本用例不校验映射回填 } +// Test_experimentApplication_resolveEvaluatorVersionIDs_WithEvaluatorFieldMapping 覆盖 EvaluatorFieldMapping 的回填逻辑 +func Test_experimentApplication_resolveEvaluatorVersionIDs_WithEvaluatorFieldMapping(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockEvaluatorService := servicemocks.NewMockEvaluatorService(ctrl) + + app := &experimentApplication{ + evaluatorService: mockEvaluatorService, + } + + ctx := context.Background() + + // 创建测试用的 EvaluatorFieldMapping，其中包含一个缺少 evaluator_version_id 的映射 + // 这个映射应该引用一个 BuiltinVisible 的评估器 + mapping1 := expt.NewEvaluatorFieldMapping() + mapping1.SetEvaluatorVersionID(0) // 缺少 evaluator_version_id，需要回填 + mapping1.SetEvaluatorIDVersionItem(&evaluator.EvaluatorIDVersionItem{ + EvaluatorID: gptr.Of(int64(1)), + Version: gptr.Of("BuiltinVisible"), + }) + + // 创建另一个映射，引用普通版本 + mapping2 := expt.NewEvaluatorFieldMapping() + mapping2.SetEvaluatorVersionID(0) // 缺少 evaluator_version_id，需要回填 + mapping2.SetEvaluatorIDVersionItem(&evaluator.EvaluatorIDVersionItem{ + EvaluatorID: gptr.Of(int64(2)), + Version: gptr.Of("1.0.0"), + }) + + // 创建一个已经有 evaluator_version_id 的映射，不应该被处理 + mapping3 := expt.NewEvaluatorFieldMapping() + mapping3.SetEvaluatorVersionID(99999) // 已经有值，应该跳过 + mapping3.SetEvaluatorIDVersionItem(&evaluator.EvaluatorIDVersionItem{ + EvaluatorID: gptr.Of(int64(3)), + Version: gptr.Of("2.0.0"), + }) + + // 创建一个没有 EvaluatorIDVersionItem 的映射，应该跳过 + mapping4 := expt.NewEvaluatorFieldMapping() + mapping4.SetEvaluatorVersionID(0) // 缺少 evaluator_version_id + // 但没有 EvaluatorIDVersionItem，应该跳过 + + req := &exptpb.SubmitExperimentRequest{ + EvaluatorIDVersionList: []*evaluator.EvaluatorIDVersionItem{ + {EvaluatorID: gptr.Of(int64(1)), Version: gptr.Of("BuiltinVisible")}, + {EvaluatorID: gptr.Of(int64(2)), Version: gptr.Of("1.0.0")}, + {EvaluatorID: gptr.Of(int64(3)), Version: gptr.Of("2.0.0")}, + }, + EvaluatorFieldMapping: []*expt.EvaluatorFieldMapping{ + mapping1, // 应该被回填为 10101 + mapping2, // 应该被回填为 20200 + mapping3, // 已经有值，应该保持不变 + mapping4, // 没有 EvaluatorIDVersionItem，应该跳过 + }, + } + + // Mock 内置评估器查询 + mockEvaluatorService.EXPECT().BatchGetBuiltinEvaluator(gomock.Any(), []int64{1}).Return([]*entity.Evaluator{ + {ID: 1, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 1, Version: "1.2.3", ID: 10101}}, + }, nil) + + // Mock 普通版本查询 + mockEvaluatorService.EXPECT().BatchGetEvaluatorByIDAndVersion(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ + {ID: 2, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 2, Version: "1.0.0", ID: 20200}}, + {ID: 3, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 3, Version: "2.0.0", ID: 30300}}, + }, nil) + + ids, err := app.resolveEvaluatorVersionIDs(ctx, req) + if err != nil { + t.Fatalf("resolveEvaluatorVersionIDs error: %v", err) + } + + // 验证返回的版本ID列表 + expectedIDs := []int64{10101, 20200, 30300} + if len(ids) != len(expectedIDs) { + t.Fatalf("len(ids)=%d want=%d", len(ids), len(expectedIDs)) + } + for i, id := range expectedIDs { + if ids[i] != id { + t.Fatalf("ids[%d]=%d want=%d", i, ids[i], id) + } + } + + // 验证 mapping1 的 evaluator_version_id 被回填 + if mapping1.GetEvaluatorVersionID() != 10101 { + t.Fatalf("mapping1.EvaluatorVersionID=%d want=10101", mapping1.GetEvaluatorVersionID()) + } + + // 验证 mapping2 的 evaluator_version_id 被回填 + if mapping2.GetEvaluatorVersionID() != 20200 { + t.Fatalf("mapping2.EvaluatorVersionID=%d want=20200", mapping2.GetEvaluatorVersionID()) + } + + // 验证 mapping3 的 evaluator_version_id 保持不变 + if mapping3.GetEvaluatorVersionID() != 99999 { + t.Fatalf("mapping3.EvaluatorVersionID=%d want=99999", mapping3.GetEvaluatorVersionID()) + } + + // 验证 mapping4 的 evaluator_version_id 保持为 0（因为没有 EvaluatorIDVersionItem） + if mapping4.GetEvaluatorVersionID() != 0 { + t.Fatalf("mapping4.EvaluatorVersionID=%d want=0", mapping4.GetEvaluatorVersionID()) + } +} + func TestExperimentApplication_SubmitExperiment(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index 280fed4df..c2c3a038b 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -34,6 +34,7 @@ func TestEvaluatorRepoImpl_SubmitEvaluatorVersion(t *testing.T) { mockEvaluatorVersionDAO := evaluatormocks.NewMockEvaluatorVersionDAO(ctrl) mockDBProvider := dbmocks.NewMockProvider(ctrl) mockLWT := platestwritemocks.NewMockILatestWriteTracker(ctrl) + mockTagDAO := evaluatormocks.NewMockEvaluatorTagDAO(ctrl) tests := []struct { name string @@ -118,6 +119,207 @@ func TestEvaluatorRepoImpl_SubmitEvaluatorVersion(t *testing.T) { }, expectedError: assert.AnError, }, + { + name: "成功提交内置评估器版本并创建标签", + evaluator: &entity.Evaluator{ + ID: 1, + Builtin: true, + EvaluatorType: entity.EvaluatorTypePrompt, + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + ID: 100, + Version: "1.0.0", + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + }, + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"LLM"}, + entity.EvaluatorTagKey_BusinessScenario: {"安全风控"}, + }, + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + }, + }, + mockSetup: func() { + // 设置数据库事务的期望 + mockDBProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + // 创建一个模拟的 gorm.DB 实例 + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + // 设置更新评估器最新版本的期望 + mockEvaluatorDAO.EXPECT(). + UpdateEvaluatorLatestVersion(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + + // 设置创建评估器版本的期望 + mockEvaluatorVersionDAO.EXPECT(). + CreateEvaluatorVersion(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + + // 设置生成标签ID的期望（3个标签：zh-CN的Category、BusinessScenario，en-US的Category） + mockIDGen.EXPECT(). + GenMultiIDs(gomock.Any(), 3). + Return([]int64{1001, 1002, 1003}, nil) + + // 设置批量创建标签的期望 + mockTagDAO.EXPECT(). + BatchCreateEvaluatorTags(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, tags []*model.EvaluatorTag, opts ...db.Option) error { + // 验证标签数量 + assert.Equal(t, 3, len(tags)) + // 验证标签内容 + expectedTags := map[string]struct { + sourceID int64 + tagType int32 + tagKey string + tagValue string + langType string + }{ + "zh-CN:Category": {100, 1, "Category", "LLM", "zh-CN"}, + "zh-CN:BusinessScenario": {100, 1, "BusinessScenario", "安全风控", "zh-CN"}, + "en-US:Category": {100, 1, "Category", "LLM", "en-US"}, + } + for _, tag := range tags { + key := tag.LangType + ":" + tag.TagKey + expected, ok := expectedTags[key] + assert.True(t, ok, "unexpected tag: %s", key) + assert.Equal(t, expected.sourceID, tag.SourceID) + assert.Equal(t, expected.tagType, tag.TagType) + assert.Equal(t, expected.tagKey, tag.TagKey) + assert.Equal(t, expected.tagValue, tag.TagValue) + assert.Equal(t, expected.langType, tag.LangType) + assert.Equal(t, "", tag.CreatedBy) // session.UserIDInCtxOrEmpty 返回空字符串 + assert.Equal(t, "", tag.UpdatedBy) + } + return nil + }) + }, + expectedError: nil, + }, + { + name: "内置评估器创建标签时ID生成失败", + evaluator: &entity.Evaluator{ + ID: 1, + Builtin: true, + EvaluatorType: entity.EvaluatorTypePrompt, + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + ID: 100, + Version: "1.0.0", + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + }, + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + }, + }, + mockSetup: func() { + // 设置数据库事务的期望 + mockDBProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + // 创建一个模拟的 gorm.DB 实例 + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + // 设置更新评估器最新版本的期望 + mockEvaluatorDAO.EXPECT(). + UpdateEvaluatorLatestVersion(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + + // 设置创建评估器版本的期望 + mockEvaluatorVersionDAO.EXPECT(). + CreateEvaluatorVersion(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + + // 设置生成标签ID失败 + mockIDGen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return(nil, assert.AnError) + }, + expectedError: assert.AnError, + }, + { + name: "内置评估器创建标签时批量创建失败", + evaluator: &entity.Evaluator{ + ID: 1, + Builtin: true, + EvaluatorType: entity.EvaluatorTypePrompt, + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ + ID: 100, + Version: "1.0.0", + BaseInfo: &entity.BaseInfo{ + UpdatedBy: &entity.UserInfo{ + UserID: gptr.Of("test_user"), + }, + }, + }, + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + }, + }, + mockSetup: func() { + // 设置数据库事务的期望 + mockDBProvider.EXPECT(). + Transaction(gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, fn func(tx *gorm.DB) error, opts ...db.Option) error { + // 创建一个模拟的 gorm.DB 实例 + mockTx := &gorm.DB{} + return fn(mockTx) + }) + + // 设置更新评估器最新版本的期望 + mockEvaluatorDAO.EXPECT(). + UpdateEvaluatorLatestVersion(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + + // 设置创建评估器版本的期望 + mockEvaluatorVersionDAO.EXPECT(). + CreateEvaluatorVersion(gomock.Any(), gomock.Any(), gomock.Any()). + Return(nil) + + // 设置生成标签ID的期望 + mockIDGen.EXPECT(). + GenMultiIDs(gomock.Any(), 1). + Return([]int64{1001}, nil) + + // 设置批量创建标签失败 + mockTagDAO.EXPECT(). + BatchCreateEvaluatorTags(gomock.Any(), gomock.Any(), gomock.Any()). + Return(assert.AnError) + }, + expectedError: assert.AnError, + }, } for _, tt := range tests { @@ -128,6 +330,7 @@ func TestEvaluatorRepoImpl_SubmitEvaluatorVersion(t *testing.T) { repo := &EvaluatorRepoImpl{ evaluatorDao: mockEvaluatorDAO, evaluatorVersionDao: mockEvaluatorVersionDAO, + tagDAO: mockTagDAO, dbProvider: mockDBProvider, idgen: mockIDGen, lwt: mockLWT, diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go index cc6d0ae41..d03dbef96 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go @@ -797,3 +797,280 @@ func TestEvaluatorTemplateRepoImpl_IncrPopularityByID(t *testing.T) { }) } } + +// TestEvaluatorTemplateRepoImpl_setTemplateTags 测试 setTemplateTags 方法 +func TestEvaluatorTemplateRepoImpl_setTemplateTags(t *testing.T) { + t.Parallel() + + tests := []struct { + name string + template *entity.EvaluatorTemplate + templateID int64 + tagsBySourceID map[int64][]*model.EvaluatorTag + expectedTags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string + description string + }{ + { + name: "成功 - tagsBySourceID中不存在该templateID", + template: &entity.EvaluatorTemplate{ + ID: 1, + Name: "Test Template", + }, + templateID: 1, + tagsBySourceID: map[int64][]*model.EvaluatorTag{}, + expectedTags: nil, + description: "当tagsBySourceID中不存在该templateID时，Tags应该保持为nil", + }, + { + name: "成功 - tagsBySourceID[templateID]存在但为空数组", + template: &entity.EvaluatorTemplate{ + ID: 1, + Name: "Test Template", + }, + templateID: 1, + tagsBySourceID: map[int64][]*model.EvaluatorTag{ + 1: {}, + }, + expectedTags: nil, + description: "当tagsBySourceID[templateID]存在但为空数组时，Tags应该保持为nil", + }, + { + name: "成功 - 单个标签，模板Tags为nil", + template: &entity.EvaluatorTemplate{ + ID: 1, + Name: "Test Template", + }, + templateID: 1, + tagsBySourceID: map[int64][]*model.EvaluatorTag{ + 1: { + { + ID: 10, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_Category), + TagValue: "LLM", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + }, + }, + expectedTags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + }, + description: "当有单个标签且模板Tags为nil时，应该初始化Tags并设置标签", + }, + { + name: "成功 - 多个标签不同TagKey，模板Tags为nil", + template: &entity.EvaluatorTemplate{ + ID: 1, + Name: "Test Template", + }, + templateID: 1, + tagsBySourceID: map[int64][]*model.EvaluatorTag{ + 1: { + { + ID: 10, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_Category), + TagValue: "LLM", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + { + ID: 11, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_BusinessScenario), + TagValue: "安全风控", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + }, + }, + expectedTags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"LLM"}, + entity.EvaluatorTagKey_BusinessScenario: {"安全风控"}, + }, + }, + description: "当有多个不同TagKey的标签且模板Tags为nil时，应该按TagKey分组设置", + }, + { + name: "成功 - 多个标签相同TagKey，模板Tags为nil", + template: &entity.EvaluatorTemplate{ + ID: 1, + Name: "Test Template", + }, + templateID: 1, + tagsBySourceID: map[int64][]*model.EvaluatorTag{ + 1: { + { + ID: 10, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_Category), + TagValue: "LLM", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + { + ID: 11, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_Category), + TagValue: "NLP", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + }, + }, + expectedTags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"LLM", "NLP"}, + }, + }, + description: "当有多个相同TagKey的标签时，应该合并到同一个slice中", + }, + { + name: "成功 - 标签设置覆盖模板已有的Tags", + template: &entity.EvaluatorTemplate{ + ID: 1, + Name: "Test Template", + Tags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"OldCategory"}, + }, + }, + }, + templateID: 1, + tagsBySourceID: map[int64][]*model.EvaluatorTag{ + 1: { + { + ID: 10, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_Category), + TagValue: "LLM", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + }, + }, + expectedTags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_En: { + entity.EvaluatorTagKey_Category: {"OldCategory"}, + }, + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + }, + description: "当模板已有Tags时，新标签应该添加到对应语言下，不会覆盖其他语言", + }, + { + name: "成功 - 混合场景：多个标签不同TagKey，部分相同TagKey", + template: &entity.EvaluatorTemplate{ + ID: 1, + Name: "Test Template", + }, + templateID: 1, + tagsBySourceID: map[int64][]*model.EvaluatorTag{ + 1: { + { + ID: 10, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_Category), + TagValue: "LLM", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + { + ID: 11, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_Category), + TagValue: "NLP", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + { + ID: 12, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_BusinessScenario), + TagValue: "安全风控", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + { + ID: 13, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_BusinessScenario), + TagValue: "内容审核", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + }, + }, + expectedTags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"LLM", "NLP"}, + entity.EvaluatorTagKey_BusinessScenario: {"安全风控", "内容审核"}, + }, + }, + description: "混合场景：多个不同TagKey的标签，每个TagKey有多个值，应该正确分组和合并", + }, + { + name: "成功 - 不同templateID的标签不会影响", + template: &entity.EvaluatorTemplate{ + ID: 1, + Name: "Test Template", + }, + templateID: 1, + tagsBySourceID: map[int64][]*model.EvaluatorTag{ + 1: { + { + ID: 10, + SourceID: 1, + TagKey: string(entity.EvaluatorTagKey_Category), + TagValue: "LLM", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + }, + 2: { + { + ID: 20, + SourceID: 2, + TagKey: string(entity.EvaluatorTagKey_Category), + TagValue: "OtherCategory", + LangType: string(entity.EvaluatorTagLangType_Zh), + }, + }, + }, + expectedTags: map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string{ + entity.EvaluatorTagLangType_Zh: { + entity.EvaluatorTagKey_Category: {"LLM"}, + }, + }, + description: "不同templateID的标签不应该影响当前模板", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + mockTagDAO := mysqlmocks.NewMockEvaluatorTagDAO(ctrl) + mockTemplateDAO := mysqlmocks.NewMockEvaluatorTemplateDAO(ctrl) + mockIDGen := idgenmocks.NewMockIIDGenerator(ctrl) + + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, mockIDGen).(*EvaluatorTemplateRepoImpl) + + // 调用 setTemplateTags 方法 + repo.setTemplateTags(tt.template, tt.templateID, tt.tagsBySourceID) + + // 验证结果 + if tt.expectedTags == nil { + assert.Nil(t, tt.template.Tags, tt.description) + } else { + assert.NotNil(t, tt.template.Tags, tt.description) + assert.Equal(t, len(tt.expectedTags), len(tt.template.Tags), tt.description) + for lang, expectedTagMap := range tt.expectedTags { + actualTagMap, exists := tt.template.Tags[lang] + assert.True(t, exists, tt.description+" - 语言 %s 应该存在", lang) + assert.Equal(t, len(expectedTagMap), len(actualTagMap), tt.description+" - 语言 %s 的TagKey数量应该相等", lang) + for tagKey, expectedValues := range expectedTagMap { + actualValues, exists := actualTagMap[tagKey] + assert.True(t, exists, tt.description+" - TagKey %s 应该存在", tagKey) + assert.Equal(t, expectedValues, actualValues, tt.description+" - TagKey %s 的值应该相等", tagKey) + } + } + } + }) + } +} diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go index da5b61ea0..c5b18880f 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go @@ -351,7 +351,7 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_Equal, "LLM", ), - expectedSQL: "tag_key = ? AND tag_value = ?", + expectedSQL: "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value = ?", expectedArgs: []interface{}{"Category", "LLM"}, expectedErr: false, }, @@ -362,7 +362,7 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_NotEqual, "Code", ), - expectedSQL: "tag_key = ? AND tag_value != ?", + expectedSQL: "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value != ?", expectedArgs: []interface{}{"Category", "Code"}, expectedErr: false, }, @@ -373,7 +373,7 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_In, "Text,Image,Video", ), - expectedSQL: "tag_key = ? AND tag_value IN (?,?,?)", + expectedSQL: "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value IN (?,?,?)", expectedArgs: []interface{}{"TargetType", "Text", "Image", "Video"}, expectedErr: false, }, @@ -384,7 +384,7 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_Like, "Quality", ), - expectedSQL: "tag_key = ? AND tag_value LIKE ?", + expectedSQL: "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value LIKE ?", expectedArgs: []interface{}{"Name", "%Quality%"}, expectedErr: false, }, @@ -395,7 +395,7 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_IsNull, "", ), - expectedSQL: "tag_key = ? AND tag_value IS NULL", + expectedSQL: "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value IS NULL", expectedArgs: []interface{}{"Objective"}, expectedErr: false, }, @@ -406,7 +406,7 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_IsNotNull, "", ), - expectedSQL: "tag_key = ? AND tag_value IS NOT NULL", + expectedSQL: "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value IS NOT NULL", expectedArgs: []interface{}{"Objective"}, expectedErr: false, }, @@ -417,7 +417,7 @@ func TestBuildSingleCondition(t *testing.T) { entity.EvaluatorFilterOperatorType_In, "", ), - expectedSQL: "tag_key = ? AND tag_value IN (?)", + expectedSQL: "evaluator_tag.tag_key = ? AND evaluator_tag.tag_value IN (?)", expectedArgs: []interface{}{"TargetType", ""}, expectedErr: false, }, @@ -474,3 +474,63 @@ func TestConvertToInterfaceSlice(t *testing.T) { }) } } + +func TestGetSourceIDsByFilterConditions_SelfJoinAndLike(t *testing.T) { + t.Parallel() + + ctrl := gomock.NewController(t) + defer ctrl.Finish() + + // sqlmock + sqlDB, mock, err := sqlmock.New() + if err != nil { + t.Fatalf("failed to create sqlmock: %v", err) + } + defer sqlDB.Close() + + gormDB, err := gorm.Open(mysql.New(mysql.Config{ + Conn: sqlDB, + SkipInitializeWithVersion: true, + }), &gorm.Config{}) + if err != nil { + t.Fatalf("failed to open gorm db: %v", err) + } + + mockProvider := dbmock.NewMockProvider(ctrl) + mockProvider.EXPECT().NewSession(gomock.Any(), gomock.Any()).Return(gormDB).Times(1) + + // 构造筛选：AND(Category=LLM, BusinessScenario=安全风控) + SearchKeyword("AI") + filters := entity.NewEvaluatorFilters(). + WithLogicOp(entity.FilterLogicOp_And). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_Category, + entity.EvaluatorFilterOperatorType_In, + "LLM", + )). + AddCondition(entity.NewEvaluatorFilterCondition( + entity.EvaluatorTagKey_BusinessScenario, + entity.EvaluatorFilterOperatorType_In, + "安全风控", + )) + option := entity.NewEvaluatorFilterOption().WithSearchKeyword("AI").WithFilters(filters) + + // 断言 COUNT：包含 LEFT JOIN t_name、JOIN t_1 / t_2，且基表为 evaluator_tag + countRows := sqlmock.NewRows([]string{"count"}).AddRow(0) + mock.ExpectQuery( + "SELECT COUNT\\(DISTINCT\\(.*source_id.*\\)\\) FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*JOIN evaluator_tag AS t_1.*JOIN evaluator_tag AS t_2.*", + ).WillReturnRows(countRows) + + // 断言 SELECT：包含 DISTINCT、LEFT JOIN t_name、JOIN t_1 / t_2、LIKE 与 非 Category 限定 + selectRows := sqlmock.NewRows([]string{"source_id"}) + mock.ExpectQuery( + "SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*JOIN evaluator_tag AS t_1.*JOIN evaluator_tag AS t_2.*WHERE .*evaluator_tag.tag_key <> .* AND evaluator_tag.tag_value LIKE .*", + ).WillReturnRows(selectRows) + + dao := &EvaluatorTagDAOImpl{provider: mockProvider} + _, _, err = dao.GetSourceIDsByFilterConditions(context.Background(), 1, option, 12, 1, "zh-CN") + assert.NoError(t, err) + + if err := mock.ExpectationsWereMet(); err != nil { + t.Errorf("there were unfulfilled expectations: %s", err) + } +} From b5693d568b37dd7894c6a89696cc581030a693ac Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 12:50:40 +0800 Subject: [PATCH 23/42] fix update evaluator --- .../coze.loop.evaluation.evaluator.go | 155 ++++-------------- ...oze.loop.evaluation.evaluator_validator.go | 5 + .../k-coze.loop.evaluation.evaluator.go | 97 +++-------- .../evaluation/application/evaluator_app.go | 12 +- .../evaluation/domain/entity/evaluator.go | 3 +- .../infra/repo/evaluator/evaluator_impl.go | 13 +- .../repo/evaluator/evaluator_impl_test.go | 16 +- .../coze.loop.evaluation.evaluator.thrift | 7 +- 8 files changed, 86 insertions(+), 222 deletions(-) diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go index a3d207a4b..fceabc98f 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go @@ -3953,10 +3953,9 @@ type UpdateEvaluatorRequest struct { Description *string `thrift:"description,5,optional" frugal:"5,optional,string" json:"description" form:"description" ` // 是否预置评估器 Builtin *bool `thrift:"builtin,11,optional" frugal:"11,optional,bool" json:"builtin" form:"builtin" ` - Benchmark *string `thrift:"benchmark,12,optional" frugal:"12,optional,string" json:"benchmark" form:"benchmark" ` - Vendor *string `thrift:"vendor,13,optional" frugal:"13,optional,string" json:"vendor" form:"vendor" ` - BuiltinVisibleVersion *string `thrift:"builtin_visible_version,14,optional" frugal:"14,optional,string" json:"builtin_visible_version" form:"builtin_visible_version" ` - BoxType *evaluator.EvaluatorBoxType `thrift:"box_type,15,optional" frugal:"15,optional,string" json:"box_type" form:"box_type" ` + EvaluatorInfo *evaluator.EvaluatorInfo `thrift:"evaluator_info,12,optional" frugal:"12,optional,evaluator.EvaluatorInfo" json:"evaluator_info" form:"evaluator_info" ` + BuiltinVisibleVersion *string `thrift:"builtin_visible_version,13,optional" frugal:"13,optional,string" json:"builtin_visible_version" form:"builtin_visible_version" ` + BoxType *evaluator.EvaluatorBoxType `thrift:"box_type,14,optional" frugal:"14,optional,string" json:"box_type" form:"box_type" ` Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } @@ -4024,28 +4023,16 @@ func (p *UpdateEvaluatorRequest) GetBuiltin() (v bool) { return *p.Builtin } -var UpdateEvaluatorRequest_Benchmark_DEFAULT string +var UpdateEvaluatorRequest_EvaluatorInfo_DEFAULT *evaluator.EvaluatorInfo -func (p *UpdateEvaluatorRequest) GetBenchmark() (v string) { +func (p *UpdateEvaluatorRequest) GetEvaluatorInfo() (v *evaluator.EvaluatorInfo) { if p == nil { return } - if !p.IsSetBenchmark() { - return UpdateEvaluatorRequest_Benchmark_DEFAULT + if !p.IsSetEvaluatorInfo() { + return UpdateEvaluatorRequest_EvaluatorInfo_DEFAULT } - return *p.Benchmark -} - -var UpdateEvaluatorRequest_Vendor_DEFAULT string - -func (p *UpdateEvaluatorRequest) GetVendor() (v string) { - if p == nil { - return - } - if !p.IsSetVendor() { - return UpdateEvaluatorRequest_Vendor_DEFAULT - } - return *p.Vendor + return p.EvaluatorInfo } var UpdateEvaluatorRequest_BuiltinVisibleVersion_DEFAULT string @@ -4101,11 +4088,8 @@ func (p *UpdateEvaluatorRequest) SetDescription(val *string) { func (p *UpdateEvaluatorRequest) SetBuiltin(val *bool) { p.Builtin = val } -func (p *UpdateEvaluatorRequest) SetBenchmark(val *string) { - p.Benchmark = val -} -func (p *UpdateEvaluatorRequest) SetVendor(val *string) { - p.Vendor = val +func (p *UpdateEvaluatorRequest) SetEvaluatorInfo(val *evaluator.EvaluatorInfo) { + p.EvaluatorInfo = val } func (p *UpdateEvaluatorRequest) SetBuiltinVisibleVersion(val *string) { p.BuiltinVisibleVersion = val @@ -4124,10 +4108,9 @@ var fieldIDToName_UpdateEvaluatorRequest = map[int16]string{ 4: "name", 5: "description", 11: "builtin", - 12: "benchmark", - 13: "vendor", - 14: "builtin_visible_version", - 15: "box_type", + 12: "evaluator_info", + 13: "builtin_visible_version", + 14: "box_type", 255: "Base", } @@ -4143,12 +4126,8 @@ func (p *UpdateEvaluatorRequest) IsSetBuiltin() bool { return p.Builtin != nil } -func (p *UpdateEvaluatorRequest) IsSetBenchmark() bool { - return p.Benchmark != nil -} - -func (p *UpdateEvaluatorRequest) IsSetVendor() bool { - return p.Vendor != nil +func (p *UpdateEvaluatorRequest) IsSetEvaluatorInfo() bool { + return p.EvaluatorInfo != nil } func (p *UpdateEvaluatorRequest) IsSetBuiltinVisibleVersion() bool { @@ -4236,7 +4215,7 @@ func (p *UpdateEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { goto SkipFieldError } case 12: - if fieldTypeId == thrift.STRING { + if fieldTypeId == thrift.STRUCT { if err = p.ReadField12(iprot); err != nil { goto ReadFieldError } @@ -4259,14 +4238,6 @@ func (p *UpdateEvaluatorRequest) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } - case 15: - if fieldTypeId == thrift.STRING { - if err = p.ReadField15(iprot); err != nil { - goto ReadFieldError - } - } else if err = iprot.Skip(fieldTypeId); err != nil { - goto SkipFieldError - } case 255: if fieldTypeId == thrift.STRUCT { if err = p.ReadField255(iprot); err != nil { @@ -4387,29 +4358,15 @@ func (p *UpdateEvaluatorRequest) ReadField11(iprot thrift.TProtocol) error { return nil } func (p *UpdateEvaluatorRequest) ReadField12(iprot thrift.TProtocol) error { - - var _field *string - if v, err := iprot.ReadString(); err != nil { + _field := evaluator.NewEvaluatorInfo() + if err := _field.Read(iprot); err != nil { return err - } else { - _field = &v } - p.Benchmark = _field + p.EvaluatorInfo = _field return nil } func (p *UpdateEvaluatorRequest) ReadField13(iprot thrift.TProtocol) error { - var _field *string - if v, err := iprot.ReadString(); err != nil { - return err - } else { - _field = &v - } - p.Vendor = _field - return nil -} -func (p *UpdateEvaluatorRequest) ReadField14(iprot thrift.TProtocol) error { - var _field *string if v, err := iprot.ReadString(); err != nil { return err @@ -4419,7 +4376,7 @@ func (p *UpdateEvaluatorRequest) ReadField14(iprot thrift.TProtocol) error { p.BuiltinVisibleVersion = _field return nil } -func (p *UpdateEvaluatorRequest) ReadField15(iprot thrift.TProtocol) error { +func (p *UpdateEvaluatorRequest) ReadField14(iprot thrift.TProtocol) error { var _field *evaluator.EvaluatorBoxType if v, err := iprot.ReadString(); err != nil { @@ -4481,10 +4438,6 @@ func (p *UpdateEvaluatorRequest) Write(oprot thrift.TProtocol) (err error) { fieldId = 14 goto WriteFieldError } - if err = p.writeField15(oprot); err != nil { - fieldId = 15 - goto WriteFieldError - } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -4610,11 +4563,11 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 11 end error: ", p), err) } func (p *UpdateEvaluatorRequest) writeField12(oprot thrift.TProtocol) (err error) { - if p.IsSetBenchmark() { - if err = oprot.WriteFieldBegin("benchmark", thrift.STRING, 12); err != nil { + if p.IsSetEvaluatorInfo() { + if err = oprot.WriteFieldBegin("evaluator_info", thrift.STRUCT, 12); err != nil { goto WriteFieldBeginError } - if err := oprot.WriteString(*p.Benchmark); err != nil { + if err := p.EvaluatorInfo.Write(oprot); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -4628,11 +4581,11 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 12 end error: ", p), err) } func (p *UpdateEvaluatorRequest) writeField13(oprot thrift.TProtocol) (err error) { - if p.IsSetVendor() { - if err = oprot.WriteFieldBegin("vendor", thrift.STRING, 13); err != nil { + if p.IsSetBuiltinVisibleVersion() { + if err = oprot.WriteFieldBegin("builtin_visible_version", thrift.STRING, 13); err != nil { goto WriteFieldBeginError } - if err := oprot.WriteString(*p.Vendor); err != nil { + if err := oprot.WriteString(*p.BuiltinVisibleVersion); err != nil { return err } if err = oprot.WriteFieldEnd(); err != nil { @@ -4646,26 +4599,8 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 13 end error: ", p), err) } func (p *UpdateEvaluatorRequest) writeField14(oprot thrift.TProtocol) (err error) { - if p.IsSetBuiltinVisibleVersion() { - if err = oprot.WriteFieldBegin("builtin_visible_version", thrift.STRING, 14); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteString(*p.BuiltinVisibleVersion); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError - } - } - return nil -WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 14 begin error: ", p), err) -WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 14 end error: ", p), err) -} -func (p *UpdateEvaluatorRequest) writeField15(oprot thrift.TProtocol) (err error) { if p.IsSetBoxType() { - if err = oprot.WriteFieldBegin("box_type", thrift.STRING, 15); err != nil { + if err = oprot.WriteFieldBegin("box_type", thrift.STRING, 14); err != nil { goto WriteFieldBeginError } if err := oprot.WriteString(*p.BoxType); err != nil { @@ -4677,9 +4612,9 @@ func (p *UpdateEvaluatorRequest) writeField15(oprot thrift.TProtocol) (err error } return nil WriteFieldBeginError: - return thrift.PrependError(fmt.Sprintf("%T write field 15 begin error: ", p), err) + return thrift.PrependError(fmt.Sprintf("%T write field 14 begin error: ", p), err) WriteFieldEndError: - return thrift.PrependError(fmt.Sprintf("%T write field 15 end error: ", p), err) + return thrift.PrependError(fmt.Sprintf("%T write field 14 end error: ", p), err) } func (p *UpdateEvaluatorRequest) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { @@ -4732,16 +4667,13 @@ func (p *UpdateEvaluatorRequest) DeepEqual(ano *UpdateEvaluatorRequest) bool { if !p.Field11DeepEqual(ano.Builtin) { return false } - if !p.Field12DeepEqual(ano.Benchmark) { + if !p.Field12DeepEqual(ano.EvaluatorInfo) { return false } - if !p.Field13DeepEqual(ano.Vendor) { + if !p.Field13DeepEqual(ano.BuiltinVisibleVersion) { return false } - if !p.Field14DeepEqual(ano.BuiltinVisibleVersion) { - return false - } - if !p.Field15DeepEqual(ano.BoxType) { + if !p.Field14DeepEqual(ano.BoxType) { return false } if !p.Field255DeepEqual(ano.Base) { @@ -4807,32 +4739,15 @@ func (p *UpdateEvaluatorRequest) Field11DeepEqual(src *bool) bool { } return true } -func (p *UpdateEvaluatorRequest) Field12DeepEqual(src *string) bool { +func (p *UpdateEvaluatorRequest) Field12DeepEqual(src *evaluator.EvaluatorInfo) bool { - if p.Benchmark == src { - return true - } else if p.Benchmark == nil || src == nil { - return false - } - if strings.Compare(*p.Benchmark, *src) != 0 { + if !p.EvaluatorInfo.DeepEqual(src) { return false } return true } func (p *UpdateEvaluatorRequest) Field13DeepEqual(src *string) bool { - if p.Vendor == src { - return true - } else if p.Vendor == nil || src == nil { - return false - } - if strings.Compare(*p.Vendor, *src) != 0 { - return false - } - return true -} -func (p *UpdateEvaluatorRequest) Field14DeepEqual(src *string) bool { - if p.BuiltinVisibleVersion == src { return true } else if p.BuiltinVisibleVersion == nil || src == nil { @@ -4843,7 +4758,7 @@ func (p *UpdateEvaluatorRequest) Field14DeepEqual(src *string) bool { } return true } -func (p *UpdateEvaluatorRequest) Field15DeepEqual(src *evaluator.EvaluatorBoxType) bool { +func (p *UpdateEvaluatorRequest) Field14DeepEqual(src *evaluator.EvaluatorBoxType) bool { if p.BoxType == src { return true diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go index 09a748729..dcef7dfa3 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go @@ -137,6 +137,11 @@ func (p *UpdateEvaluatorDraftResponse) IsValid() error { return nil } func (p *UpdateEvaluatorRequest) IsValid() error { + if p.EvaluatorInfo != nil { + if err := p.EvaluatorInfo.IsValid(); err != nil { + return fmt.Errorf("field EvaluatorInfo not valid, %w", err) + } + } if p.Base != nil { if err := p.Base.IsValid(); err != nil { return fmt.Errorf("field Base not valid, %w", err) diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go index 39b8e6656..733ee577f 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go @@ -2989,7 +2989,7 @@ func (p *UpdateEvaluatorRequest) FastRead(buf []byte) (int, error) { } } case 12: - if fieldTypeId == thrift.STRING { + if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField12(buf[offset:]) offset += l if err != nil { @@ -3030,20 +3030,6 @@ func (p *UpdateEvaluatorRequest) FastRead(buf []byte) (int, error) { goto SkipFieldError } } - case 15: - if fieldTypeId == thrift.STRING { - l, err = p.FastReadField15(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 255: if fieldTypeId == thrift.STRUCT { l, err = p.FastReadField255(buf[offset:]) @@ -3179,35 +3165,19 @@ func (p *UpdateEvaluatorRequest) FastReadField11(buf []byte) (int, error) { func (p *UpdateEvaluatorRequest) FastReadField12(buf []byte) (int, error) { offset := 0 - - var _field *string - if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + _field := evaluator.NewEvaluatorInfo() + if l, err := _field.FastRead(buf[offset:]); err != nil { return offset, err } else { offset += l - _field = &v } - p.Benchmark = _field + p.EvaluatorInfo = _field return offset, nil } func (p *UpdateEvaluatorRequest) FastReadField13(buf []byte) (int, error) { offset := 0 - var _field *string - if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { - return offset, err - } else { - offset += l - _field = &v - } - p.Vendor = _field - return offset, nil -} - -func (p *UpdateEvaluatorRequest) FastReadField14(buf []byte) (int, error) { - offset := 0 - var _field *string if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { return offset, err @@ -3219,7 +3189,7 @@ func (p *UpdateEvaluatorRequest) FastReadField14(buf []byte) (int, error) { return offset, nil } -func (p *UpdateEvaluatorRequest) FastReadField15(buf []byte) (int, error) { +func (p *UpdateEvaluatorRequest) FastReadField14(buf []byte) (int, error) { offset := 0 var _field *evaluator.EvaluatorBoxType @@ -3261,7 +3231,6 @@ func (p *UpdateEvaluatorRequest) FastWriteNocopy(buf []byte, w thrift.NocopyWrit offset += p.fastWriteField12(buf[offset:], w) offset += p.fastWriteField13(buf[offset:], w) offset += p.fastWriteField14(buf[offset:], w) - offset += p.fastWriteField15(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -3280,7 +3249,6 @@ func (p *UpdateEvaluatorRequest) BLength() int { l += p.field12Length() l += p.field13Length() l += p.field14Length() - l += p.field15Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -3337,35 +3305,26 @@ func (p *UpdateEvaluatorRequest) fastWriteField11(buf []byte, w thrift.NocopyWri func (p *UpdateEvaluatorRequest) fastWriteField12(buf []byte, w thrift.NocopyWriter) int { offset := 0 - if p.IsSetBenchmark() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 12) - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Benchmark) + if p.IsSetEvaluatorInfo() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 12) + offset += p.EvaluatorInfo.FastWriteNocopy(buf[offset:], w) } return offset } func (p *UpdateEvaluatorRequest) fastWriteField13(buf []byte, w thrift.NocopyWriter) int { - offset := 0 - if p.IsSetVendor() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 13) - offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Vendor) - } - return offset -} - -func (p *UpdateEvaluatorRequest) fastWriteField14(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBuiltinVisibleVersion() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 14) + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 13) offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.BuiltinVisibleVersion) } return offset } -func (p *UpdateEvaluatorRequest) fastWriteField15(buf []byte, w thrift.NocopyWriter) int { +func (p *UpdateEvaluatorRequest) fastWriteField14(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBoxType() { - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 15) + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 14) offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.BoxType) } return offset @@ -3430,23 +3389,14 @@ func (p *UpdateEvaluatorRequest) field11Length() int { func (p *UpdateEvaluatorRequest) field12Length() int { l := 0 - if p.IsSetBenchmark() { + if p.IsSetEvaluatorInfo() { l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.StringLengthNocopy(*p.Benchmark) + l += p.EvaluatorInfo.BLength() } return l } func (p *UpdateEvaluatorRequest) field13Length() int { - l := 0 - if p.IsSetVendor() { - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.StringLengthNocopy(*p.Vendor) - } - return l -} - -func (p *UpdateEvaluatorRequest) field14Length() int { l := 0 if p.IsSetBuiltinVisibleVersion() { l += thrift.Binary.FieldBeginLength() @@ -3455,7 +3405,7 @@ func (p *UpdateEvaluatorRequest) field14Length() int { return l } -func (p *UpdateEvaluatorRequest) field15Length() int { +func (p *UpdateEvaluatorRequest) field14Length() int { l := 0 if p.IsSetBoxType() { l += thrift.Binary.FieldBeginLength() @@ -3506,21 +3456,14 @@ func (p *UpdateEvaluatorRequest) DeepCopy(s interface{}) error { p.Builtin = &tmp } - if src.Benchmark != nil { - var tmp string - if *src.Benchmark != "" { - tmp = kutils.StringDeepCopy(*src.Benchmark) - } - p.Benchmark = &tmp - } - - if src.Vendor != nil { - var tmp string - if *src.Vendor != "" { - tmp = kutils.StringDeepCopy(*src.Vendor) + var _evaluatorInfo *evaluator.EvaluatorInfo + if src.EvaluatorInfo != nil { + _evaluatorInfo = &evaluator.EvaluatorInfo{} + if err := _evaluatorInfo.DeepCopy(src.EvaluatorInfo); err != nil { + return err } - p.Vendor = &tmp } + p.EvaluatorInfo = _evaluatorInfo if src.BuiltinVisibleVersion != nil { var tmp string diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index aa0382036..d1156f4fb 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -358,11 +358,19 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluator(ctx context.Context, request *eva Name: request.Name, Description: request.Description, Builtin: request.Builtin, - Benchmark: request.Benchmark, - Vendor: request.Vendor, + EvaluatorInfo: nil, BuiltinVisibleVersion: request.BuiltinVisibleVersion, UpdatedBy: userIDInContext, } + // 转换 EvaluatorInfo + if request.IsSetEvaluatorInfo() && request.GetEvaluatorInfo() != nil { + req.EvaluatorInfo = &entity.EvaluatorInfo{ + Benchmark: request.GetEvaluatorInfo().GetBenchmark(), + Vendor: request.GetEvaluatorInfo().GetVendor(), + VendorURL: request.GetEvaluatorInfo().GetVendorURL(), + UserManualURL: request.GetEvaluatorInfo().GetUserManualURL(), + } + } // box_type 映射（White/Black -> 1/2） if request.IsSetBoxType() { bt := entity.EvaluatorBoxTypeWhite diff --git a/backend/modules/evaluation/domain/entity/evaluator.go b/backend/modules/evaluation/domain/entity/evaluator.go index f7a0185b5..55f33c916 100644 --- a/backend/modules/evaluation/domain/entity/evaluator.go +++ b/backend/modules/evaluation/domain/entity/evaluator.go @@ -59,8 +59,7 @@ type UpdateEvaluatorMetaRequest struct { Name *string Description *string Builtin *bool - Benchmark *string - Vendor *string + EvaluatorInfo *EvaluatorInfo BuiltinVisibleVersion *string BoxType *EvaluatorBoxType UpdatedBy string diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 342fa927d..c3b41c919 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -510,16 +510,9 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorMeta(ctx context.Context, req *entity if req.BoxType != nil { po.BoxType = int32(*req.BoxType) } - // 写入 EvaluatorInfo JSON（由旧字段组装） - if req.Benchmark != nil || req.Vendor != nil { - info := &entity.EvaluatorInfo{} - if req.Benchmark != nil { - info.Benchmark = *req.Benchmark - } - if req.Vendor != nil { - info.Vendor = *req.Vendor - } - if b, err := json.Marshal(info); err == nil { + // 写入 EvaluatorInfo JSON + if req.EvaluatorInfo != nil { + if b, err := json.Marshal(req.EvaluatorInfo); err == nil { po.EvaluatorInfo = &b } } diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index c2c3a038b..d1e966b9c 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -2142,13 +2142,15 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorMeta(t *testing.T) { } err := repo.UpdateEvaluatorMeta(context.Background(), &entity.UpdateEvaluatorMetaRequest{ - ID: tt.id, - SpaceID: 100, // 使用测试用的spaceID - Name: gptr.Of(""), - Description: gptr.Of(""), - Benchmark: &tt.benchmark, - Vendor: &tt.vendor, - UpdatedBy: tt.userID, + ID: tt.id, + SpaceID: 100, // 使用测试用的spaceID + Name: gptr.Of(""), + Description: gptr.Of(""), + EvaluatorInfo: &entity.EvaluatorInfo{ + Benchmark: tt.benchmark, + Vendor: tt.vendor, + }, + UpdatedBy: tt.userID, }) if tt.expectedError != nil { assert.Error(t, err) diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift index 0b3bc0ba8..267d06384 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift @@ -91,10 +91,9 @@ struct UpdateEvaluatorRequest { 5: optional string description (api.body='description', go.tag='json:"description"') // 描述 11: optional bool builtin (api.body='builtin', go.tag = 'json:"builtin"') // 是否预置评估器 - 12: optional string benchmark (api.body='benchmark', go.tag = 'json:"benchmark"') - 13: optional string vendor (api.body='vendor', go.tag = 'json:"vendor"') - 14: optional string builtin_visible_version (api.body='builtin_visible_version', go.tag = 'json:"builtin_visible_version"') - 15: optional evaluator.EvaluatorBoxType box_type (api.body='box_type', go.tag = 'json:"box_type"') + 12: optional evaluator.EvaluatorInfo evaluator_info (api.body='evaluator_info', go.tag = 'json:"evaluator_info"') + 13: optional string builtin_visible_version (api.body='builtin_visible_version', go.tag = 'json:"builtin_visible_version"') + 14: optional evaluator.EvaluatorBoxType box_type (api.body='box_type', go.tag = 'json:"box_type"') 255: optional base.Base Base } From e707cf8e9a37c1a54ec6d583bd55f29359361c25 Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 15:12:50 +0800 Subject: [PATCH 24/42] =?UTF-8?q?list=20tags=E5=88=A0=E9=99=A4=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluation/application/evaluator_app.go | 17 ++++------------- .../application/evaluator_app_test.go | 10 +++++----- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index d1156f4fb..0ce9ae09c 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -1446,12 +1446,12 @@ func (e *EvaluatorHandlerImpl) CreateEvaluatorTemplate(ctx context.Context, requ templateDO := evaluatorconvertor.ConvertEvaluatorTemplateDTO2DO(request.GetEvaluatorTemplate()) // 构建service层请求 - serviceReq := &entity.CreateEvaluatorTemplateRequest{ + serviceReq := &entity.CreateEvaluatorTemplateRequest{ SpaceID: templateDO.SpaceID, Name: templateDO.Name, Description: templateDO.Description, EvaluatorType: templateDO.EvaluatorType, - EvaluatorInfo: templateDO.EvaluatorInfo, + EvaluatorInfo: templateDO.EvaluatorInfo, InputSchemas: templateDO.InputSchemas, OutputSchemas: templateDO.OutputSchemas, ReceiveChatHistory: templateDO.ReceiveChatHistory, @@ -1491,11 +1491,11 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluatorTemplate(ctx context.Context, requ templateDO := evaluatorconvertor.ConvertEvaluatorTemplateDTO2DO(request.GetEvaluatorTemplate()) // 构建service层请求 - serviceReq := &entity.UpdateEvaluatorTemplateRequest{ + serviceReq := &entity.UpdateEvaluatorTemplateRequest{ ID: request.EvaluatorTemplateID, Name: gptr.Of(templateDO.Name), Description: gptr.Of(templateDO.Description), - EvaluatorInfo: templateDO.EvaluatorInfo, + EvaluatorInfo: templateDO.EvaluatorInfo, InputSchemas: templateDO.InputSchemas, OutputSchemas: templateDO.OutputSchemas, ReceiveChatHistory: templateDO.ReceiveChatHistory, @@ -1621,15 +1621,6 @@ func (e *EvaluatorHandlerImpl) UpdateBuiltinEvaluatorTags(ctx context.Context, r func (e *EvaluatorHandlerImpl) ListEvaluatorTags(ctx context.Context, request *evaluatorservice.ListEvaluatorTagsRequest) (resp *evaluatorservice.ListEvaluatorTagsResponse, err error) { // 直接从配置获取可用的标签配置 tags := e.configer.GetEvaluatorTagConf(ctx) - // 对每个 tagKey 下的列表按字母顺序排序 - if len(tags) > 0 { - for k, vs := range tags { - if len(vs) > 1 { - sort.Strings(vs) - tags[k] = vs - } - } - } return &evaluatorservice.ListEvaluatorTagsResponse{ Tags: tags, }, nil diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index 0d4a082dd..04788ed13 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -3640,7 +3640,7 @@ func TestEvaluatorHandlerImpl_ListEvaluatorTags(t *testing.T) { wantErr: false, }, { - name: "success - tags sorted", + name: "success - tags kept order from config", req: &evaluatorservice.ListEvaluatorTagsRequest{}, mockSetup: func() { mockConfiger.EXPECT(). @@ -3652,8 +3652,8 @@ func TestEvaluatorHandlerImpl_ListEvaluatorTags(t *testing.T) { }, wantResp: &evaluatorservice.ListEvaluatorTagsResponse{ Tags: map[string][]string{ - evaluatordto.EvaluatorTagKeyCategory: {"a", "m", "z"}, - evaluatordto.EvaluatorTagKeyTargetType: {"b", "x"}, + evaluatordto.EvaluatorTagKeyCategory: {"z", "a", "m"}, + evaluatordto.EvaluatorTagKeyTargetType: {"x", "b"}, }, }, wantErr: false, @@ -3677,10 +3677,10 @@ func TestEvaluatorHandlerImpl_ListEvaluatorTags(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, resp) if tt.wantResp.Tags != nil { - // 验证标签是否已排序 + // 验证标签与配置一致（不再强制排序） for key, expectedValues := range tt.wantResp.Tags { actualValues := resp.Tags[key] - assert.Equal(t, expectedValues, actualValues, "Tags for key %v should be sorted", key) + assert.Equal(t, expectedValues, actualValues, "Tags for key %v should match config order", key) } } } From 897d7fb76f12062a02ccacb7b5824c38e7b64966 Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 15:34:07 +0800 Subject: [PATCH 25/42] fix lint --- .../application/convertor/common/common.go | 24 ++++---- .../convertor/evaluator/evaluator_test.go | 4 +- .../evaluation/application/evaluator_app.go | 17 +++--- .../application/evaluator_app_test.go | 59 +++++++++---------- .../evaluation/application/experiment_app.go | 3 - .../application/experiment_app_test.go | 4 +- .../domain/service/evaluator_impl.go | 1 + .../repo/evaluator/evaluator_template_impl.go | 13 ++-- .../repo/evaluator/mysql/evaluator_tag.go | 1 + .../mysql/evaluator_tag_filter_test.go | 4 +- .../task/service/taskexe/tracehub/utils.go | 2 +- .../infra/repo/redis/convert/task_run.go | 2 +- backend/script/gorm_gen/generate.go | 12 ++-- 13 files changed, 71 insertions(+), 75 deletions(-) diff --git a/backend/modules/evaluation/application/convertor/common/common.go b/backend/modules/evaluation/application/convertor/common/common.go index e0bf5f55d..3b4f2c305 100644 --- a/backend/modules/evaluation/application/convertor/common/common.go +++ b/backend/modules/evaluation/application/convertor/common/common.go @@ -221,12 +221,12 @@ func ConvertArgsSchemaDTO2DO(schema *commondto.ArgsSchema) *commonentity.ArgsSch for _, ct := range schema.SupportContentTypes { contentTypes = append(contentTypes, commonentity.ContentType(ct)) } - return &commonentity.ArgsSchema{ - Key: schema.Key, - SupportContentTypes: contentTypes, - JsonSchema: schema.JSONSchema, - DefaultValue: ConvertContentDTO2DO(schema.DefaultValue), - } + return &commonentity.ArgsSchema{ + Key: schema.Key, + SupportContentTypes: contentTypes, + JsonSchema: schema.JSONSchema, + DefaultValue: ConvertContentDTO2DO(schema.DefaultValue), + } } func ConvertArgsSchemaListDTO2DO(schemas []*commondto.ArgsSchema) []*commonentity.ArgsSchema { @@ -249,12 +249,12 @@ func ConvertArgsSchemaDO2DTO(schema *commonentity.ArgsSchema) *commondto.ArgsSch for _, ct := range schema.SupportContentTypes { contentTypes = append(contentTypes, string(ct)) } - return &commondto.ArgsSchema{ - Key: schema.Key, - SupportContentTypes: contentTypes, - JSONSchema: schema.JsonSchema, - DefaultValue: ConvertContentDO2DTO(schema.DefaultValue), - } + return &commondto.ArgsSchema{ + Key: schema.Key, + SupportContentTypes: contentTypes, + JSONSchema: schema.JsonSchema, + DefaultValue: ConvertContentDO2DTO(schema.DefaultValue), + } } func ConvertArgsSchemaListDO2DTO(schemas []*commonentity.ArgsSchema) []*commondto.ArgsSchema { diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go index 1ae249b41..c00bbab7a 100755 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go @@ -1193,7 +1193,7 @@ func TestConvertCustomRPCEvaluatorVersionDTO2DO(t *testing.T) { assert.Equal(t, evaluatordo.EvaluatorTypeCustomRPC, result.EvaluatorType) assert.NotNil(t, result.ProviderEvaluatorCode) assert.Equal(t, "PROVIDER_001", *result.ProviderEvaluatorCode) - assert.Equal(t, evaluatordo.AccessProtocol("HTTP"), evaluatordo.AccessProtocol(result.AccessProtocol)) + assert.Equal(t, evaluatordo.AccessProtocol("HTTP"), result.AccessProtocol) assert.NotNil(t, result.ServiceName) assert.Equal(t, "test_service", *result.ServiceName) assert.NotNil(t, result.Cluster) @@ -1295,7 +1295,7 @@ func TestConvertCustomRPCEvaluatorVersionDO2DTO(t *testing.T) { assert.NotNil(t, result.EvaluatorContent) assert.NotNil(t, result.EvaluatorContent.CustomRPCEvaluator) assert.Equal(t, "PROVIDER_001", *result.EvaluatorContent.CustomRPCEvaluator.ProviderEvaluatorCode) - assert.Equal(t, evaluatordto.AccessProtocol("HTTP"), evaluatordto.AccessProtocol(result.EvaluatorContent.CustomRPCEvaluator.AccessProtocol)) + assert.Equal(t, evaluatordto.AccessProtocol("HTTP"), result.EvaluatorContent.CustomRPCEvaluator.AccessProtocol) assert.Equal(t, "test_service", *result.EvaluatorContent.CustomRPCEvaluator.ServiceName) assert.Equal(t, "test_cluster", *result.EvaluatorContent.CustomRPCEvaluator.Cluster) assert.Equal(t, int64(5000), *result.EvaluatorContent.CustomRPCEvaluator.Timeout) diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index 0ce9ae09c..13b457b8c 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -23,7 +23,6 @@ import ( "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation" evaluatorcommon "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" - "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" evaluatorservice "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" evaluatorconvertor "github.com/coze-dev/coze-loop/backend/modules/evaluation/application/convertor/evaluator" "github.com/coze-dev/coze-loop/backend/modules/evaluation/consts" @@ -1430,7 +1429,7 @@ func (e *EvaluatorHandlerImpl) GetTemplateInfoV2(ctx context.Context, request *e } // CreateEvaluatorTemplate 创建评估器模板 -func (e *EvaluatorHandlerImpl) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest) (resp *evaluator.CreateEvaluatorTemplateResponse, err error) { +func (e *EvaluatorHandlerImpl) CreateEvaluatorTemplate(ctx context.Context, request *evaluatorservice.CreateEvaluatorTemplateRequest) (resp *evaluatorservice.CreateEvaluatorTemplateResponse, err error) { // 参数验证 if request.GetEvaluatorTemplate() == nil { return nil, errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("evaluator_template is nil")) @@ -1469,13 +1468,13 @@ func (e *EvaluatorHandlerImpl) CreateEvaluatorTemplate(ctx context.Context, requ // 转换结果 template := evaluatorconvertor.ConvertEvaluatorTemplateDO2DTO(serviceResp.Template) - return &evaluator.CreateEvaluatorTemplateResponse{ + return &evaluatorservice.CreateEvaluatorTemplateResponse{ EvaluatorTemplate: template, }, nil } // UpdateEvaluatorTemplate 更新评估器模板 -func (e *EvaluatorHandlerImpl) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest) (resp *evaluator.UpdateEvaluatorTemplateResponse, err error) { +func (e *EvaluatorHandlerImpl) UpdateEvaluatorTemplate(ctx context.Context, request *evaluatorservice.UpdateEvaluatorTemplateRequest) (resp *evaluatorservice.UpdateEvaluatorTemplateResponse, err error) { // 参数验证 if request.GetEvaluatorTemplate() == nil { return nil, errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("evaluator_template is nil")) @@ -1513,13 +1512,13 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluatorTemplate(ctx context.Context, requ // 转换结果 template := evaluatorconvertor.ConvertEvaluatorTemplateDO2DTO(serviceResp.Template) - return &evaluator.UpdateEvaluatorTemplateResponse{ + return &evaluatorservice.UpdateEvaluatorTemplateResponse{ EvaluatorTemplate: template, }, nil } // DeleteEvaluatorTemplate 删除评估器模板 -func (e *EvaluatorHandlerImpl) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest) (resp *evaluator.DeleteEvaluatorTemplateResponse, err error) { +func (e *EvaluatorHandlerImpl) DeleteEvaluatorTemplate(ctx context.Context, request *evaluatorservice.DeleteEvaluatorTemplateRequest) (resp *evaluatorservice.DeleteEvaluatorTemplateResponse, err error) { // 参数验证 if request.GetEvaluatorTemplateID() == 0 { return nil, errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("evaluator_template_id is 0")) @@ -1554,11 +1553,11 @@ func (e *EvaluatorHandlerImpl) DeleteEvaluatorTemplate(ctx context.Context, requ return nil, err } - return &evaluator.DeleteEvaluatorTemplateResponse{}, nil + return &evaluatorservice.DeleteEvaluatorTemplateResponse{}, nil } // DebugBuiltinEvaluator 调试预置评估器 -func (e *EvaluatorHandlerImpl) DebugBuiltinEvaluator(ctx context.Context, request *evaluator.DebugBuiltinEvaluatorRequest) (resp *evaluator.DebugBuiltinEvaluatorResponse, err error) { +func (e *EvaluatorHandlerImpl) DebugBuiltinEvaluator(ctx context.Context, request *evaluatorservice.DebugBuiltinEvaluatorRequest) (resp *evaluatorservice.DebugBuiltinEvaluatorResponse, err error) { // 预置评估器复用空间下列表查询鉴权 err = e.auth.Authorization(ctx, &rpc.AuthorizationParam{ ObjectID: strconv.FormatInt(request.WorkspaceID, 10), @@ -1585,7 +1584,7 @@ func (e *EvaluatorHandlerImpl) DebugBuiltinEvaluator(ctx context.Context, reques } // 3) 返回结果 - return &evaluator.DebugBuiltinEvaluatorResponse{ + return &evaluatorservice.DebugBuiltinEvaluatorResponse{ OutputData: evaluatorconvertor.ConvertEvaluatorOutputDataDO2DTO(outputDataDO), }, nil } diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index 04788ed13..830e67aa7 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -22,8 +22,7 @@ import ( idgenmocks "github.com/coze-dev/coze-loop/backend/infra/idgen/mocks" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" - evaluatorservice "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" - evaluatorapi "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" + evaluatorservice "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" "github.com/coze-dev/coze-loop/backend/modules/evaluation/application/convertor/evaluator" "github.com/coze-dev/coze-loop/backend/modules/evaluation/consts" metricsmock "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/component/metrics/mocks" @@ -2891,15 +2890,15 @@ func TestEvaluatorHandlerImpl_CreateEvaluatorTemplate(t *testing.T) { tests := []struct { name string - req *evaluatorapi.CreateEvaluatorTemplateRequest + req *evaluatorservice.CreateEvaluatorTemplateRequest mockSetup func() - wantResp *evaluatorapi.CreateEvaluatorTemplateResponse + wantResp *evaluatorservice.CreateEvaluatorTemplateResponse wantErr bool wantErrCode int32 }{ { name: "success - normal request", - req: &evaluatorapi.CreateEvaluatorTemplateRequest{ + req: &evaluatorservice.CreateEvaluatorTemplateRequest{ EvaluatorTemplate: templateDTO, }, mockSetup: func() { @@ -2913,14 +2912,14 @@ func TestEvaluatorHandlerImpl_CreateEvaluatorTemplate(t *testing.T) { Template: evaluator.ConvertEvaluatorTemplateDTO2DO(templateDTO), }, nil) }, - wantResp: &evaluatorapi.CreateEvaluatorTemplateResponse{ + wantResp: &evaluatorservice.CreateEvaluatorTemplateResponse{ EvaluatorTemplate: templateDTO, }, wantErr: false, }, { name: "error - nil template", - req: &evaluatorapi.CreateEvaluatorTemplateRequest{ + req: &evaluatorservice.CreateEvaluatorTemplateRequest{ EvaluatorTemplate: nil, }, mockSetup: func() {}, @@ -2930,7 +2929,7 @@ func TestEvaluatorHandlerImpl_CreateEvaluatorTemplate(t *testing.T) { }, { name: "error - auth failed", - req: &evaluatorapi.CreateEvaluatorTemplateRequest{ + req: &evaluatorservice.CreateEvaluatorTemplateRequest{ EvaluatorTemplate: &evaluatordto.EvaluatorTemplate{ ID: gptr.Of(int64(1)), WorkspaceID: gptr.Of(int64(789)), // 不在允许列表中 @@ -2953,7 +2952,7 @@ func TestEvaluatorHandlerImpl_CreateEvaluatorTemplate(t *testing.T) { }, { name: "error - service failure", - req: &evaluatorapi.CreateEvaluatorTemplateRequest{ + req: &evaluatorservice.CreateEvaluatorTemplateRequest{ EvaluatorTemplate: templateDTO, }, mockSetup: func() { @@ -3021,15 +3020,15 @@ func TestEvaluatorHandlerImpl_UpdateEvaluatorTemplate(t *testing.T) { tests := []struct { name string - req *evaluatorapi.UpdateEvaluatorTemplateRequest + req *evaluatorservice.UpdateEvaluatorTemplateRequest mockSetup func() - wantResp *evaluatorapi.UpdateEvaluatorTemplateResponse + wantResp *evaluatorservice.UpdateEvaluatorTemplateResponse wantErr bool wantErrCode int32 }{ { name: "success - normal request", - req: &evaluatorapi.UpdateEvaluatorTemplateRequest{ + req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, EvaluatorTemplate: templateDTO, }, @@ -3044,14 +3043,14 @@ func TestEvaluatorHandlerImpl_UpdateEvaluatorTemplate(t *testing.T) { Template: evaluator.ConvertEvaluatorTemplateDTO2DO(templateDTO), }, nil) }, - wantResp: &evaluatorapi.UpdateEvaluatorTemplateResponse{ + wantResp: &evaluatorservice.UpdateEvaluatorTemplateResponse{ EvaluatorTemplate: templateDTO, }, wantErr: false, }, { name: "error - nil template", - req: &evaluatorapi.UpdateEvaluatorTemplateRequest{ + req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, EvaluatorTemplate: nil, }, @@ -3062,7 +3061,7 @@ func TestEvaluatorHandlerImpl_UpdateEvaluatorTemplate(t *testing.T) { }, { name: "error - auth failed", - req: &evaluatorapi.UpdateEvaluatorTemplateRequest{ + req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, EvaluatorTemplate: &evaluatordto.EvaluatorTemplate{ ID: gptr.Of(templateID), @@ -3086,7 +3085,7 @@ func TestEvaluatorHandlerImpl_UpdateEvaluatorTemplate(t *testing.T) { }, { name: "error - service failure", - req: &evaluatorapi.UpdateEvaluatorTemplateRequest{ + req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, EvaluatorTemplate: templateDTO, }, @@ -3154,15 +3153,15 @@ func TestEvaluatorHandlerImpl_DeleteEvaluatorTemplate(t *testing.T) { tests := []struct { name string - req *evaluatorapi.DeleteEvaluatorTemplateRequest + req *evaluatorservice.DeleteEvaluatorTemplateRequest mockSetup func() - wantResp *evaluatorapi.DeleteEvaluatorTemplateResponse + wantResp *evaluatorservice.DeleteEvaluatorTemplateResponse wantErr bool wantErrCode int32 }{ { name: "success - normal request", - req: &evaluatorapi.DeleteEvaluatorTemplateRequest{ + req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -3185,12 +3184,12 @@ func TestEvaluatorHandlerImpl_DeleteEvaluatorTemplate(t *testing.T) { }). Return(&entity.DeleteEvaluatorTemplateResponse{}, nil) }, - wantResp: &evaluatorapi.DeleteEvaluatorTemplateResponse{}, + wantResp: &evaluatorservice.DeleteEvaluatorTemplateResponse{}, wantErr: false, }, { name: "error - template id is 0", - req: &evaluatorapi.DeleteEvaluatorTemplateRequest{ + req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ EvaluatorTemplateID: 0, }, mockSetup: func() {}, @@ -3200,7 +3199,7 @@ func TestEvaluatorHandlerImpl_DeleteEvaluatorTemplate(t *testing.T) { }, { name: "error - template not found", - req: &evaluatorapi.DeleteEvaluatorTemplateRequest{ + req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -3216,7 +3215,7 @@ func TestEvaluatorHandlerImpl_DeleteEvaluatorTemplate(t *testing.T) { }, { name: "error - auth failed", - req: &evaluatorapi.DeleteEvaluatorTemplateRequest{ + req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -3309,15 +3308,15 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { tests := []struct { name string - req *evaluatorapi.DebugBuiltinEvaluatorRequest + req *evaluatorservice.DebugBuiltinEvaluatorRequest mockSetup func() - wantResp *evaluatorapi.DebugBuiltinEvaluatorResponse + wantResp *evaluatorservice.DebugBuiltinEvaluatorResponse wantErr bool wantErrCode int32 }{ { name: "success - normal request", - req: &evaluatorapi.DebugBuiltinEvaluatorRequest{ + req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ EvaluatorID: evaluatorID, WorkspaceID: workspaceID, InputData: inputData, @@ -3339,14 +3338,14 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { DebugEvaluator(gomock.Any(), builtinEvaluator, gomock.Any()). Return(outputData, nil) }, - wantResp: &evaluatorapi.DebugBuiltinEvaluatorResponse{ + wantResp: &evaluatorservice.DebugBuiltinEvaluatorResponse{ OutputData: evaluator.ConvertEvaluatorOutputDataDO2DTO(outputData), }, wantErr: false, }, { name: "error - auth failed", - req: &evaluatorapi.DebugBuiltinEvaluatorRequest{ + req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ EvaluatorID: evaluatorID, WorkspaceID: workspaceID, InputData: inputData, @@ -3362,7 +3361,7 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { }, { name: "error - evaluator not found", - req: &evaluatorapi.DebugBuiltinEvaluatorRequest{ + req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ EvaluatorID: evaluatorID, WorkspaceID: workspaceID, InputData: inputData, @@ -3382,7 +3381,7 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { }, { name: "error - debug failure", - req: &evaluatorapi.DebugBuiltinEvaluatorRequest{ + req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ EvaluatorID: evaluatorID, WorkspaceID: workspaceID, InputData: inputData, diff --git a/backend/modules/evaluation/application/experiment_app.go b/backend/modules/evaluation/application/experiment_app.go index 7ad9d01e1..4dcab5262 100644 --- a/backend/modules/evaluation/application/experiment_app.go +++ b/backend/modules/evaluation/application/experiment_app.go @@ -434,9 +434,6 @@ func (e *experimentApplication) ListExperimentStats(ctx context.Context, req *ex func (e *experimentApplication) UpdateExperiment(ctx context.Context, req *expt.UpdateExperimentRequest) (r *expt.UpdateExperimentResponse, err error) { session := entity.NewSession(ctx) - if err != nil { - return nil, err - } got, err := e.manager.Get(ctx, req.GetExptID(), req.GetWorkspaceID(), session) if err != nil { diff --git a/backend/modules/evaluation/application/experiment_app_test.go b/backend/modules/evaluation/application/experiment_app_test.go index 0e963dcc7..fc44d71ef 100644 --- a/backend/modules/evaluation/application/experiment_app_test.go +++ b/backend/modules/evaluation/application/experiment_app_test.go @@ -202,7 +202,7 @@ func Test_experimentApplication_resolveEvaluatorVersionIDs(t *testing.T) { {EvaluatorID: gptr.Of(int64(3)), Version: gptr.Of("2.0.0")}, }, } - // 不增加映射，专注验证版本ID解析与去重 + // 不增加映射，专注验证版本ID解析与去重 // 期望： // - BuiltinVisible: eid=1 返回可见版本，其版本ID设为 10101 @@ -225,7 +225,7 @@ func Test_experimentApplication_resolveEvaluatorVersionIDs(t *testing.T) { if got, want := len(ids), 4; got != want { t.Fatalf("len(ids)=%d want=%d", got, want) } - if !(ids[0] == 10101 && ids[1] == 20200 && ids[2] == 20200 && ids[3] == 30300) { + if ids[0] != 10101 || ids[1] != 20200 || ids[2] != 20200 || ids[3] != 30300 { t.Fatalf("ids=%v want=[10101 20200 20200 30300]", ids) } diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index 62fdde14d..d2196591b 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -320,6 +320,7 @@ func (e *EvaluatorServiceImpl) makeCreateIdemKey(cid string) string { return consts.IdemKeyCreateEvaluator + cid } +// nolint:unused // 保留备用：内置评估器创建的幂等键构造 func (e *EvaluatorServiceImpl) makeCreateBuiltinIdemKey(cid string) string { return consts.IdemKeyCreateEvaluator + "_builtin_" + cid } diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go index c56eb57bf..d154c1120 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go @@ -216,11 +216,11 @@ func (r *EvaluatorTemplateRepoImpl) UpdateEvaluatorTemplate(ctx context.Context, return nil, err } - // 标签全量对齐：新增补充、删除不在集合内的，保持未变化的不动 - if template != nil { - // 针对每种语言分别全量对齐 - userID := session.UserIDInCtxOrEmpty(ctx) - for lang, tagMap := range template.Tags { + // 标签全量对齐：新增补充、删除不在集合内的，保持未变化的不动 + // 此处 template 已在入参校验中判空，无需再判空 + // 针对每种语言分别全量对齐 + userID := session.UserIDInCtxOrEmpty(ctx) + for lang, tagMap := range template.Tags { existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{template.ID}, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), string(lang)) if err != nil { return nil, err @@ -240,8 +240,7 @@ func (r *EvaluatorTemplateRepoImpl) UpdateEvaluatorTemplate(ctx context.Context, } for _, v := range vs { target[kstr][v] = true - } - } + } del := make(map[string][]string) for k, vals := range existing { for v := range vals { diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index 1707bd3bd..2edbc1faa 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -211,6 +211,7 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte } // buildFilterConditions 构建筛选条件的SQL和参数 +// nolint:unused // 保留备用：复杂筛选条件的 SQL 生成 func (dao *EvaluatorTagDAOImpl) buildFilterConditions(filters *entity.EvaluatorFilters) (string, []interface{}, error) { if filters == nil { return "", nil, nil diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go index c5b18880f..05a3ea2c0 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go @@ -272,7 +272,7 @@ func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { if err != nil { t.Fatalf("failed to create sqlmock: %v", err) } - defer sqlDB.Close() + defer func() { _ = sqlDB.Close() }() // 创建真实的GORM数据库连接 gormDB, err := gorm.Open(mysql.New(mysql.Config{ @@ -486,7 +486,7 @@ func TestGetSourceIDsByFilterConditions_SelfJoinAndLike(t *testing.T) { if err != nil { t.Fatalf("failed to create sqlmock: %v", err) } - defer sqlDB.Close() + defer func() { _ = sqlDB.Close() }() gormDB, err := gorm.Open(mysql.New(mysql.Config{ Conn: sqlDB, diff --git a/backend/modules/observability/domain/task/service/taskexe/tracehub/utils.go b/backend/modules/observability/domain/task/service/taskexe/tracehub/utils.go index 5a3487489..7b6a37b9c 100644 --- a/backend/modules/observability/domain/task/service/taskexe/tracehub/utils.go +++ b/backend/modules/observability/domain/task/service/taskexe/tracehub/utils.go @@ -47,7 +47,7 @@ func (h *TraceHubServiceImpl) fillCtx(ctx context.Context) context.Context { ctx = logs.SetLogID(ctx, logID) ctx = metainfo.WithPersistentValue(ctx, AppIDKey, strconv.FormatInt(int64(h.aid), 10)) if env := os.Getenv(TceEnv); env != "" { - ctx = context.WithValue(ctx, CtxKeyEnv, env) //nolint:staticcheck,SA1029 + ctx = context.WithValue(ctx, CtxKeyEnv, env) //nolint:staticcheck } return ctx } diff --git a/backend/modules/observability/infra/repo/redis/convert/task_run.go b/backend/modules/observability/infra/repo/redis/convert/task_run.go index 880a0a6d8..20803d80b 100755 --- a/backend/modules/observability/infra/repo/redis/convert/task_run.go +++ b/backend/modules/observability/infra/repo/redis/convert/task_run.go @@ -40,7 +40,7 @@ func (TaskRunConverter) ToDO(b []byte) (*entity.TaskRun, error) { // toTaskRunBytes // -//nolint:staticcheck,S1034 +//nolint:staticcheck,gosimple func toTaskRunBytes(v any) []byte { switch v.(type) { case string: diff --git a/backend/script/gorm_gen/generate.go b/backend/script/gorm_gen/generate.go index e570ec9ad..a7267a6f9 100644 --- a/backend/script/gorm_gen/generate.go +++ b/backend/script/gorm_gen/generate.go @@ -14,13 +14,13 @@ import ( func main() { db := initDB() - //generateForPrompt(db) - //generateForData(db) - //generateForEvaluationTarget(db) + generateForPrompt(db) + generateForData(db) + generateForEvaluationTarget(db) generateForEvaluationEvaluator(db) - //generateForEvaluationExpt(db) - //generateForObservability(db) - //generateForFoundation(db) + generateForEvaluationExpt(db) + generateForObservability(db) + generateForFoundation(db) } func initDB() *gorm.DB { From 0ccb3c296d155428382ab53a62b2ada407bbb317 Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 16:10:33 +0800 Subject: [PATCH 26/42] fix BatchGetEvaluatorByIDAndVersion --- .../coze/loop/apis/evaluator_service.go | 24 +- .../coze/loop/apis/evaluator_service_test.go | 237 ++++++++++++++++++ .../domain/service/evaluator_impl.go | 53 ++++ .../domain/service/evaluator_impl_test.go | 30 ++- 4 files changed, 318 insertions(+), 26 deletions(-) create mode 100644 backend/api/handler/coze/loop/apis/evaluator_service_test.go diff --git a/backend/api/handler/coze/loop/apis/evaluator_service.go b/backend/api/handler/coze/loop/apis/evaluator_service.go index 4d46c6664..a84fd47ba 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service.go @@ -190,33 +190,13 @@ func GetTemplateInfoV2(ctx context.Context, c *app.RequestContext) { // DebugBuiltinEvaluator . // @router /api/evaluation/v1/evaluators/debug_builtin [POST] func DebugBuiltinEvaluator(ctx context.Context, c *app.RequestContext) { - var err error - var req evaluator.DebugBuiltinEvaluatorRequest - err = c.BindAndValidate(&req) - if err != nil { - c.String(consts.StatusBadRequest, err.Error()) - return - } - - resp := new(evaluator.DebugBuiltinEvaluatorResponse) - - c.JSON(consts.StatusOK, resp) + invokeAndRender(ctx, c, localEvaluatorSvc.DebugBuiltinEvaluator) } // CreateEvaluatorTemplate . // @router /api/evaluation/v1/evaluators/create_template [POST] func CreateEvaluatorTemplate(ctx context.Context, c *app.RequestContext) { - var err error - var req evaluator.CreateEvaluatorTemplateRequest - err = c.BindAndValidate(&req) - if err != nil { - c.String(consts.StatusBadRequest, err.Error()) - return - } - - resp := new(evaluator.CreateEvaluatorTemplateResponse) - - c.JSON(consts.StatusOK, resp) + invokeAndRender(ctx, c, localEvaluatorSvc.CreateEvaluatorTemplate) } // UpdateEvaluatorTemplate . diff --git a/backend/api/handler/coze/loop/apis/evaluator_service_test.go b/backend/api/handler/coze/loop/apis/evaluator_service_test.go new file mode 100644 index 000000000..935f111ff --- /dev/null +++ b/backend/api/handler/coze/loop/apis/evaluator_service_test.go @@ -0,0 +1,237 @@ +// Copyright (c) 2025 coze-dev Authors +// SPDX-License-Identifier: Apache-2.0 + +package apis + +import ( + "context" + "net/http" + "testing" + + "github.com/cloudwego/hertz/pkg/app" + "github.com/cloudwego/kitex/client/callopt" + "github.com/stretchr/testify/assert" + + "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/apis/evaluatorservice" + "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" +) + +// mockEvaluatorClient 实现 evaluatorservice.Client 的必要方法，返回空响应以通过渲染 +type mockEvaluatorClient struct{} + +func (m *mockEvaluatorClient) ListEvaluators(ctx context.Context, req *evaluator.ListEvaluatorsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorsResponse, err error) { + return &evaluator.ListEvaluatorsResponse{}, nil +} + +func (m *mockEvaluatorClient) BatchGetEvaluators(ctx context.Context, req *evaluator.BatchGetEvaluatorsRequest, callOptions ...callopt.Option) (r *evaluator.BatchGetEvaluatorsResponse, err error) { + return &evaluator.BatchGetEvaluatorsResponse{}, nil +} + +func (m *mockEvaluatorClient) GetEvaluator(ctx context.Context, req *evaluator.GetEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.GetEvaluatorResponse, err error) { + return &evaluator.GetEvaluatorResponse{}, nil +} + +func (m *mockEvaluatorClient) CreateEvaluator(ctx context.Context, req *evaluator.CreateEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorResponse, err error) { + return &evaluator.CreateEvaluatorResponse{}, nil +} + +func (m *mockEvaluatorClient) UpdateEvaluator(ctx context.Context, req *evaluator.UpdateEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorResponse, err error) { + return &evaluator.UpdateEvaluatorResponse{}, nil +} + +func (m *mockEvaluatorClient) UpdateEvaluatorDraft(ctx context.Context, req *evaluator.UpdateEvaluatorDraftRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorDraftResponse, err error) { + return &evaluator.UpdateEvaluatorDraftResponse{}, nil +} + +func (m *mockEvaluatorClient) DeleteEvaluator(ctx context.Context, req *evaluator.DeleteEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorResponse, err error) { + return &evaluator.DeleteEvaluatorResponse{}, nil +} + +func (m *mockEvaluatorClient) CheckEvaluatorName(ctx context.Context, req *evaluator.CheckEvaluatorNameRequest, callOptions ...callopt.Option) (r *evaluator.CheckEvaluatorNameResponse, err error) { + return &evaluator.CheckEvaluatorNameResponse{}, nil +} + +func (m *mockEvaluatorClient) ListEvaluatorVersions(ctx context.Context, req *evaluator.ListEvaluatorVersionsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorVersionsResponse, err error) { + return &evaluator.ListEvaluatorVersionsResponse{}, nil +} + +func (m *mockEvaluatorClient) GetEvaluatorVersion(ctx context.Context, req *evaluator.GetEvaluatorVersionRequest, callOptions ...callopt.Option) (r *evaluator.GetEvaluatorVersionResponse, err error) { + return &evaluator.GetEvaluatorVersionResponse{}, nil +} + +func (m *mockEvaluatorClient) BatchGetEvaluatorVersions(ctx context.Context, req *evaluator.BatchGetEvaluatorVersionsRequest, callOptions ...callopt.Option) (r *evaluator.BatchGetEvaluatorVersionsResponse, err error) { + return &evaluator.BatchGetEvaluatorVersionsResponse{}, nil +} + +func (m *mockEvaluatorClient) SubmitEvaluatorVersion(ctx context.Context, req *evaluator.SubmitEvaluatorVersionRequest, callOptions ...callopt.Option) (r *evaluator.SubmitEvaluatorVersionResponse, err error) { + return &evaluator.SubmitEvaluatorVersionResponse{}, nil +} + +func (m *mockEvaluatorClient) ListTemplates(ctx context.Context, req *evaluator.ListTemplatesRequest, callOptions ...callopt.Option) (r *evaluator.ListTemplatesResponse, err error) { + return &evaluator.ListTemplatesResponse{}, nil +} + +func (m *mockEvaluatorClient) GetTemplateInfo(ctx context.Context, req *evaluator.GetTemplateInfoRequest, callOptions ...callopt.Option) (r *evaluator.GetTemplateInfoResponse, err error) { + return &evaluator.GetTemplateInfoResponse{}, nil +} + +func (m *mockEvaluatorClient) GetDefaultPromptEvaluatorTools(ctx context.Context, req *evaluator.GetDefaultPromptEvaluatorToolsRequest, callOptions ...callopt.Option) (r *evaluator.GetDefaultPromptEvaluatorToolsResponse, err error) { + return &evaluator.GetDefaultPromptEvaluatorToolsResponse{}, nil +} + +func (m *mockEvaluatorClient) RunEvaluator(ctx context.Context, req *evaluator.RunEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.RunEvaluatorResponse, err error) { + return &evaluator.RunEvaluatorResponse{}, nil +} + +func (m *mockEvaluatorClient) DebugEvaluator(ctx context.Context, req *evaluator.DebugEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugEvaluatorResponse, err error) { + return &evaluator.DebugEvaluatorResponse{}, nil +} + +func (m *mockEvaluatorClient) BatchDebugEvaluator(ctx context.Context, req *evaluator.BatchDebugEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.BatchDebugEvaluatorResponse, err error) { + return &evaluator.BatchDebugEvaluatorResponse{}, nil +} + +func (m *mockEvaluatorClient) UpdateEvaluatorRecord(ctx context.Context, req *evaluator.UpdateEvaluatorRecordRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorRecordResponse, err error) { + return &evaluator.UpdateEvaluatorRecordResponse{}, nil +} + +func (m *mockEvaluatorClient) GetEvaluatorRecord(ctx context.Context, req *evaluator.GetEvaluatorRecordRequest, callOptions ...callopt.Option) (r *evaluator.GetEvaluatorRecordResponse, err error) { + return &evaluator.GetEvaluatorRecordResponse{}, nil +} + +func (m *mockEvaluatorClient) BatchGetEvaluatorRecords(ctx context.Context, req *evaluator.BatchGetEvaluatorRecordsRequest, callOptions ...callopt.Option) (r *evaluator.BatchGetEvaluatorRecordsResponse, err error) { + return &evaluator.BatchGetEvaluatorRecordsResponse{}, nil +} + +func (m *mockEvaluatorClient) ValidateEvaluator(ctx context.Context, req *evaluator.ValidateEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.ValidateEvaluatorResponse, err error) { + return &evaluator.ValidateEvaluatorResponse{}, nil +} + +func (m *mockEvaluatorClient) ListTemplatesV2(ctx context.Context, req *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (r *evaluator.ListTemplatesV2Response, err error) { + return &evaluator.ListTemplatesV2Response{}, nil +} + +func (m *mockEvaluatorClient) CreateEvaluatorTemplate(ctx context.Context, req *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { + return &evaluator.CreateEvaluatorTemplateResponse{}, nil +} + +func (m *mockEvaluatorClient) UpdateEvaluatorTemplate(ctx context.Context, req *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) { + return &evaluator.UpdateEvaluatorTemplateResponse{}, nil +} + +func (m *mockEvaluatorClient) DeleteEvaluatorTemplate(ctx context.Context, req *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) { + return &evaluator.DeleteEvaluatorTemplateResponse{}, nil +} + +func (m *mockEvaluatorClient) DebugBuiltinEvaluator(ctx context.Context, req *evaluator.DebugBuiltinEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.DebugBuiltinEvaluatorResponse, err error) { + return &evaluator.DebugBuiltinEvaluatorResponse{}, nil +} + +func (m *mockEvaluatorClient) UpdateBuiltinEvaluatorTags(ctx context.Context, req *evaluator.UpdateBuiltinEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.UpdateBuiltinEvaluatorTagsResponse, err error) { + return &evaluator.UpdateBuiltinEvaluatorTagsResponse{}, nil +} + +func (m *mockEvaluatorClient) ListEvaluatorTags(ctx context.Context, req *evaluator.ListEvaluatorTagsRequest, callOptions ...callopt.Option) (r *evaluator.ListEvaluatorTagsResponse, err error) { + return &evaluator.ListEvaluatorTagsResponse{}, nil +} + +// 确保 mock 实现了接口（编译期检查） +var _ evaluatorservice.Client = (*mockEvaluatorClient)(nil) + +// helper：构造简易的 RequestContext，设置 JSON 空对象避免绑定失败 +func newJSONCtx() *app.RequestContext { + c := &app.RequestContext{} + c.Request.Header.Set("Content-Type", "application/json") + c.Request.SetRequestURI("/") + c.Request.SetMethod("POST") + c.Request.SetBody([]byte("{}")) + return c +} + +func newJSONCtxWithBody(body string) *app.RequestContext { + c := &app.RequestContext{} + c.Request.Header.Set("Content-Type", "application/json") + c.Request.SetRequestURI("/") + c.Request.SetMethod("POST") + c.Request.SetBody([]byte(body)) + return c +} + +func TestEvaluatorService_Handlers_Smoke(t *testing.T) { + // 替换并恢复全局 client + old := localEvaluatorSvc + localEvaluatorSvc = &mockEvaluatorClient{} + t.Cleanup(func() { localEvaluatorSvc = old }) + + ctx := context.Background() + + // 选取常用的几个接口做冒烟验证（其余接口同理，均走 invokeAndRender 路径） + cases := []struct { + name string + fn func(context.Context, *app.RequestContext) + }{ + {name: "CreateEvaluator", fn: CreateEvaluator}, + {name: "ListEvaluators", fn: ListEvaluators}, + {name: "UpdateEvaluator", fn: UpdateEvaluator}, + {name: "UpdateEvaluatorDraft", fn: UpdateEvaluatorDraft}, + {name: "RunEvaluator", fn: RunEvaluator}, + {name: "DebugEvaluator", fn: DebugEvaluator}, + } + + for _, cs := range cases { + t.Run(cs.name, func(t *testing.T) { + var c *app.RequestContext + switch cs.name { + case "DebugBuiltinEvaluator": + // 需要必填: evaluator_id, workspace_id, input_data（提供最小可解析结构） + c = newJSONCtxWithBody(`{ + "evaluator_id": 1, + "workspace_id": 1, + "input_data": {"input_fields": {}} + }`) + case "CreateEvaluatorTemplate": + // 需要必填: evaluator_template + c = newJSONCtxWithBody(`{ + "evaluator_template": {} + }`) + default: + c = newJSONCtx() + } + cs.fn(ctx, c) + assert.Equal(t, http.StatusOK, c.Response.StatusCode()) + }) + } +} + +func TestEvaluatorService_Handlers(t *testing.T) { + // 替换并恢复全局 client + old := localEvaluatorSvc + localEvaluatorSvc = &mockEvaluatorClient{} + t.Cleanup(func() { localEvaluatorSvc = old }) + + ctx := context.Background() + + cases := []struct { + name string + fn func(context.Context, *app.RequestContext) + }{ + {name: "ValidateEvaluator", fn: ValidateEvaluator}, + {name: "BatchDebugEvaluator", fn: BatchDebugEvaluator}, + {name: "ListTemplatesV2", fn: ListTemplatesV2}, + {name: "GetTemplateInfoV2", fn: GetTemplateInfoV2}, + {name: "DebugBuiltinEvaluator", fn: DebugBuiltinEvaluator}, + {name: "CreateEvaluatorTemplate", fn: CreateEvaluatorTemplate}, + {name: "UpdateEvaluatorTemplate", fn: UpdateEvaluatorTemplate}, + {name: "DeleteEvaluatorTemplate", fn: DeleteEvaluatorTemplate}, + {name: "ListEvaluatorTags", fn: ListEvaluatorTags}, + {name: "UpdateBuiltinEvaluatorTags", fn: UpdateBuiltinEvaluatorTags}, + } + + for _, cs := range cases { + t.Run(cs.name, func(t *testing.T) { + c := newJSONCtx() + cs.fn(ctx, c) + assert.Equal(t, http.StatusOK, c.Response.StatusCode()) + }) + } +} diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index d2196591b..dfbb7315d 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -293,6 +293,59 @@ func (e *EvaluatorServiceImpl) BatchGetEvaluatorByIDAndVersion(ctx context.Conte if err != nil { return nil, err } + if len(versions) == 0 { + return versions, nil + } + + // 收集 evaluator 元信息并回填至版本实体根字段 + evaluatorIDs := make([]int64, 0, len(versions)) + seen := make(map[int64]struct{}, len(versions)) + for _, v := range versions { + if v == nil { + continue + } + mid := v.GetEvaluatorID() + if mid == 0 { + continue + } + if _, ok := seen[mid]; ok { + continue + } + seen[mid] = struct{}{} + evaluatorIDs = append(evaluatorIDs, mid) + } + if len(evaluatorIDs) == 0 { + return versions, nil + } + metas, err := e.evaluatorRepo.BatchGetEvaluatorMetaByID(ctx, evaluatorIDs, false) + if err != nil { + return nil, err + } + id2Meta := make(map[int64]*entity.Evaluator, len(metas)) + for _, m := range metas { + if m != nil { + id2Meta[m.ID] = m + } + } + for _, v := range versions { + if v == nil { + continue + } + if m, ok := id2Meta[v.GetEvaluatorID()]; ok && m != nil { + v.ID = m.ID + v.SpaceID = m.SpaceID + v.Name = m.Name + v.Description = m.Description + v.DraftSubmitted = m.DraftSubmitted + v.EvaluatorType = m.EvaluatorType + v.LatestVersion = m.LatestVersion + v.Builtin = m.Builtin + v.EvaluatorInfo = m.EvaluatorInfo + v.BuiltinVisibleVersion = m.BuiltinVisibleVersion + v.BoxType = m.BoxType + v.Tags = m.Tags + } + } return versions, nil } diff --git a/backend/modules/evaluation/domain/service/evaluator_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_impl_test.go index b215d7ac0..4a0e92cc7 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl_test.go @@ -161,7 +161,7 @@ func Test_BatchGetBuiltinEvaluator(t *testing.T) { }) } -// Test_BatchGetEvaluatorByIDAndVersion 覆盖简单透传 +// Test_BatchGetEvaluatorByIDAndVersion 回填 evaluator 元信息 func Test_BatchGetEvaluatorByIDAndVersion(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() @@ -171,11 +171,33 @@ func Test_BatchGetEvaluatorByIDAndVersion(t *testing.T) { ctx := context.Background() pairs := [][2]interface{}{{int64(11), "0.1.0"}, {int64(22), "1.0.0"}} - expect := []*entity.Evaluator{{ID: 11}, {ID: 22}} - mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), pairs).Return(expect, nil) + // 版本侧仅带有 EvaluatorID（置于具体版本字段中） + versions := []*entity.Evaluator{ + {EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 11}}, + {EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 22}}, + } + mockRepo.EXPECT().BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(gomock.Any(), pairs).Return(versions, nil) + // 元信息补充 + metas := []*entity.Evaluator{ + {ID: 11, SpaceID: 101, Name: "evA", EvaluatorType: entity.EvaluatorTypePrompt}, + {ID: 22, SpaceID: 202, Name: "evB", EvaluatorType: entity.EvaluatorTypeCode}, + } + mockRepo.EXPECT().BatchGetEvaluatorMetaByID(gomock.Any(), []int64{11, 22}, false).Return(metas, nil) + got, err := s.BatchGetEvaluatorByIDAndVersion(ctx, pairs) assert.NoError(t, err) - assert.Equal(t, expect, got) + assert.Equal(t, 2, len(got)) + // 校验已回填 + if got[0].GetEvaluatorID() == 11 { + assert.Equal(t, int64(11), got[0].ID) + assert.Equal(t, int64(101), got[0].SpaceID) + assert.Equal(t, "evA", got[0].Name) + } + if got[1].GetEvaluatorID() == 22 { + assert.Equal(t, int64(22), got[1].ID) + assert.Equal(t, int64(202), got[1].SpaceID) + assert.Equal(t, "evB", got[1].Name) + } // 空入参 got2, err2 := s.BatchGetEvaluatorByIDAndVersion(ctx, [][2]interface{}{}) From 099798b224cc881c7eb00830033eb2a58c4af698 Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 17:04:42 +0800 Subject: [PATCH 27/42] fix total --- .../coze/loop/apis/evaluator_service_test.go | 12 +-- .../evaluation/application/evaluator_app.go | 2 +- .../application/evaluator_app_test.go | 2 +- .../infra/repo/evaluator/evaluator_impl.go | 82 ++++++------------- .../repo/evaluator/mysql/evaluator_tag.go | 7 +- 5 files changed, 39 insertions(+), 66 deletions(-) diff --git a/backend/api/handler/coze/loop/apis/evaluator_service_test.go b/backend/api/handler/coze/loop/apis/evaluator_service_test.go index 935f111ff..c00b77322 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service_test.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service_test.go @@ -149,12 +149,12 @@ func newJSONCtx() *app.RequestContext { } func newJSONCtxWithBody(body string) *app.RequestContext { - c := &app.RequestContext{} - c.Request.Header.Set("Content-Type", "application/json") - c.Request.SetRequestURI("/") - c.Request.SetMethod("POST") - c.Request.SetBody([]byte(body)) - return c + c := &app.RequestContext{} + c.Request.Header.Set("Content-Type", "application/json") + c.Request.SetRequestURI("/") + c.Request.SetMethod("POST") + c.Request.SetBody([]byte(body)) + return c } func TestEvaluatorService_Handlers_Smoke(t *testing.T) { diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index 13b457b8c..99e920044 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -1468,7 +1468,7 @@ func (e *EvaluatorHandlerImpl) CreateEvaluatorTemplate(ctx context.Context, requ // 转换结果 template := evaluatorconvertor.ConvertEvaluatorTemplateDO2DTO(serviceResp.Template) - return &evaluatorservice.CreateEvaluatorTemplateResponse{ + return &evaluatorservice.CreateEvaluatorTemplateResponse{ EvaluatorTemplate: template, }, nil } diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index 830e67aa7..9a1ded367 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -22,7 +22,7 @@ import ( idgenmocks "github.com/coze-dev/coze-loop/backend/infra/idgen/mocks" "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/common" evaluatordto "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/domain/evaluator" - evaluatorservice "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" + evaluatorservice "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/evaluator" "github.com/coze-dev/coze-loop/backend/modules/evaluation/application/convertor/evaluator" "github.com/coze-dev/coze-loop/backend/modules/evaluation/consts" metricsmock "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/component/metrics/mocks" diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index c3b41c919..90c11ada9 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -680,62 +680,34 @@ func (r *EvaluatorRepoImpl) ListEvaluator(ctx context.Context, req *repo.ListEva // ListBuiltinEvaluator 根据筛选条件查询内置评估器列表，支持tag筛选和分页 func (r *EvaluatorRepoImpl) ListBuiltinEvaluator(ctx context.Context, req *repo.ListBuiltinEvaluatorRequest) (*repo.ListBuiltinEvaluatorResponse, error) { - evaluatorIDs := []int64{} - var err error - - // 处理筛选条件 - if req.FilterOption != nil { - // 检查是否有有效的筛选条件 - hasValidFilters := false - - // 检查SearchKeyword是否有效 - if req.FilterOption.SearchKeyword != nil && *req.FilterOption.SearchKeyword != "" { - hasValidFilters = true - } - - // 检查FilterConditions或SubFilters是否有效 - if req.FilterOption.Filters != nil { - if len(req.FilterOption.Filters.FilterConditions) > 0 { - hasValidFilters = true - } - if len(req.FilterOption.Filters.SubFilters) > 0 { - hasValidFilters = true - } - } - - // 如果有有效的筛选条件，进行标签查询 - if hasValidFilters { - // 使用EvaluatorTagDAO查询符合条件的evaluator IDs（不分页） - filteredIDs, _, err := r.tagDAO.GetSourceIDsByFilterConditions(ctx, int32(entity.EvaluatorTagKeyType_Evaluator), req.FilterOption, req.PageSize, req.PageNum, contexts.CtxLocale(ctx)) - if err != nil { - return nil, err - } - - if len(filteredIDs) == 0 { - return &repo.ListBuiltinEvaluatorResponse{ - TotalCount: 0, - Evaluators: []*entity.Evaluator{}, - }, nil - } - - // 使用筛选后的IDs - evaluatorIDs = filteredIDs - } - } + // 统一通过 tagDAO 获取分页与总数（即使无筛选条件也走该逻辑） + evaluatorIDs, total, err := r.tagDAO.GetSourceIDsByFilterConditions( + ctx, + int32(entity.EvaluatorTagKeyType_Evaluator), + req.FilterOption, + req.PageSize, + req.PageNum, + contexts.CtxLocale(ctx), + ) + if err != nil { + return nil, err + } + if len(evaluatorIDs) == 0 { + return &repo.ListBuiltinEvaluatorResponse{TotalCount: total, Evaluators: []*entity.Evaluator{}}, nil + } - // 构建DAO层查询请求（专用内置接口，默认按 name 排序） - daoReq := &mysql.ListBuiltinEvaluatorRequest{ - IDs: evaluatorIDs, - PageSize: req.PageSize, - PageNum: req.PageNum, - OrderBy: []*mysql.OrderBy{{Field: "name", ByDesc: false}}, - } + // 基于获得的 ID 集查询内置评估器实体；此处不再做分页，避免与 tagDAO 的分页重复 + daoReq := &mysql.ListBuiltinEvaluatorRequest{ + IDs: evaluatorIDs, + PageSize: 0, + PageNum: 0, + OrderBy: []*mysql.OrderBy{{Field: "name", ByDesc: false}}, + } - // 调用DAO层查询 - daoResp, err := r.evaluatorDao.ListBuiltinEvaluator(ctx, daoReq) - if err != nil { - return nil, err - } + daoResp, err := r.evaluatorDao.ListBuiltinEvaluator(ctx, daoReq) + if err != nil { + return nil, err + } // 直接以 evaluatorID 为 source_id 批量查标签 var allTags []*model.EvaluatorTag @@ -760,7 +732,7 @@ func (r *EvaluatorRepoImpl) ListBuiltinEvaluator(ctx context.Context, req *repo. r.setEvaluatorTags(evaluatorDO, evaluatorPO.ID, tagsBySourceID) evaluators = append(evaluators, evaluatorDO) } - return &repo.ListBuiltinEvaluatorResponse{TotalCount: daoResp.TotalCount, Evaluators: evaluators}, nil + return &repo.ListBuiltinEvaluatorResponse{TotalCount: total, Evaluators: evaluators}, nil } // 已合并内置与普通查询至 BatchGetEvaluatorByVersionID(builtin) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index 2edbc1faa..0e5f979d5 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -124,9 +124,10 @@ func (dao *EvaluatorTagDAOImpl) DeleteEvaluatorTagsByConditions(ctx context.Cont // GetSourceIDsByFilterConditions 根据筛选条件查询source_id列表，支持复杂的AND/OR逻辑和分页 func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Context, tagType int32, filterOption *entity.EvaluatorFilterOption, pageSize, pageNum int32, langType string, opts ...db.Option) ([]int64, int64, error) { - if filterOption == nil { - return []int64{}, 0, nil - } + if filterOption == nil { + // 视为无筛选条件：统计并分页全部该 tagType 的 source_id（按 Name 排序） + filterOption = &entity.EvaluatorFilterOption{} + } dbsession := dao.provider.NewSession(ctx, append(opts, db.Debug())...) From b3448498882b5b925e4904bf150131863608fd7c Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 21:58:19 +0800 Subject: [PATCH 28/42] =?UTF-8?q?=E5=A2=9E=E5=8A=A0get=20template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coze/loop/apis/evaluator_service.go | 32 +- .../coze/loop/apis/evaluator_service_test.go | 24 +- .../router/coze/loop/apis/coze.loop.apis.go | 1 + .../api/router/coze/loop/apis/middleware.go | 5 + .../coze/loop/apis/evaluatorservice/client.go | 6 + .../apis/evaluatorservice/evaluatorservice.go | 36 ++ .../coze.loop.evaluation.evaluator.go | 514 ++++++++++++++++-- ...oze.loop.evaluation.evaluator_validator.go | 4 +- .../evaluator/evaluatorservice/client.go | 6 + .../evaluatorservice/evaluatorservice.go | 36 ++ .../k-coze.loop.evaluation.evaluator.go | 296 +++++++++- .../evaluation/evaluatorservice/client.go | 6 + .../evaluatorservice/evaluatorservice.go | 36 ++ .../loevaluator/local_evaluatorservice.go | 21 + .../evaluation/application/evaluator_app.go | 24 +- .../application/evaluator_app_test.go | 32 +- .../evaluation/domain/service/evaluator.go | 4 +- .../domain/service/evaluator_impl.go | 291 +++++----- .../domain/service/evaluator_impl_test.go | 14 +- .../service/evaluator_source_code_impl.go | 10 +- .../service/evaluator_source_prompt_impl.go | 8 +- .../evaluator_source_prompt_impl_test.go | 8 +- .../service/evaluator_source_service.go | 4 +- .../service/mocks/evaluator_service_mock.go | 8 +- .../mocks/evaluator_source_service_mock.go | 16 +- .../infra/repo/evaluator/evaluator_impl.go | 72 ++- .../coze.loop.evaluation.evaluator.thrift | 7 +- 27 files changed, 1160 insertions(+), 361 deletions(-) diff --git a/backend/api/handler/coze/loop/apis/evaluator_service.go b/backend/api/handler/coze/loop/apis/evaluator_service.go index a84fd47ba..647339e10 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service.go @@ -171,22 +171,6 @@ func ListTemplatesV2(ctx context.Context, c *app.RequestContext) { c.JSON(consts.StatusOK, resp) } -// GetTemplateInfoV2 . -// @router /api/evaluation/v1/evaluators/get_template_info_v2 [POST] -func GetTemplateInfoV2(ctx context.Context, c *app.RequestContext) { - var err error - var req evaluator.GetTemplateInfoV2Request - err = c.BindAndValidate(&req) - if err != nil { - c.String(consts.StatusBadRequest, err.Error()) - return - } - - resp := new(evaluator.GetTemplateInfoV2Response) - - c.JSON(consts.StatusOK, resp) -} - // DebugBuiltinEvaluator . // @router /api/evaluation/v1/evaluators/debug_builtin [POST] func DebugBuiltinEvaluator(ctx context.Context, c *app.RequestContext) { @@ -252,3 +236,19 @@ func UpdateBuiltinEvaluatorTags(ctx context.Context, c *app.RequestContext) { c.JSON(consts.StatusOK, resp) } + +// GetTemplateV2 . +// @router /api/evaluation/v1/evaluator_template/:evaluator_template_id [POST] +func GetTemplateV2(ctx context.Context, c *app.RequestContext) { + var err error + var req evaluator.GetTemplateV2Request + err = c.BindAndValidate(&req) + if err != nil { + c.String(consts.StatusBadRequest, err.Error()) + return + } + + resp := new(evaluator.GetTemplateV2Response) + + c.JSON(consts.StatusOK, resp) +} diff --git a/backend/api/handler/coze/loop/apis/evaluator_service_test.go b/backend/api/handler/coze/loop/apis/evaluator_service_test.go index c00b77322..0464fabd5 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service_test.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service_test.go @@ -180,23 +180,23 @@ func TestEvaluatorService_Handlers_Smoke(t *testing.T) { for _, cs := range cases { t.Run(cs.name, func(t *testing.T) { - var c *app.RequestContext - switch cs.name { - case "DebugBuiltinEvaluator": - // 需要必填: evaluator_id, workspace_id, input_data（提供最小可解析结构） - c = newJSONCtxWithBody(`{ + var c *app.RequestContext + switch cs.name { + case "DebugBuiltinEvaluator": + // 需要必填: evaluator_id, workspace_id, input_data（提供最小可解析结构） + c = newJSONCtxWithBody(`{ "evaluator_id": 1, "workspace_id": 1, "input_data": {"input_fields": {}} }`) - case "CreateEvaluatorTemplate": - // 需要必填: evaluator_template - c = newJSONCtxWithBody(`{ + case "CreateEvaluatorTemplate": + // 需要必填: evaluator_template + c = newJSONCtxWithBody(`{ "evaluator_template": {} }`) - default: - c = newJSONCtx() - } + default: + c = newJSONCtx() + } cs.fn(ctx, c) assert.Equal(t, http.StatusOK, c.Response.StatusCode()) }) @@ -218,7 +218,7 @@ func TestEvaluatorService_Handlers(t *testing.T) { {name: "ValidateEvaluator", fn: ValidateEvaluator}, {name: "BatchDebugEvaluator", fn: BatchDebugEvaluator}, {name: "ListTemplatesV2", fn: ListTemplatesV2}, - {name: "GetTemplateInfoV2", fn: GetTemplateInfoV2}, + {name: "GetTemplateV2", fn: GetTemplateV2}, {name: "DebugBuiltinEvaluator", fn: DebugBuiltinEvaluator}, {name: "CreateEvaluatorTemplate", fn: CreateEvaluatorTemplate}, {name: "UpdateEvaluatorTemplate", fn: UpdateEvaluatorTemplate}, diff --git a/backend/api/router/coze/loop/apis/coze.loop.apis.go b/backend/api/router/coze/loop/apis/coze.loop.apis.go index 8dc375ffc..0a0154fc6 100644 --- a/backend/api/router/coze/loop/apis/coze.loop.apis.go +++ b/backend/api/router/coze/loop/apis/coze.loop.apis.go @@ -186,6 +186,7 @@ func Register(r *server.Hertz, handler *apis.APIHandler) { } { _evaluator_template0 := _v11.Group("/evaluator_template", _evaluator_template0Mw(handler)...) + _evaluator_template0.POST("/:evaluator_template_id", append(_gettemplatev2Mw(handler), apis.GetTemplateV2)...) _evaluator_template0.POST("/list", append(_listtemplatesv2Mw(handler), apis.ListTemplatesV2)...) } { diff --git a/backend/api/router/coze/loop/apis/middleware.go b/backend/api/router/coze/loop/apis/middleware.go index 8a075f230..2655d3a08 100644 --- a/backend/api/router/coze/loop/apis/middleware.go +++ b/backend/api/router/coze/loop/apis/middleware.go @@ -1675,3 +1675,8 @@ func _evaluator_template0Mw(handler *apis.APIHandler) []app.HandlerFunc { // your code... return nil } + +func _gettemplatev2Mw(handler *apis.APIHandler) []app.HandlerFunc { + // your code... + return nil +} diff --git a/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go b/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go index 671f74cb9..2e04e8f6f 100644 --- a/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go +++ b/backend/kitex_gen/coze/loop/apis/evaluatorservice/client.go @@ -34,6 +34,7 @@ type Client interface { BatchGetEvaluatorRecords(ctx context.Context, req *evaluator.BatchGetEvaluatorRecordsRequest, callOptions ...callopt.Option) (r *evaluator.BatchGetEvaluatorRecordsResponse, err error) ValidateEvaluator(ctx context.Context, request *evaluator.ValidateEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.ValidateEvaluatorResponse, err error) ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (r *evaluator.ListTemplatesV2Response, err error) + GetTemplateV2(ctx context.Context, request *evaluator.GetTemplateV2Request, callOptions ...callopt.Option) (r *evaluator.GetTemplateV2Response, err error) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) @@ -186,6 +187,11 @@ func (p *kEvaluatorServiceClient) ListTemplatesV2(ctx context.Context, request * return p.kClient.ListTemplatesV2(ctx, request) } +func (p *kEvaluatorServiceClient) GetTemplateV2(ctx context.Context, request *evaluator.GetTemplateV2Request, callOptions ...callopt.Option) (r *evaluator.GetTemplateV2Response, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.GetTemplateV2(ctx, request) +} + func (p *kEvaluatorServiceClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { ctx = client.NewCtxWithCallOptions(ctx, callOptions) return p.kClient.CreateEvaluatorTemplate(ctx, request) diff --git a/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go b/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go index 29cf41706..3454d9f5c 100644 --- a/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go +++ b/backend/kitex_gen/coze/loop/apis/evaluatorservice/evaluatorservice.go @@ -175,6 +175,13 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), + "GetTemplateV2": kitex.NewMethodInfo( + getTemplateV2Handler, + newEvaluatorServiceGetTemplateV2Args, + newEvaluatorServiceGetTemplateV2Result, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), "CreateEvaluatorTemplate": kitex.NewMethodInfo( createEvaluatorTemplateHandler, newEvaluatorServiceCreateEvaluatorTemplateArgs, @@ -687,6 +694,25 @@ func newEvaluatorServiceListTemplatesV2Result() interface{} { return evaluator.NewEvaluatorServiceListTemplatesV2Result() } +func getTemplateV2Handler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceGetTemplateV2Args) + realResult := result.(*evaluator.EvaluatorServiceGetTemplateV2Result) + success, err := handler.(evaluator.EvaluatorService).GetTemplateV2(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceGetTemplateV2Args() interface{} { + return evaluator.NewEvaluatorServiceGetTemplateV2Args() +} + +func newEvaluatorServiceGetTemplateV2Result() interface{} { + return evaluator.NewEvaluatorServiceGetTemplateV2Result() +} + func createEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { realArg := arg.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs) realResult := result.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateResult) @@ -1043,6 +1069,16 @@ func (p *kClient) ListTemplatesV2(ctx context.Context, request *evaluator.ListTe return _result.GetSuccess(), nil } +func (p *kClient) GetTemplateV2(ctx context.Context, request *evaluator.GetTemplateV2Request) (r *evaluator.GetTemplateV2Response, err error) { + var _args evaluator.EvaluatorServiceGetTemplateV2Args + _args.Request = request + var _result evaluator.EvaluatorServiceGetTemplateV2Result + if err = p.c.Call(ctx, "GetTemplateV2", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + func (p *kClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { var _args evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs _args.Request = request diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go index fceabc98f..36d52d0bf 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go @@ -18435,53 +18435,53 @@ func (p *ListTemplatesV2Response) Field255DeepEqual(src *base.BaseResp) bool { return true } -type GetTemplateInfoV2Request struct { - EvaluatorTemplateID int64 `thrift:"evaluator_template_id,1,required" frugal:"1,required,i64" json:"evaluator_template_id" form:"evaluator_template_id,required" ` +type GetTemplateV2Request struct { + EvaluatorTemplateID int64 `thrift:"evaluator_template_id,1,required" frugal:"1,required,i64" json:"evaluator_template_id" path:"evaluator_template_id,required" ` Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } -func NewGetTemplateInfoV2Request() *GetTemplateInfoV2Request { - return &GetTemplateInfoV2Request{} +func NewGetTemplateV2Request() *GetTemplateV2Request { + return &GetTemplateV2Request{} } -func (p *GetTemplateInfoV2Request) InitDefault() { +func (p *GetTemplateV2Request) InitDefault() { } -func (p *GetTemplateInfoV2Request) GetEvaluatorTemplateID() (v int64) { +func (p *GetTemplateV2Request) GetEvaluatorTemplateID() (v int64) { if p != nil { return p.EvaluatorTemplateID } return } -var GetTemplateInfoV2Request_Base_DEFAULT *base.Base +var GetTemplateV2Request_Base_DEFAULT *base.Base -func (p *GetTemplateInfoV2Request) GetBase() (v *base.Base) { +func (p *GetTemplateV2Request) GetBase() (v *base.Base) { if p == nil { return } if !p.IsSetBase() { - return GetTemplateInfoV2Request_Base_DEFAULT + return GetTemplateV2Request_Base_DEFAULT } return p.Base } -func (p *GetTemplateInfoV2Request) SetEvaluatorTemplateID(val int64) { +func (p *GetTemplateV2Request) SetEvaluatorTemplateID(val int64) { p.EvaluatorTemplateID = val } -func (p *GetTemplateInfoV2Request) SetBase(val *base.Base) { +func (p *GetTemplateV2Request) SetBase(val *base.Base) { p.Base = val } -var fieldIDToName_GetTemplateInfoV2Request = map[int16]string{ +var fieldIDToName_GetTemplateV2Request = map[int16]string{ 1: "evaluator_template_id", 255: "Base", } -func (p *GetTemplateInfoV2Request) IsSetBase() bool { +func (p *GetTemplateV2Request) IsSetBase() bool { return p.Base != nil } -func (p *GetTemplateInfoV2Request) Read(iprot thrift.TProtocol) (err error) { +func (p *GetTemplateV2Request) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 var issetEvaluatorTemplateID bool = false @@ -18540,7 +18540,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateInfoV2Request[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateV2Request[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -18549,10 +18549,10 @@ ReadFieldEndError: ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) RequiredFieldNotSetError: - return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_GetTemplateInfoV2Request[fieldId])) + return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_GetTemplateV2Request[fieldId])) } -func (p *GetTemplateInfoV2Request) ReadField1(iprot thrift.TProtocol) error { +func (p *GetTemplateV2Request) ReadField1(iprot thrift.TProtocol) error { var _field int64 if v, err := iprot.ReadI64(); err != nil { @@ -18563,7 +18563,7 @@ func (p *GetTemplateInfoV2Request) ReadField1(iprot thrift.TProtocol) error { p.EvaluatorTemplateID = _field return nil } -func (p *GetTemplateInfoV2Request) ReadField255(iprot thrift.TProtocol) error { +func (p *GetTemplateV2Request) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBase() if err := _field.Read(iprot); err != nil { return err @@ -18572,9 +18572,9 @@ func (p *GetTemplateInfoV2Request) ReadField255(iprot thrift.TProtocol) error { return nil } -func (p *GetTemplateInfoV2Request) Write(oprot thrift.TProtocol) (err error) { +func (p *GetTemplateV2Request) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetTemplateInfoV2Request"); err != nil { + if err = oprot.WriteStructBegin("GetTemplateV2Request"); err != nil { goto WriteStructBeginError } if p != nil { @@ -18604,7 +18604,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *GetTemplateInfoV2Request) writeField1(oprot thrift.TProtocol) (err error) { +func (p *GetTemplateV2Request) writeField1(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("evaluator_template_id", thrift.I64, 1); err != nil { goto WriteFieldBeginError } @@ -18620,7 +18620,7 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *GetTemplateInfoV2Request) writeField255(oprot thrift.TProtocol) (err error) { +func (p *GetTemplateV2Request) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { goto WriteFieldBeginError @@ -18639,15 +18639,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) } -func (p *GetTemplateInfoV2Request) String() string { +func (p *GetTemplateV2Request) String() string { if p == nil { return "" } - return fmt.Sprintf("GetTemplateInfoV2Request(%+v)", *p) + return fmt.Sprintf("GetTemplateV2Request(%+v)", *p) } -func (p *GetTemplateInfoV2Request) DeepEqual(ano *GetTemplateInfoV2Request) bool { +func (p *GetTemplateV2Request) DeepEqual(ano *GetTemplateV2Request) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -18662,14 +18662,14 @@ func (p *GetTemplateInfoV2Request) DeepEqual(ano *GetTemplateInfoV2Request) bool return true } -func (p *GetTemplateInfoV2Request) Field1DeepEqual(src int64) bool { +func (p *GetTemplateV2Request) Field1DeepEqual(src int64) bool { if p.EvaluatorTemplateID != src { return false } return true } -func (p *GetTemplateInfoV2Request) Field255DeepEqual(src *base.Base) bool { +func (p *GetTemplateV2Request) Field255DeepEqual(src *base.Base) bool { if !p.Base.DeepEqual(src) { return false @@ -18677,62 +18677,62 @@ func (p *GetTemplateInfoV2Request) Field255DeepEqual(src *base.Base) bool { return true } -type GetTemplateInfoV2Response struct { +type GetTemplateV2Response struct { EvaluatorTemplate *evaluator.EvaluatorTemplate `thrift:"evaluator_template,1,optional" frugal:"1,optional,evaluator.EvaluatorTemplate" form:"evaluator_template" json:"evaluator_template,omitempty"` BaseResp *base.BaseResp `thrift:"BaseResp,255" frugal:"255,default,base.BaseResp" form:"BaseResp" json:"BaseResp" query:"BaseResp"` } -func NewGetTemplateInfoV2Response() *GetTemplateInfoV2Response { - return &GetTemplateInfoV2Response{} +func NewGetTemplateV2Response() *GetTemplateV2Response { + return &GetTemplateV2Response{} } -func (p *GetTemplateInfoV2Response) InitDefault() { +func (p *GetTemplateV2Response) InitDefault() { } -var GetTemplateInfoV2Response_EvaluatorTemplate_DEFAULT *evaluator.EvaluatorTemplate +var GetTemplateV2Response_EvaluatorTemplate_DEFAULT *evaluator.EvaluatorTemplate -func (p *GetTemplateInfoV2Response) GetEvaluatorTemplate() (v *evaluator.EvaluatorTemplate) { +func (p *GetTemplateV2Response) GetEvaluatorTemplate() (v *evaluator.EvaluatorTemplate) { if p == nil { return } if !p.IsSetEvaluatorTemplate() { - return GetTemplateInfoV2Response_EvaluatorTemplate_DEFAULT + return GetTemplateV2Response_EvaluatorTemplate_DEFAULT } return p.EvaluatorTemplate } -var GetTemplateInfoV2Response_BaseResp_DEFAULT *base.BaseResp +var GetTemplateV2Response_BaseResp_DEFAULT *base.BaseResp -func (p *GetTemplateInfoV2Response) GetBaseResp() (v *base.BaseResp) { +func (p *GetTemplateV2Response) GetBaseResp() (v *base.BaseResp) { if p == nil { return } if !p.IsSetBaseResp() { - return GetTemplateInfoV2Response_BaseResp_DEFAULT + return GetTemplateV2Response_BaseResp_DEFAULT } return p.BaseResp } -func (p *GetTemplateInfoV2Response) SetEvaluatorTemplate(val *evaluator.EvaluatorTemplate) { +func (p *GetTemplateV2Response) SetEvaluatorTemplate(val *evaluator.EvaluatorTemplate) { p.EvaluatorTemplate = val } -func (p *GetTemplateInfoV2Response) SetBaseResp(val *base.BaseResp) { +func (p *GetTemplateV2Response) SetBaseResp(val *base.BaseResp) { p.BaseResp = val } -var fieldIDToName_GetTemplateInfoV2Response = map[int16]string{ +var fieldIDToName_GetTemplateV2Response = map[int16]string{ 1: "evaluator_template", 255: "BaseResp", } -func (p *GetTemplateInfoV2Response) IsSetEvaluatorTemplate() bool { +func (p *GetTemplateV2Response) IsSetEvaluatorTemplate() bool { return p.EvaluatorTemplate != nil } -func (p *GetTemplateInfoV2Response) IsSetBaseResp() bool { +func (p *GetTemplateV2Response) IsSetBaseResp() bool { return p.BaseResp != nil } -func (p *GetTemplateInfoV2Response) Read(iprot thrift.TProtocol) (err error) { +func (p *GetTemplateV2Response) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -18785,7 +18785,7 @@ ReadStructBeginError: ReadFieldBeginError: return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateInfoV2Response[fieldId]), err) + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateV2Response[fieldId]), err) SkipFieldError: return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) @@ -18795,7 +18795,7 @@ ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) } -func (p *GetTemplateInfoV2Response) ReadField1(iprot thrift.TProtocol) error { +func (p *GetTemplateV2Response) ReadField1(iprot thrift.TProtocol) error { _field := evaluator.NewEvaluatorTemplate() if err := _field.Read(iprot); err != nil { return err @@ -18803,7 +18803,7 @@ func (p *GetTemplateInfoV2Response) ReadField1(iprot thrift.TProtocol) error { p.EvaluatorTemplate = _field return nil } -func (p *GetTemplateInfoV2Response) ReadField255(iprot thrift.TProtocol) error { +func (p *GetTemplateV2Response) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBaseResp() if err := _field.Read(iprot); err != nil { return err @@ -18812,9 +18812,9 @@ func (p *GetTemplateInfoV2Response) ReadField255(iprot thrift.TProtocol) error { return nil } -func (p *GetTemplateInfoV2Response) Write(oprot thrift.TProtocol) (err error) { +func (p *GetTemplateV2Response) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 - if err = oprot.WriteStructBegin("GetTemplateInfoV2Response"); err != nil { + if err = oprot.WriteStructBegin("GetTemplateV2Response"); err != nil { goto WriteStructBeginError } if p != nil { @@ -18844,7 +18844,7 @@ WriteStructEndError: return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) } -func (p *GetTemplateInfoV2Response) writeField1(oprot thrift.TProtocol) (err error) { +func (p *GetTemplateV2Response) writeField1(oprot thrift.TProtocol) (err error) { if p.IsSetEvaluatorTemplate() { if err = oprot.WriteFieldBegin("evaluator_template", thrift.STRUCT, 1); err != nil { goto WriteFieldBeginError @@ -18862,7 +18862,7 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } -func (p *GetTemplateInfoV2Response) writeField255(oprot thrift.TProtocol) (err error) { +func (p *GetTemplateV2Response) writeField255(oprot thrift.TProtocol) (err error) { if err = oprot.WriteFieldBegin("BaseResp", thrift.STRUCT, 255); err != nil { goto WriteFieldBeginError } @@ -18879,15 +18879,15 @@ WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 255 end error: ", p), err) } -func (p *GetTemplateInfoV2Response) String() string { +func (p *GetTemplateV2Response) String() string { if p == nil { return "" } - return fmt.Sprintf("GetTemplateInfoV2Response(%+v)", *p) + return fmt.Sprintf("GetTemplateV2Response(%+v)", *p) } -func (p *GetTemplateInfoV2Response) DeepEqual(ano *GetTemplateInfoV2Response) bool { +func (p *GetTemplateV2Response) DeepEqual(ano *GetTemplateV2Response) bool { if p == ano { return true } else if p == nil || ano == nil { @@ -18902,14 +18902,14 @@ func (p *GetTemplateInfoV2Response) DeepEqual(ano *GetTemplateInfoV2Response) bo return true } -func (p *GetTemplateInfoV2Response) Field1DeepEqual(src *evaluator.EvaluatorTemplate) bool { +func (p *GetTemplateV2Response) Field1DeepEqual(src *evaluator.EvaluatorTemplate) bool { if !p.EvaluatorTemplate.DeepEqual(src) { return false } return true } -func (p *GetTemplateInfoV2Response) Field255DeepEqual(src *base.BaseResp) bool { +func (p *GetTemplateV2Response) Field255DeepEqual(src *base.BaseResp) bool { if !p.BaseResp.DeepEqual(src) { return false @@ -22276,6 +22276,8 @@ type EvaluatorService interface { ValidateEvaluator(ctx context.Context, request *ValidateEvaluatorRequest) (r *ValidateEvaluatorResponse, err error) // 查询评估器模板 ListTemplatesV2(ctx context.Context, request *ListTemplatesV2Request) (r *ListTemplatesV2Response, err error) + + GetTemplateV2(ctx context.Context, request *GetTemplateV2Request) (r *GetTemplateV2Response, err error) // 创建评估器模板 CreateEvaluatorTemplate(ctx context.Context, request *CreateEvaluatorTemplateRequest) (r *CreateEvaluatorTemplateResponse, err error) // 更新评估器模板 @@ -22523,6 +22525,15 @@ func (p *EvaluatorServiceClient) ListTemplatesV2(ctx context.Context, request *L } return _result.GetSuccess(), nil } +func (p *EvaluatorServiceClient) GetTemplateV2(ctx context.Context, request *GetTemplateV2Request) (r *GetTemplateV2Response, err error) { + var _args EvaluatorServiceGetTemplateV2Args + _args.Request = request + var _result EvaluatorServiceGetTemplateV2Result + if err = p.Client_().Call(ctx, "GetTemplateV2", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} func (p *EvaluatorServiceClient) CreateEvaluatorTemplate(ctx context.Context, request *CreateEvaluatorTemplateRequest) (r *CreateEvaluatorTemplateResponse, err error) { var _args EvaluatorServiceCreateEvaluatorTemplateArgs _args.Request = request @@ -22621,6 +22632,7 @@ func NewEvaluatorServiceProcessor(handler EvaluatorService) *EvaluatorServicePro self.AddToProcessorMap("BatchGetEvaluatorRecords", &evaluatorServiceProcessorBatchGetEvaluatorRecords{handler: handler}) self.AddToProcessorMap("ValidateEvaluator", &evaluatorServiceProcessorValidateEvaluator{handler: handler}) self.AddToProcessorMap("ListTemplatesV2", &evaluatorServiceProcessorListTemplatesV2{handler: handler}) + self.AddToProcessorMap("GetTemplateV2", &evaluatorServiceProcessorGetTemplateV2{handler: handler}) self.AddToProcessorMap("CreateEvaluatorTemplate", &evaluatorServiceProcessorCreateEvaluatorTemplate{handler: handler}) self.AddToProcessorMap("UpdateEvaluatorTemplate", &evaluatorServiceProcessorUpdateEvaluatorTemplate{handler: handler}) self.AddToProcessorMap("DeleteEvaluatorTemplate", &evaluatorServiceProcessorDeleteEvaluatorTemplate{handler: handler}) @@ -23751,6 +23763,54 @@ func (p *evaluatorServiceProcessorListTemplatesV2) Process(ctx context.Context, return true, err } +type evaluatorServiceProcessorGetTemplateV2 struct { + handler EvaluatorService +} + +func (p *evaluatorServiceProcessorGetTemplateV2) Process(ctx context.Context, seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := EvaluatorServiceGetTemplateV2Args{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("GetTemplateV2", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return false, err + } + + iprot.ReadMessageEnd() + var err2 error + result := EvaluatorServiceGetTemplateV2Result{} + var retval *GetTemplateV2Response + if retval, err2 = p.handler.GetTemplateV2(ctx, args.Request); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing GetTemplateV2: "+err2.Error()) + oprot.WriteMessageBegin("GetTemplateV2", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush(ctx) + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("GetTemplateV2", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(ctx); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + type evaluatorServiceProcessorCreateEvaluatorTemplate struct { handler EvaluatorService } @@ -31951,6 +32011,350 @@ func (p *EvaluatorServiceListTemplatesV2Result) Field0DeepEqual(src *ListTemplat return true } +type EvaluatorServiceGetTemplateV2Args struct { + Request *GetTemplateV2Request `thrift:"request,1" frugal:"1,default,GetTemplateV2Request"` +} + +func NewEvaluatorServiceGetTemplateV2Args() *EvaluatorServiceGetTemplateV2Args { + return &EvaluatorServiceGetTemplateV2Args{} +} + +func (p *EvaluatorServiceGetTemplateV2Args) InitDefault() { +} + +var EvaluatorServiceGetTemplateV2Args_Request_DEFAULT *GetTemplateV2Request + +func (p *EvaluatorServiceGetTemplateV2Args) GetRequest() (v *GetTemplateV2Request) { + if p == nil { + return + } + if !p.IsSetRequest() { + return EvaluatorServiceGetTemplateV2Args_Request_DEFAULT + } + return p.Request +} +func (p *EvaluatorServiceGetTemplateV2Args) SetRequest(val *GetTemplateV2Request) { + p.Request = val +} + +var fieldIDToName_EvaluatorServiceGetTemplateV2Args = map[int16]string{ + 1: "request", +} + +func (p *EvaluatorServiceGetTemplateV2Args) IsSetRequest() bool { + return p.Request != nil +} + +func (p *EvaluatorServiceGetTemplateV2Args) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateV2Args[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceGetTemplateV2Args) ReadField1(iprot thrift.TProtocol) error { + _field := NewGetTemplateV2Request() + if err := _field.Read(iprot); err != nil { + return err + } + p.Request = _field + return nil +} + +func (p *EvaluatorServiceGetTemplateV2Args) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("GetTemplateV2_args"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorServiceGetTemplateV2Args) writeField1(oprot thrift.TProtocol) (err error) { + if err = oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { + goto WriteFieldBeginError + } + if err := p.Request.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} + +func (p *EvaluatorServiceGetTemplateV2Args) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorServiceGetTemplateV2Args(%+v)", *p) + +} + +func (p *EvaluatorServiceGetTemplateV2Args) DeepEqual(ano *EvaluatorServiceGetTemplateV2Args) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Request) { + return false + } + return true +} + +func (p *EvaluatorServiceGetTemplateV2Args) Field1DeepEqual(src *GetTemplateV2Request) bool { + + if !p.Request.DeepEqual(src) { + return false + } + return true +} + +type EvaluatorServiceGetTemplateV2Result struct { + Success *GetTemplateV2Response `thrift:"success,0,optional" frugal:"0,optional,GetTemplateV2Response"` +} + +func NewEvaluatorServiceGetTemplateV2Result() *EvaluatorServiceGetTemplateV2Result { + return &EvaluatorServiceGetTemplateV2Result{} +} + +func (p *EvaluatorServiceGetTemplateV2Result) InitDefault() { +} + +var EvaluatorServiceGetTemplateV2Result_Success_DEFAULT *GetTemplateV2Response + +func (p *EvaluatorServiceGetTemplateV2Result) GetSuccess() (v *GetTemplateV2Response) { + if p == nil { + return + } + if !p.IsSetSuccess() { + return EvaluatorServiceGetTemplateV2Result_Success_DEFAULT + } + return p.Success +} +func (p *EvaluatorServiceGetTemplateV2Result) SetSuccess(x interface{}) { + p.Success = x.(*GetTemplateV2Response) +} + +var fieldIDToName_EvaluatorServiceGetTemplateV2Result = map[int16]string{ + 0: "success", +} + +func (p *EvaluatorServiceGetTemplateV2Result) IsSetSuccess() bool { + return p.Success != nil +} + +func (p *EvaluatorServiceGetTemplateV2Result) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField0(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateV2Result[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *EvaluatorServiceGetTemplateV2Result) ReadField0(iprot thrift.TProtocol) error { + _field := NewGetTemplateV2Response() + if err := _field.Read(iprot); err != nil { + return err + } + p.Success = _field + return nil +} + +func (p *EvaluatorServiceGetTemplateV2Result) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("GetTemplateV2_result"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField0(oprot); err != nil { + fieldId = 0 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *EvaluatorServiceGetTemplateV2Result) writeField0(oprot thrift.TProtocol) (err error) { + if p.IsSetSuccess() { + if err = oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { + goto WriteFieldBeginError + } + if err := p.Success.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 0 end error: ", p), err) +} + +func (p *EvaluatorServiceGetTemplateV2Result) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("EvaluatorServiceGetTemplateV2Result(%+v)", *p) + +} + +func (p *EvaluatorServiceGetTemplateV2Result) DeepEqual(ano *EvaluatorServiceGetTemplateV2Result) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field0DeepEqual(ano.Success) { + return false + } + return true +} + +func (p *EvaluatorServiceGetTemplateV2Result) Field0DeepEqual(src *GetTemplateV2Response) bool { + + if !p.Success.DeepEqual(src) { + return false + } + return true +} + type EvaluatorServiceCreateEvaluatorTemplateArgs struct { Request *CreateEvaluatorTemplateRequest `thrift:"request,1" frugal:"1,default,CreateEvaluatorTemplateRequest"` } diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go index dcef7dfa3..e08876a63 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator_validator.go @@ -569,7 +569,7 @@ func (p *ListTemplatesV2Response) IsValid() error { } return nil } -func (p *GetTemplateInfoV2Request) IsValid() error { +func (p *GetTemplateV2Request) IsValid() error { if p.Base != nil { if err := p.Base.IsValid(); err != nil { return fmt.Errorf("field Base not valid, %w", err) @@ -577,7 +577,7 @@ func (p *GetTemplateInfoV2Request) IsValid() error { } return nil } -func (p *GetTemplateInfoV2Response) IsValid() error { +func (p *GetTemplateV2Response) IsValid() error { if p.EvaluatorTemplate != nil { if err := p.EvaluatorTemplate.IsValid(); err != nil { return fmt.Errorf("field EvaluatorTemplate not valid, %w", err) diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go index 671f74cb9..2e04e8f6f 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/client.go @@ -34,6 +34,7 @@ type Client interface { BatchGetEvaluatorRecords(ctx context.Context, req *evaluator.BatchGetEvaluatorRecordsRequest, callOptions ...callopt.Option) (r *evaluator.BatchGetEvaluatorRecordsResponse, err error) ValidateEvaluator(ctx context.Context, request *evaluator.ValidateEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.ValidateEvaluatorResponse, err error) ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (r *evaluator.ListTemplatesV2Response, err error) + GetTemplateV2(ctx context.Context, request *evaluator.GetTemplateV2Request, callOptions ...callopt.Option) (r *evaluator.GetTemplateV2Response, err error) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) @@ -186,6 +187,11 @@ func (p *kEvaluatorServiceClient) ListTemplatesV2(ctx context.Context, request * return p.kClient.ListTemplatesV2(ctx, request) } +func (p *kEvaluatorServiceClient) GetTemplateV2(ctx context.Context, request *evaluator.GetTemplateV2Request, callOptions ...callopt.Option) (r *evaluator.GetTemplateV2Response, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.GetTemplateV2(ctx, request) +} + func (p *kEvaluatorServiceClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { ctx = client.NewCtxWithCallOptions(ctx, callOptions) return p.kClient.CreateEvaluatorTemplate(ctx, request) diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go index 185d03f08..45537d058 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/evaluatorservice/evaluatorservice.go @@ -174,6 +174,13 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), + "GetTemplateV2": kitex.NewMethodInfo( + getTemplateV2Handler, + newEvaluatorServiceGetTemplateV2Args, + newEvaluatorServiceGetTemplateV2Result, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), "CreateEvaluatorTemplate": kitex.NewMethodInfo( createEvaluatorTemplateHandler, newEvaluatorServiceCreateEvaluatorTemplateArgs, @@ -686,6 +693,25 @@ func newEvaluatorServiceListTemplatesV2Result() interface{} { return evaluator.NewEvaluatorServiceListTemplatesV2Result() } +func getTemplateV2Handler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceGetTemplateV2Args) + realResult := result.(*evaluator.EvaluatorServiceGetTemplateV2Result) + success, err := handler.(evaluator.EvaluatorService).GetTemplateV2(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceGetTemplateV2Args() interface{} { + return evaluator.NewEvaluatorServiceGetTemplateV2Args() +} + +func newEvaluatorServiceGetTemplateV2Result() interface{} { + return evaluator.NewEvaluatorServiceGetTemplateV2Result() +} + func createEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { realArg := arg.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs) realResult := result.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateResult) @@ -1042,6 +1068,16 @@ func (p *kClient) ListTemplatesV2(ctx context.Context, request *evaluator.ListTe return _result.GetSuccess(), nil } +func (p *kClient) GetTemplateV2(ctx context.Context, request *evaluator.GetTemplateV2Request) (r *evaluator.GetTemplateV2Response, err error) { + var _args evaluator.EvaluatorServiceGetTemplateV2Args + _args.Request = request + var _result evaluator.EvaluatorServiceGetTemplateV2Result + if err = p.c.Call(ctx, "GetTemplateV2", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + func (p *kClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { var _args evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs _args.Request = request diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go index 733ee577f..27b9d08dc 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go @@ -13433,7 +13433,7 @@ func (p *ListTemplatesV2Response) DeepCopy(s interface{}) error { return nil } -func (p *GetTemplateInfoV2Request) FastRead(buf []byte) (int, error) { +func (p *GetTemplateV2Request) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13497,14 +13497,14 @@ func (p *GetTemplateInfoV2Request) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateInfoV2Request[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateV2Request[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) RequiredFieldNotSetError: - return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_GetTemplateInfoV2Request[fieldId])) + return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_GetTemplateV2Request[fieldId])) } -func (p *GetTemplateInfoV2Request) FastReadField1(buf []byte) (int, error) { +func (p *GetTemplateV2Request) FastReadField1(buf []byte) (int, error) { offset := 0 var _field int64 @@ -13518,7 +13518,7 @@ func (p *GetTemplateInfoV2Request) FastReadField1(buf []byte) (int, error) { return offset, nil } -func (p *GetTemplateInfoV2Request) FastReadField255(buf []byte) (int, error) { +func (p *GetTemplateV2Request) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBase() if l, err := _field.FastRead(buf[offset:]); err != nil { @@ -13530,11 +13530,11 @@ func (p *GetTemplateInfoV2Request) FastReadField255(buf []byte) (int, error) { return offset, nil } -func (p *GetTemplateInfoV2Request) FastWrite(buf []byte) int { +func (p *GetTemplateV2Request) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *GetTemplateInfoV2Request) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *GetTemplateV2Request) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -13544,7 +13544,7 @@ func (p *GetTemplateInfoV2Request) FastWriteNocopy(buf []byte, w thrift.NocopyWr return offset } -func (p *GetTemplateInfoV2Request) BLength() int { +func (p *GetTemplateV2Request) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -13554,14 +13554,14 @@ func (p *GetTemplateInfoV2Request) BLength() int { return l } -func (p *GetTemplateInfoV2Request) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *GetTemplateV2Request) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) offset += thrift.Binary.WriteI64(buf[offset:], p.EvaluatorTemplateID) return offset } -func (p *GetTemplateInfoV2Request) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { +func (p *GetTemplateV2Request) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetBase() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) @@ -13570,14 +13570,14 @@ func (p *GetTemplateInfoV2Request) fastWriteField255(buf []byte, w thrift.Nocopy return offset } -func (p *GetTemplateInfoV2Request) field1Length() int { +func (p *GetTemplateV2Request) field1Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += thrift.Binary.I64Length() return l } -func (p *GetTemplateInfoV2Request) field255Length() int { +func (p *GetTemplateV2Request) field255Length() int { l := 0 if p.IsSetBase() { l += thrift.Binary.FieldBeginLength() @@ -13586,8 +13586,8 @@ func (p *GetTemplateInfoV2Request) field255Length() int { return l } -func (p *GetTemplateInfoV2Request) DeepCopy(s interface{}) error { - src, ok := s.(*GetTemplateInfoV2Request) +func (p *GetTemplateV2Request) DeepCopy(s interface{}) error { + src, ok := s.(*GetTemplateV2Request) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } @@ -13606,7 +13606,7 @@ func (p *GetTemplateInfoV2Request) DeepCopy(s interface{}) error { return nil } -func (p *GetTemplateInfoV2Response) FastRead(buf []byte) (int, error) { +func (p *GetTemplateV2Response) FastRead(buf []byte) (int, error) { var err error var offset int @@ -13664,12 +13664,12 @@ func (p *GetTemplateInfoV2Response) FastRead(buf []byte) (int, error) { ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) ReadFieldError: - return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateInfoV2Response[fieldId]), err) + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateV2Response[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) } -func (p *GetTemplateInfoV2Response) FastReadField1(buf []byte) (int, error) { +func (p *GetTemplateV2Response) FastReadField1(buf []byte) (int, error) { offset := 0 _field := evaluator.NewEvaluatorTemplate() if l, err := _field.FastRead(buf[offset:]); err != nil { @@ -13681,7 +13681,7 @@ func (p *GetTemplateInfoV2Response) FastReadField1(buf []byte) (int, error) { return offset, nil } -func (p *GetTemplateInfoV2Response) FastReadField255(buf []byte) (int, error) { +func (p *GetTemplateV2Response) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBaseResp() if l, err := _field.FastRead(buf[offset:]); err != nil { @@ -13693,11 +13693,11 @@ func (p *GetTemplateInfoV2Response) FastReadField255(buf []byte) (int, error) { return offset, nil } -func (p *GetTemplateInfoV2Response) FastWrite(buf []byte) int { +func (p *GetTemplateV2Response) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } -func (p *GetTemplateInfoV2Response) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { +func (p *GetTemplateV2Response) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) @@ -13707,7 +13707,7 @@ func (p *GetTemplateInfoV2Response) FastWriteNocopy(buf []byte, w thrift.NocopyW return offset } -func (p *GetTemplateInfoV2Response) BLength() int { +func (p *GetTemplateV2Response) BLength() int { l := 0 if p != nil { l += p.field1Length() @@ -13717,7 +13717,7 @@ func (p *GetTemplateInfoV2Response) BLength() int { return l } -func (p *GetTemplateInfoV2Response) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { +func (p *GetTemplateV2Response) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 if p.IsSetEvaluatorTemplate() { offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) @@ -13726,14 +13726,14 @@ func (p *GetTemplateInfoV2Response) fastWriteField1(buf []byte, w thrift.NocopyW return offset } -func (p *GetTemplateInfoV2Response) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { +func (p *GetTemplateV2Response) fastWriteField255(buf []byte, w thrift.NocopyWriter) int { offset := 0 offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 255) offset += p.BaseResp.FastWriteNocopy(buf[offset:], w) return offset } -func (p *GetTemplateInfoV2Response) field1Length() int { +func (p *GetTemplateV2Response) field1Length() int { l := 0 if p.IsSetEvaluatorTemplate() { l += thrift.Binary.FieldBeginLength() @@ -13742,15 +13742,15 @@ func (p *GetTemplateInfoV2Response) field1Length() int { return l } -func (p *GetTemplateInfoV2Response) field255Length() int { +func (p *GetTemplateV2Response) field255Length() int { l := 0 l += thrift.Binary.FieldBeginLength() l += p.BaseResp.BLength() return l } -func (p *GetTemplateInfoV2Response) DeepCopy(s interface{}) error { - src, ok := s.(*GetTemplateInfoV2Response) +func (p *GetTemplateV2Response) DeepCopy(s interface{}) error { + src, ok := s.(*GetTemplateV2Response) if !ok { return fmt.Errorf("%T's type not matched %T", s, p) } @@ -21583,6 +21583,240 @@ func (p *EvaluatorServiceListTemplatesV2Result) DeepCopy(s interface{}) error { return nil } +func (p *EvaluatorServiceGetTemplateV2Args) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField1(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateV2Args[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceGetTemplateV2Args) FastReadField1(buf []byte) (int, error) { + offset := 0 + _field := NewGetTemplateV2Request() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Request = _field + return offset, nil +} + +func (p *EvaluatorServiceGetTemplateV2Args) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceGetTemplateV2Args) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceGetTemplateV2Args) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceGetTemplateV2Args) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 1) + offset += p.Request.FastWriteNocopy(buf[offset:], w) + return offset +} + +func (p *EvaluatorServiceGetTemplateV2Args) field1Length() int { + l := 0 + l += thrift.Binary.FieldBeginLength() + l += p.Request.BLength() + return l +} + +func (p *EvaluatorServiceGetTemplateV2Args) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetTemplateV2Args) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _request *GetTemplateV2Request + if src.Request != nil { + _request = &GetTemplateV2Request{} + if err := _request.DeepCopy(src.Request); err != nil { + return err + } + } + p.Request = _request + + return nil +} + +func (p *EvaluatorServiceGetTemplateV2Result) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField0(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_EvaluatorServiceGetTemplateV2Result[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *EvaluatorServiceGetTemplateV2Result) FastReadField0(buf []byte) (int, error) { + offset := 0 + _field := NewGetTemplateV2Response() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.Success = _field + return offset, nil +} + +func (p *EvaluatorServiceGetTemplateV2Result) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *EvaluatorServiceGetTemplateV2Result) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField0(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *EvaluatorServiceGetTemplateV2Result) BLength() int { + l := 0 + if p != nil { + l += p.field0Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *EvaluatorServiceGetTemplateV2Result) fastWriteField0(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetSuccess() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 0) + offset += p.Success.FastWriteNocopy(buf[offset:], w) + } + return offset +} + +func (p *EvaluatorServiceGetTemplateV2Result) field0Length() int { + l := 0 + if p.IsSetSuccess() { + l += thrift.Binary.FieldBeginLength() + l += p.Success.BLength() + } + return l +} + +func (p *EvaluatorServiceGetTemplateV2Result) DeepCopy(s interface{}) error { + src, ok := s.(*EvaluatorServiceGetTemplateV2Result) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + var _success *GetTemplateV2Response + if src.Success != nil { + _success = &GetTemplateV2Response{} + if err := _success.DeepCopy(src.Success); err != nil { + return err + } + } + p.Success = _success + + return nil +} + func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) FastRead(buf []byte) (int, error) { var err error @@ -23171,6 +23405,14 @@ func (p *EvaluatorServiceListTemplatesV2Result) GetResult() interface{} { return p.Success } +func (p *EvaluatorServiceGetTemplateV2Args) GetFirstArgument() interface{} { + return p.Request +} + +func (p *EvaluatorServiceGetTemplateV2Result) GetResult() interface{} { + return p.Success +} + func (p *EvaluatorServiceCreateEvaluatorTemplateArgs) GetFirstArgument() interface{} { return p.Request } diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go index 671f74cb9..2e04e8f6f 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/client.go @@ -34,6 +34,7 @@ type Client interface { BatchGetEvaluatorRecords(ctx context.Context, req *evaluator.BatchGetEvaluatorRecordsRequest, callOptions ...callopt.Option) (r *evaluator.BatchGetEvaluatorRecordsResponse, err error) ValidateEvaluator(ctx context.Context, request *evaluator.ValidateEvaluatorRequest, callOptions ...callopt.Option) (r *evaluator.ValidateEvaluatorResponse, err error) ListTemplatesV2(ctx context.Context, request *evaluator.ListTemplatesV2Request, callOptions ...callopt.Option) (r *evaluator.ListTemplatesV2Response, err error) + GetTemplateV2(ctx context.Context, request *evaluator.GetTemplateV2Request, callOptions ...callopt.Option) (r *evaluator.GetTemplateV2Response, err error) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) UpdateEvaluatorTemplate(ctx context.Context, request *evaluator.UpdateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.UpdateEvaluatorTemplateResponse, err error) DeleteEvaluatorTemplate(ctx context.Context, request *evaluator.DeleteEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.DeleteEvaluatorTemplateResponse, err error) @@ -186,6 +187,11 @@ func (p *kEvaluatorServiceClient) ListTemplatesV2(ctx context.Context, request * return p.kClient.ListTemplatesV2(ctx, request) } +func (p *kEvaluatorServiceClient) GetTemplateV2(ctx context.Context, request *evaluator.GetTemplateV2Request, callOptions ...callopt.Option) (r *evaluator.GetTemplateV2Response, err error) { + ctx = client.NewCtxWithCallOptions(ctx, callOptions) + return p.kClient.GetTemplateV2(ctx, request) +} + func (p *kEvaluatorServiceClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { ctx = client.NewCtxWithCallOptions(ctx, callOptions) return p.kClient.CreateEvaluatorTemplate(ctx, request) diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go index ac18d9cd1..5269b0ec6 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluatorservice/evaluatorservice.go @@ -175,6 +175,13 @@ var serviceMethods = map[string]kitex.MethodInfo{ false, kitex.WithStreamingMode(kitex.StreamingNone), ), + "GetTemplateV2": kitex.NewMethodInfo( + getTemplateV2Handler, + newEvaluatorServiceGetTemplateV2Args, + newEvaluatorServiceGetTemplateV2Result, + false, + kitex.WithStreamingMode(kitex.StreamingNone), + ), "CreateEvaluatorTemplate": kitex.NewMethodInfo( createEvaluatorTemplateHandler, newEvaluatorServiceCreateEvaluatorTemplateArgs, @@ -687,6 +694,25 @@ func newEvaluatorServiceListTemplatesV2Result() interface{} { return evaluator.NewEvaluatorServiceListTemplatesV2Result() } +func getTemplateV2Handler(ctx context.Context, handler interface{}, arg, result interface{}) error { + realArg := arg.(*evaluator.EvaluatorServiceGetTemplateV2Args) + realResult := result.(*evaluator.EvaluatorServiceGetTemplateV2Result) + success, err := handler.(evaluator.EvaluatorService).GetTemplateV2(ctx, realArg.Request) + if err != nil { + return err + } + realResult.Success = success + return nil +} + +func newEvaluatorServiceGetTemplateV2Args() interface{} { + return evaluator.NewEvaluatorServiceGetTemplateV2Args() +} + +func newEvaluatorServiceGetTemplateV2Result() interface{} { + return evaluator.NewEvaluatorServiceGetTemplateV2Result() +} + func createEvaluatorTemplateHandler(ctx context.Context, handler interface{}, arg, result interface{}) error { realArg := arg.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs) realResult := result.(*evaluator.EvaluatorServiceCreateEvaluatorTemplateResult) @@ -1043,6 +1069,16 @@ func (p *kClient) ListTemplatesV2(ctx context.Context, request *evaluator.ListTe return _result.GetSuccess(), nil } +func (p *kClient) GetTemplateV2(ctx context.Context, request *evaluator.GetTemplateV2Request) (r *evaluator.GetTemplateV2Response, err error) { + var _args evaluator.EvaluatorServiceGetTemplateV2Args + _args.Request = request + var _result evaluator.EvaluatorServiceGetTemplateV2Result + if err = p.c.Call(ctx, "GetTemplateV2", &_args, &_result); err != nil { + return + } + return _result.GetSuccess(), nil +} + func (p *kClient) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { var _args evaluator.EvaluatorServiceCreateEvaluatorTemplateArgs _args.Request = request diff --git a/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go b/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go index 3ba24f59e..8bfde1696 100644 --- a/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go +++ b/backend/loop_gen/coze/loop/evaluation/loevaluator/local_evaluatorservice.go @@ -519,6 +519,27 @@ func (l *LocalEvaluatorService) ListTemplatesV2(ctx context.Context, request *ev return result.GetSuccess(), nil } +func (l *LocalEvaluatorService) GetTemplateV2(ctx context.Context, request *evaluator.GetTemplateV2Request, callOptions ...callopt.Option) (*evaluator.GetTemplateV2Response, error) { + chain := l.mds(func(ctx context.Context, in, out interface{}) error { + arg := in.(*evaluator.EvaluatorServiceGetTemplateV2Args) + result := out.(*evaluator.EvaluatorServiceGetTemplateV2Result) + resp, err := l.impl.GetTemplateV2(ctx, arg.Request) + if err != nil { + return err + } + result.SetSuccess(resp) + return nil + }) + + arg := &evaluator.EvaluatorServiceGetTemplateV2Args{Request: request} + result := &evaluator.EvaluatorServiceGetTemplateV2Result{} + ctx = l.injectRPCInfo(ctx, "GetTemplateV2") + if err := chain(ctx, arg, result); err != nil { + return nil, err + } + return result.GetSuccess(), nil +} + // CreateEvaluatorTemplate // 创建评估器模板 func (l *LocalEvaluatorService) CreateEvaluatorTemplate(ctx context.Context, request *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (*evaluator.CreateEvaluatorTemplateResponse, error) { diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index 99e920044..4154240a1 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -961,7 +961,7 @@ func (e *EvaluatorHandlerImpl) DebugEvaluator(ctx context.Context, request *eval } do := evaluatorconvertor.ConvertEvaluatorDTO2DO(dto) inputData := evaluatorconvertor.ConvertEvaluatorInputDataDTO2DO(request.GetInputData()) - outputData, err := e.evaluatorService.DebugEvaluator(ctx, do, inputData) + outputData, err := e.evaluatorService.DebugEvaluator(ctx, do, inputData, request.WorkspaceID) if err != nil { return nil, err } @@ -1292,11 +1292,11 @@ func (e *EvaluatorHandlerImpl) BatchDebugEvaluator(ctx context.Context, request evaluatorDO := evaluatorconvertor.ConvertEvaluatorDTO2DO(dto) // 并发调试处理 - return e.batchDebugWithConcurrency(ctx, evaluatorDO, request.InputData) + return e.batchDebugWithConcurrency(ctx, evaluatorDO, request.InputData, request.WorkspaceID) } // batchDebugWithConcurrency 使用并发池进行批量调试 -func (e *EvaluatorHandlerImpl) batchDebugWithConcurrency(ctx context.Context, evaluatorDO *entity.Evaluator, inputDataList []*evaluatordto.EvaluatorInputData) (*evaluatorservice.BatchDebugEvaluatorResponse, error) { +func (e *EvaluatorHandlerImpl) batchDebugWithConcurrency(ctx context.Context, evaluatorDO *entity.Evaluator, inputDataList []*evaluatordto.EvaluatorInputData, exptSpaceID int64) (*evaluatorservice.BatchDebugEvaluatorResponse, error) { // 创建并发池，并发度为10 pool, err := goroutine.NewPool(10) if err != nil { @@ -1317,7 +1317,7 @@ func (e *EvaluatorHandlerImpl) batchDebugWithConcurrency(ctx context.Context, ev inputDataDO := evaluatorconvertor.ConvertEvaluatorInputDataDTO2DO(currentInputData) // 调用单个评估器调试逻辑 - outputDataDO, debugErr := e.evaluatorService.DebugEvaluator(ctx, evaluatorDO, inputDataDO) + outputDataDO, debugErr := e.evaluatorService.DebugEvaluator(ctx, evaluatorDO, inputDataDO, exptSpaceID) // 保护结果收集过程 mutex.Lock() @@ -1402,8 +1402,8 @@ func (e *EvaluatorHandlerImpl) ListTemplatesV2(ctx context.Context, request *eva }, nil } -// GetTemplateInfoV2 获取评估器模板详情 -func (e *EvaluatorHandlerImpl) GetTemplateInfoV2(ctx context.Context, request *evaluatorservice.GetTemplateInfoV2Request) (resp *evaluatorservice.GetTemplateInfoV2Response, err error) { +// GetTemplateV2 获取评估器模板详情 +func (e *EvaluatorHandlerImpl) GetTemplateV2(ctx context.Context, request *evaluatorservice.GetTemplateV2Request) (resp *evaluatorservice.GetTemplateV2Response, err error) { // 构建service层请求 serviceReq := &entity.GetEvaluatorTemplateRequest{ ID: request.GetEvaluatorTemplateID(), @@ -1417,13 +1417,13 @@ func (e *EvaluatorHandlerImpl) GetTemplateInfoV2(ctx context.Context, request *e } if serviceResp.Template == nil { - return &evaluatorservice.GetTemplateInfoV2Response{}, nil + return &evaluatorservice.GetTemplateV2Response{}, nil } // 转换结果 template := evaluatorconvertor.ConvertEvaluatorTemplateDO2DTO(serviceResp.Template) - return &evaluatorservice.GetTemplateInfoV2Response{ + return &evaluatorservice.GetTemplateV2Response{ EvaluatorTemplate: template, }, nil } @@ -1512,7 +1512,7 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluatorTemplate(ctx context.Context, requ // 转换结果 template := evaluatorconvertor.ConvertEvaluatorTemplateDO2DTO(serviceResp.Template) - return &evaluatorservice.UpdateEvaluatorTemplateResponse{ + return &evaluatorservice.UpdateEvaluatorTemplateResponse{ EvaluatorTemplate: template, }, nil } @@ -1553,7 +1553,7 @@ func (e *EvaluatorHandlerImpl) DeleteEvaluatorTemplate(ctx context.Context, requ return nil, err } - return &evaluatorservice.DeleteEvaluatorTemplateResponse{}, nil + return &evaluatorservice.DeleteEvaluatorTemplateResponse{}, nil } // DebugBuiltinEvaluator 调试预置评估器 @@ -1578,13 +1578,13 @@ func (e *EvaluatorHandlerImpl) DebugBuiltinEvaluator(ctx context.Context, reques // 2) 调用调试逻辑 inputDataDO := evaluatorconvertor.ConvertEvaluatorInputDataDTO2DO(request.GetInputData()) - outputDataDO, err := e.evaluatorService.DebugEvaluator(ctx, builtinEvaluatorDO, inputDataDO) + outputDataDO, err := e.evaluatorService.DebugEvaluator(ctx, builtinEvaluatorDO, inputDataDO, request.WorkspaceID) if err != nil { return nil, err } // 3) 返回结果 - return &evaluatorservice.DebugBuiltinEvaluatorResponse{ + return &evaluatorservice.DebugBuiltinEvaluatorResponse{ OutputData: evaluatorconvertor.ConvertEvaluatorOutputDataDO2DTO(outputDataDO), }, nil } diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index 9a1ded367..ff36b42e3 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -821,9 +821,9 @@ func TestEvaluatorHandlerImpl_ComplexBusinessScenarios(t *testing.T) { Times(1) // 4. 评估器调试 - mockEvaluatorService.EXPECT(). - DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()). - DoAndReturn(func(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData) (*entity.EvaluatorOutputData, error) { + mockEvaluatorService.EXPECT(). + DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64) (*entity.EvaluatorOutputData, error) { // 验证输入数据已被正确处理 assert.Equal(t, int64(123), evaluator.SpaceID) assert.Equal(t, entity.EvaluatorTypePrompt, evaluator.EvaluatorType) @@ -2123,7 +2123,7 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { mockFileProvider.EXPECT().MGetFileURL(gomock.Any(), gomock.Any()).Return(map[string]string{}, nil).AnyTimes() - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()).Return( + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( &entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.8), @@ -2182,14 +2182,14 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { // 使用 InOrder 来确保调用顺序 gomock.InOrder( - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()).Return( + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( &entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.9), Reasoning: "result 1", }, }, nil), - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()).Return( + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( &entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.7), @@ -2366,14 +2366,14 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { // 使用 InOrder 来确保调用顺序 gomock.InOrder( - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()).Return( + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( &entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.8), Reasoning: "success result", }, }, nil), - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()).Return( + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( nil, errors.New("evaluation failed")), ) }, @@ -2450,7 +2450,7 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { mockFileProvider.EXPECT().MGetFileURL(gomock.Any(), gomock.Any()).Return(map[string]string{}, nil).AnyTimes() // Mock 100次调用 - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(&entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.8), @@ -2492,7 +2492,7 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { mockFileProvider.EXPECT().MGetFileURL(gomock.Any(), gomock.Any()).Return(map[string]string{}, nil).AnyTimes() // 返回 nil output 和 error - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(nil, errors.New("code execution failed")) }, wantResp: &evaluatorservice.BatchDebugEvaluatorResponse{ @@ -2551,7 +2551,7 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { mockFileProvider.EXPECT().MGetFileURL(gomock.Any(), gomock.Any()).Return(map[string]string{}, nil).AnyTimes() // 第一个成功 - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(&entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.9), @@ -2560,11 +2560,11 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { }, nil).Times(1) // 第二个失败 (nil output + error) - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(nil, errors.New("processing error")).Times(1) // 第三个成功但有 evaluator run error - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(&entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.7), @@ -3335,7 +3335,7 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { Return(builtinEvaluator, nil) mockEvaluatorService.EXPECT(). - DebugEvaluator(gomock.Any(), builtinEvaluator, gomock.Any()). + DebugEvaluator(gomock.Any(), builtinEvaluator, gomock.Any(), gomock.Any()). Return(outputData, nil) }, wantResp: &evaluatorservice.DebugBuiltinEvaluatorResponse{ @@ -3395,8 +3395,8 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { GetBuiltinEvaluator(gomock.Any(), evaluatorID). Return(builtinEvaluator, nil) - mockEvaluatorService.EXPECT(). - DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT(). + DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(nil, errorx.NewByCode(errno.CommonInternalErrorCode)) }, wantResp: nil, diff --git a/backend/modules/evaluation/domain/service/evaluator.go b/backend/modules/evaluation/domain/service/evaluator.go index 88b8440d5..88114e5f7 100644 --- a/backend/modules/evaluation/domain/service/evaluator.go +++ b/backend/modules/evaluation/domain/service/evaluator.go @@ -31,8 +31,8 @@ type EvaluatorService interface { DeleteEvaluator(ctx context.Context, evaluatorIDs []int64, userID string) error // RunEvaluator evaluator_version 运行 RunEvaluator(ctx context.Context, request *entity.RunEvaluatorRequest) (*entity.EvaluatorRecord, error) - // DebugEvaluator 调试 evaluator_version - DebugEvaluator(ctx context.Context, evaluatorDO *entity.Evaluator, inputData *entity.EvaluatorInputData) (*entity.EvaluatorOutputData, error) + // DebugEvaluator 调试 evaluator_version；新增 exptSpaceID 作为实验空间ID + DebugEvaluator(ctx context.Context, evaluatorDO *entity.Evaluator, inputData *entity.EvaluatorInputData, exptSpaceID int64) (*entity.EvaluatorOutputData, error) // GetBuiltinEvaluator 根据 evaluatorID 查询元信息，若为预置评估器则按 builtin_visible_version 组装返回 // 非预置评估器则返回nil GetBuiltinEvaluator(ctx context.Context, evaluatorID int64) (*entity.Evaluator, error) diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index dfbb7315d..ab1538867 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -197,156 +197,156 @@ func (e *EvaluatorServiceImpl) GetBuiltinEvaluator(ctx context.Context, evaluato return nil, nil } - // 1) 通过 (evaluator_id, builtin_visible_version) 获取对应版本 - pairs := [][2]interface{}{{evaluatorID, meta.BuiltinVisibleVersion}} - versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) - if err != nil { - return nil, err - } - if len(versions) == 0 { - return nil, nil - } - - // 2) 回填 metas（元信息）到返回的版本实体根字段 - v := versions[0] - if v != nil && meta != nil { - v.ID = meta.ID - v.SpaceID = meta.SpaceID - v.Name = meta.Name - v.Description = meta.Description - v.DraftSubmitted = meta.DraftSubmitted - v.EvaluatorType = meta.EvaluatorType - v.LatestVersion = meta.LatestVersion - v.Builtin = meta.Builtin - v.EvaluatorInfo = meta.EvaluatorInfo - v.BuiltinVisibleVersion = meta.BuiltinVisibleVersion - v.BoxType = meta.BoxType - v.Tags = meta.Tags - } - - return v, nil + // 1) 通过 (evaluator_id, builtin_visible_version) 获取对应版本 + pairs := [][2]interface{}{{evaluatorID, meta.BuiltinVisibleVersion}} + versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) + if err != nil { + return nil, err + } + if len(versions) == 0 { + return nil, nil + } + + // 2) 回填 metas（元信息）到返回的版本实体根字段 + v := versions[0] + if v != nil && meta != nil { + v.ID = meta.ID + v.SpaceID = meta.SpaceID + v.Name = meta.Name + v.Description = meta.Description + v.DraftSubmitted = meta.DraftSubmitted + v.EvaluatorType = meta.EvaluatorType + v.LatestVersion = meta.LatestVersion + v.Builtin = meta.Builtin + v.EvaluatorInfo = meta.EvaluatorInfo + v.BuiltinVisibleVersion = meta.BuiltinVisibleVersion + v.BoxType = meta.BoxType + v.Tags = meta.Tags + } + + return v, nil } // BatchGetBuiltinEvaluator 批量获取预置评估器（visible版本） func (e *EvaluatorServiceImpl) BatchGetBuiltinEvaluator(ctx context.Context, evaluatorIDs []int64) ([]*entity.Evaluator, error) { - if len(evaluatorIDs) == 0 { - return []*entity.Evaluator{}, nil - } - // 批量获取元信息 - metas, err := e.evaluatorRepo.BatchGetEvaluatorMetaByID(ctx, evaluatorIDs, false) - if err != nil { - return nil, err - } - // 组装 (evaluator_id, builtin_visible_version) 对 - pairs := make([][2]interface{}, 0, len(metas)) - for _, meta := range metas { - if meta == nil || !meta.Builtin || meta.BuiltinVisibleVersion == "" { - continue - } - pairs = append(pairs, [2]interface{}{meta.ID, meta.BuiltinVisibleVersion}) - } - if len(pairs) == 0 { - return []*entity.Evaluator{}, nil - } - // 一次性批量获取版本 - versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) - if err != nil { - return nil, err - } - - // 回填 metas（元信息）到各版本实体根字段 - id2Meta := make(map[int64]*entity.Evaluator, len(metas)) - for _, m := range metas { - if m != nil { - id2Meta[m.ID] = m - } - } - for _, v := range versions { - if v == nil { - continue - } - mid := v.GetEvaluatorID() - if m, ok := id2Meta[mid]; ok && m != nil { - v.ID = m.ID - v.SpaceID = m.SpaceID - v.Name = m.Name - v.Description = m.Description - v.DraftSubmitted = m.DraftSubmitted - v.EvaluatorType = m.EvaluatorType - v.LatestVersion = m.LatestVersion - v.Builtin = m.Builtin - v.EvaluatorInfo = m.EvaluatorInfo - v.BuiltinVisibleVersion = m.BuiltinVisibleVersion - v.BoxType = m.BoxType - v.Tags = m.Tags - } - } - return versions, nil + if len(evaluatorIDs) == 0 { + return []*entity.Evaluator{}, nil + } + // 批量获取元信息 + metas, err := e.evaluatorRepo.BatchGetEvaluatorMetaByID(ctx, evaluatorIDs, false) + if err != nil { + return nil, err + } + // 组装 (evaluator_id, builtin_visible_version) 对 + pairs := make([][2]interface{}, 0, len(metas)) + for _, meta := range metas { + if meta == nil || !meta.Builtin || meta.BuiltinVisibleVersion == "" { + continue + } + pairs = append(pairs, [2]interface{}{meta.ID, meta.BuiltinVisibleVersion}) + } + if len(pairs) == 0 { + return []*entity.Evaluator{}, nil + } + // 一次性批量获取版本 + versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) + if err != nil { + return nil, err + } + + // 回填 metas（元信息）到各版本实体根字段 + id2Meta := make(map[int64]*entity.Evaluator, len(metas)) + for _, m := range metas { + if m != nil { + id2Meta[m.ID] = m + } + } + for _, v := range versions { + if v == nil { + continue + } + mid := v.GetEvaluatorID() + if m, ok := id2Meta[mid]; ok && m != nil { + v.ID = m.ID + v.SpaceID = m.SpaceID + v.Name = m.Name + v.Description = m.Description + v.DraftSubmitted = m.DraftSubmitted + v.EvaluatorType = m.EvaluatorType + v.LatestVersion = m.LatestVersion + v.Builtin = m.Builtin + v.EvaluatorInfo = m.EvaluatorInfo + v.BuiltinVisibleVersion = m.BuiltinVisibleVersion + v.BoxType = m.BoxType + v.Tags = m.Tags + } + } + return versions, nil } // BatchGetEvaluatorByIDAndVersion 批量根据 (evaluator_id, version) 查询具体版本 func (e *EvaluatorServiceImpl) BatchGetEvaluatorByIDAndVersion(ctx context.Context, pairs [][2]interface{}) ([]*entity.Evaluator, error) { - if len(pairs) == 0 { - return []*entity.Evaluator{}, nil - } - versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) - if err != nil { - return nil, err - } - if len(versions) == 0 { - return versions, nil - } - - // 收集 evaluator 元信息并回填至版本实体根字段 - evaluatorIDs := make([]int64, 0, len(versions)) - seen := make(map[int64]struct{}, len(versions)) - for _, v := range versions { - if v == nil { - continue - } - mid := v.GetEvaluatorID() - if mid == 0 { - continue - } - if _, ok := seen[mid]; ok { - continue - } - seen[mid] = struct{}{} - evaluatorIDs = append(evaluatorIDs, mid) - } - if len(evaluatorIDs) == 0 { - return versions, nil - } - metas, err := e.evaluatorRepo.BatchGetEvaluatorMetaByID(ctx, evaluatorIDs, false) - if err != nil { - return nil, err - } - id2Meta := make(map[int64]*entity.Evaluator, len(metas)) - for _, m := range metas { - if m != nil { - id2Meta[m.ID] = m - } - } - for _, v := range versions { - if v == nil { - continue - } - if m, ok := id2Meta[v.GetEvaluatorID()]; ok && m != nil { - v.ID = m.ID - v.SpaceID = m.SpaceID - v.Name = m.Name - v.Description = m.Description - v.DraftSubmitted = m.DraftSubmitted - v.EvaluatorType = m.EvaluatorType - v.LatestVersion = m.LatestVersion - v.Builtin = m.Builtin - v.EvaluatorInfo = m.EvaluatorInfo - v.BuiltinVisibleVersion = m.BuiltinVisibleVersion - v.BoxType = m.BoxType - v.Tags = m.Tags - } - } - return versions, nil + if len(pairs) == 0 { + return []*entity.Evaluator{}, nil + } + versions, err := e.evaluatorRepo.BatchGetEvaluatorVersionsByEvaluatorIDAndVersions(ctx, pairs) + if err != nil { + return nil, err + } + if len(versions) == 0 { + return versions, nil + } + + // 收集 evaluator 元信息并回填至版本实体根字段 + evaluatorIDs := make([]int64, 0, len(versions)) + seen := make(map[int64]struct{}, len(versions)) + for _, v := range versions { + if v == nil { + continue + } + mid := v.GetEvaluatorID() + if mid == 0 { + continue + } + if _, ok := seen[mid]; ok { + continue + } + seen[mid] = struct{}{} + evaluatorIDs = append(evaluatorIDs, mid) + } + if len(evaluatorIDs) == 0 { + return versions, nil + } + metas, err := e.evaluatorRepo.BatchGetEvaluatorMetaByID(ctx, evaluatorIDs, false) + if err != nil { + return nil, err + } + id2Meta := make(map[int64]*entity.Evaluator, len(metas)) + for _, m := range metas { + if m != nil { + id2Meta[m.ID] = m + } + } + for _, v := range versions { + if v == nil { + continue + } + if m, ok := id2Meta[v.GetEvaluatorID()]; ok && m != nil { + v.ID = m.ID + v.SpaceID = m.SpaceID + v.Name = m.Name + v.Description = m.Description + v.DraftSubmitted = m.DraftSubmitted + v.EvaluatorType = m.EvaluatorType + v.LatestVersion = m.LatestVersion + v.Builtin = m.Builtin + v.EvaluatorInfo = m.EvaluatorInfo + v.BuiltinVisibleVersion = m.BuiltinVisibleVersion + v.BoxType = m.BoxType + v.Tags = m.Tags + } + } + return versions, nil } // CreateEvaluator 创建 evaluator_version @@ -605,7 +605,7 @@ func (e *EvaluatorServiceImpl) RunEvaluator(ctx context.Context, request *entity if evaluatorSourceService.PreHandle(ctx, evaluatorDO) != nil { return nil, err } - outputData, runStatus, traceID := evaluatorSourceService.Run(ctx, evaluatorDO, request.InputData, request.DisableTracing) + outputData, runStatus, traceID := evaluatorSourceService.Run(ctx, evaluatorDO, request.InputData, request.SpaceID, request.DisableTracing) if runStatus == entity.EvaluatorRunStatusFail { logs.CtxWarn(ctx, "[RunEvaluator] Run fail, exptID: %d, exptRunID: %d, itemID: %d, turnID: %d, evaluatorVersionID: %d, traceID: %s, err: %v", request.ExperimentID, request.ExperimentRunID, request.ItemID, request.TurnID, request.EvaluatorVersionID, traceID, outputData.EvaluatorRunError) } @@ -644,7 +644,7 @@ func (e *EvaluatorServiceImpl) RunEvaluator(ctx context.Context, request *entity } // DebugEvaluator 调试 evaluator_version -func (e *EvaluatorServiceImpl) DebugEvaluator(ctx context.Context, evaluatorDO *entity.Evaluator, inputData *entity.EvaluatorInputData) (*entity.EvaluatorOutputData, error) { +func (e *EvaluatorServiceImpl) DebugEvaluator(ctx context.Context, evaluatorDO *entity.Evaluator, inputData *entity.EvaluatorInputData, exptSpaceID int64) (*entity.EvaluatorOutputData, error) { if evaluatorDO == nil || (evaluatorDO.EvaluatorType == entity.EvaluatorTypePrompt && evaluatorDO.PromptEvaluatorVersion == nil) { return nil, errorx.NewByCode(errno.EvaluatorNotExistCode) } @@ -663,7 +663,8 @@ func (e *EvaluatorServiceImpl) DebugEvaluator(ctx context.Context, evaluatorDO * return nil, err } // 3. 执行Debug - return evaluatorSourceService.Debug(ctx, evaluatorDO, inputData) + // exptSpaceID 目前不影响执行路径，预留透传用途 + return evaluatorSourceService.Debug(ctx, evaluatorDO, inputData, exptSpaceID) } func (e *EvaluatorServiceImpl) CheckNameExist(ctx context.Context, spaceID, evaluatorID int64, name string) (bool, error) { diff --git a/backend/modules/evaluation/domain/service/evaluator_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_impl_test.go index 4a0e92cc7..df41078b4 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl_test.go @@ -1715,7 +1715,7 @@ func TestEvaluatorServiceImpl_RunEvaluator(t *testing.T) { mockLimiter.EXPECT().AllowInvoke(gomock.Any(), defaultRequest.SpaceID).Return(true) mockIDGen.EXPECT().GenID(gomock.Any()).Return(defaultRecordID, nil) mockEvaluatorSourceService.EXPECT().PreHandle(gomock.Any(), defaultEvaluatorDO).Return(nil) - mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, defaultRequest.InputData, defaultRequest.DisableTracing).Return(defaultOutputData, defaultRunStatus, "trace-id-123") + mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, defaultRequest.InputData, defaultRequest.SpaceID, defaultRequest.DisableTracing).Return(defaultOutputData, defaultRunStatus, "trace-id-123") mockEvaluatorRecordRepo.EXPECT().CreateEvaluatorRecord(gomock.Any(), gomock.Any()).DoAndReturn( func(ctx context.Context, record *entity.EvaluatorRecord) error { @@ -1764,7 +1764,7 @@ func TestEvaluatorServiceImpl_RunEvaluator(t *testing.T) { session.WithCtxUser(ctx, &session.User{ID: defaultUserID}) mockEvaluatorSourceService.EXPECT().PreHandle(gomock.Any(), defaultEvaluatorDO).Return(nil) // 验证DisableTracing参数正确传递给EvaluatorSourceService.Run方法 - mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, gomock.Any(), true).Return(defaultOutputData, defaultRunStatus, "trace-id-123") + mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, gomock.Any(), int64(1), true).Return(defaultOutputData, defaultRunStatus, "trace-id-123") mockEvaluatorRecordRepo.EXPECT().CreateEvaluatorRecord(gomock.Any(), gomock.Any()).DoAndReturn( func(ctx context.Context, record *entity.EvaluatorRecord) error { @@ -1813,7 +1813,7 @@ func TestEvaluatorServiceImpl_RunEvaluator(t *testing.T) { session.WithCtxUser(ctx, &session.User{ID: defaultUserID}) mockEvaluatorSourceService.EXPECT().PreHandle(gomock.Any(), defaultEvaluatorDO).Return(nil) // 验证DisableTracing参数正确传递给EvaluatorSourceService.Run方法 - mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, gomock.Any(), false).Return(defaultOutputData, defaultRunStatus, "trace-id-123") + mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, gomock.Any(), int64(1), false).Return(defaultOutputData, defaultRunStatus, "trace-id-123") mockEvaluatorRecordRepo.EXPECT().CreateEvaluatorRecord(gomock.Any(), gomock.Any()).DoAndReturn( func(ctx context.Context, record *entity.EvaluatorRecord) error { @@ -1948,7 +1948,7 @@ func Test_EvaluatorServiceImpl_DebugEvaluator(t *testing.T) { setupMocks: func(mockEvaluatorSourceService *mocks.MockEvaluatorSourceService) { mockEvaluatorSourceService.EXPECT().PreHandle(ctx, mockEvaluator).Return(nil) mockEvaluatorSourceService.EXPECT().Validate(ctx, mockEvaluator).Return(nil) - mockEvaluatorSourceService.EXPECT().Debug(ctx, mockEvaluator, gomock.Any()).Return(defaultOutputData, nil) + mockEvaluatorSourceService.EXPECT().Debug(ctx, mockEvaluator, gomock.Any(), int64(0)).Return(defaultOutputData, nil) }, }, } @@ -1957,7 +1957,7 @@ func Test_EvaluatorServiceImpl_DebugEvaluator(t *testing.T) { if tc.setupMocks != nil { tc.setupMocks(mockEvaluatorSourceService) } - outputData, err := mockService.DebugEvaluator(ctx, mockEvaluator, tc.request.InputData) + outputData, err := mockService.DebugEvaluator(ctx, mockEvaluator, tc.request.InputData, int64(0)) if tc.expectedErr != nil { assert.Error(t, err) assert.Equal(t, tc.expectedErr, err) @@ -2072,7 +2072,7 @@ func TestEvaluatorServiceImpl_RunEvaluator_DisableTracing(t *testing.T) { mockIDGen.EXPECT().GenID(gomock.Any()).Return(defaultRecordID, nil) mockEvaluatorSourceService.EXPECT().PreHandle(gomock.Any(), defaultEvaluatorDO).Return(nil) // 关键验证：确保DisableTracing参数正确传递 - mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, gomock.Any(), true).Return(defaultOutputData, defaultRunStatus, "trace-id-123") + mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, gomock.Any(), int64(1), true).Return(defaultOutputData, defaultRunStatus, "trace-id-123") mockEvaluatorRecordRepo.EXPECT().CreateEvaluatorRecord(gomock.Any(), gomock.Any()).Return(nil) }, }, @@ -2085,7 +2085,7 @@ func TestEvaluatorServiceImpl_RunEvaluator_DisableTracing(t *testing.T) { mockIDGen.EXPECT().GenID(gomock.Any()).Return(defaultRecordID, nil) mockEvaluatorSourceService.EXPECT().PreHandle(gomock.Any(), defaultEvaluatorDO).Return(nil) // 关键验证：确保DisableTracing参数正确传递 - mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, gomock.Any(), false).Return(defaultOutputData, defaultRunStatus, "trace-id-123") + mockEvaluatorSourceService.EXPECT().Run(gomock.Any(), defaultEvaluatorDO, gomock.Any(), int64(1), false).Return(defaultOutputData, defaultRunStatus, "trace-id-123") mockEvaluatorRecordRepo.EXPECT().CreateEvaluatorRecord(gomock.Any(), gomock.Any()).Return(nil) }, }, diff --git a/backend/modules/evaluation/domain/service/evaluator_source_code_impl.go b/backend/modules/evaluation/domain/service/evaluator_source_code_impl.go index 2b5b09806..d0c91ba19 100755 --- a/backend/modules/evaluation/domain/service/evaluator_source_code_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_source_code_impl.go @@ -199,12 +199,12 @@ func (c *EvaluatorSourceCodeServiceImpl) EvaluatorType() entity.EvaluatorType { } // Run 执行Code评估器 -func (c *EvaluatorSourceCodeServiceImpl) Run(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, disableTracing bool) (output *entity.EvaluatorOutputData, runStatus entity.EvaluatorRunStatus, traceID string) { +func (c *EvaluatorSourceCodeServiceImpl) Run(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64, disableTracing bool) (output *entity.EvaluatorOutputData, runStatus entity.EvaluatorRunStatus, traceID string) { var err error var code string startTime := time.Now() // 创建trace span - rootSpan, ctx := c.newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(evaluator.SpaceID, 10), disableTracing) + rootSpan, ctx := c.newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(evaluator.SpaceID, 10), disableTracing) traceID = rootSpan.GetTraceID() defer func() { @@ -458,9 +458,9 @@ func (c *EvaluatorSourceCodeServiceImpl) createErrorOutputFromError(err error, s } // Debug 调试Code评估器 -func (c *EvaluatorSourceCodeServiceImpl) Debug(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData) (output *entity.EvaluatorOutputData, err error) { +func (c *EvaluatorSourceCodeServiceImpl) Debug(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64) (output *entity.EvaluatorOutputData, err error) { // 调试模式下直接调用Run方法 - output, runStatus, _ := c.Run(ctx, evaluator, input, true) + output, runStatus, _ := c.Run(ctx, evaluator, input, exptSpaceID, true) if runStatus == entity.EvaluatorRunStatusFail { if output.EvaluatorRunError != nil { return output, errorx.NewByCode(errno.CodeExecutionFailedCode, errorx.WithExtraMsg(output.EvaluatorRunError.Message)) @@ -1004,7 +1004,7 @@ const userCode = %s; try { // 使用Function构造函数进行语法检查 new Function(userCode); - + // 语法正确，输出JSON结果 const result = {"valid": true, "error": null}; console.log(JSON.stringify(result)); diff --git a/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl.go b/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl.go index 3ef228d46..7ae973c67 100644 --- a/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl.go @@ -71,12 +71,12 @@ func (p *EvaluatorSourcePromptServiceImpl) EvaluatorType() entity.EvaluatorType return entity.EvaluatorTypePrompt } -func (p *EvaluatorSourcePromptServiceImpl) Run(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, disableTracing bool) (output *entity.EvaluatorOutputData, runStatus entity.EvaluatorRunStatus, traceID string) { +func (p *EvaluatorSourcePromptServiceImpl) Run(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64, disableTracing bool) (output *entity.EvaluatorOutputData, runStatus entity.EvaluatorRunStatus, traceID string) { var err error startTime := time.Now() var rootSpan *evaluatorSpan - if !disableTracing { + if !disableTracing { rootSpan, ctx = newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(evaluator.SpaceID, 10), false) traceID = rootSpan.GetTraceID() } else { @@ -539,9 +539,9 @@ func renderTemplate(ctx context.Context, evaluatorVersion *entity.PromptEvaluato return nil } -func (p *EvaluatorSourcePromptServiceImpl) Debug(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData) (output *entity.EvaluatorOutputData, err error) { +func (p *EvaluatorSourcePromptServiceImpl) Debug(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64) (output *entity.EvaluatorOutputData, err error) { // 实现调试评估的逻辑 - output, _, _ = p.Run(ctx, evaluator, input, false) + output, _, _ = p.Run(ctx, evaluator, input, exptSpaceID, false) if output != nil && output.EvaluatorRunError != nil { return nil, errorx.NewByCode(output.EvaluatorRunError.Code, errorx.WithExtraMsg(output.EvaluatorRunError.Message)) } diff --git a/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl_test.go index 83327acde..c98f7b7d8 100755 --- a/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl_test.go @@ -212,7 +212,7 @@ func TestEvaluatorSourcePromptServiceImpl_Run(t *testing.T) { tc.setupMocks() } - output, status, _ := service.Run(ctx, tc.evaluator, tc.input, false) + output, status, _ := service.Run(ctx, tc.evaluator, tc.input, tc.evaluator.GetSpaceID(), false) assert.Equal(t, tc.expectedStatus, status) if tc.checkOutputFunc != nil { @@ -400,7 +400,7 @@ func TestEvaluatorSourcePromptServiceImpl_Debug(t *testing.T) { TokenUsage: &entity.TokenUsage{InputTokens: 10, OutputTokens: 10}, }, nil) mockMetric.EXPECT().EmitRun(int64(1), gomock.Any(), gomock.Any(), gomock.Any()) - output, err := service.Debug(ctx, baseMockEvaluator, baseMockInput) + output, err := service.Debug(ctx, baseMockEvaluator, baseMockInput, baseMockEvaluator.GetSpaceID()) assert.NoError(t, err) assert.NotNil(t, output) assert.NotNil(t, output.EvaluatorResult) @@ -411,7 +411,7 @@ func TestEvaluatorSourcePromptServiceImpl_Debug(t *testing.T) { t.Run("调试评估器失败", func(t *testing.T) { mockLLMProvider.EXPECT().Call(gomock.Any(), gomock.Any()).Return(nil, errors.New("llm call failed")) mockMetric.EXPECT().EmitRun(int64(1), gomock.Any(), gomock.Any(), gomock.Any()) - output, err := service.Debug(ctx, baseMockEvaluator, baseMockInput) + output, err := service.Debug(ctx, baseMockEvaluator, baseMockInput, baseMockEvaluator.GetSpaceID()) assert.Error(t, err) assert.Nil(t, output) }) @@ -980,7 +980,7 @@ func TestEvaluatorSourcePromptServiceImpl_Run_DisableTracing(t *testing.T) { t.Run(tt.name, func(t *testing.T) { tt.setupMocks() - output, status, traceID := service.Run(ctx, evaluator, input, tt.disableTracing) + output, status, traceID := service.Run(ctx, evaluator, input, evaluator.GetSpaceID(), tt.disableTracing) // 由于输入验证失败，验证错误状态 assert.Equal(t, entity.EvaluatorRunStatusFail, status) diff --git a/backend/modules/evaluation/domain/service/evaluator_source_service.go b/backend/modules/evaluation/domain/service/evaluator_source_service.go index 9b0dad167..0b6b23757 100644 --- a/backend/modules/evaluation/domain/service/evaluator_source_service.go +++ b/backend/modules/evaluation/domain/service/evaluator_source_service.go @@ -14,8 +14,8 @@ import ( //go:generate mockgen -destination mocks/evaluator_source_service_mock.go -package mocks . EvaluatorSourceService type EvaluatorSourceService interface { EvaluatorType() entity.EvaluatorType - Run(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, disableTracing bool) (output *entity.EvaluatorOutputData, runStatus entity.EvaluatorRunStatus, traceID string) - Debug(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData) (output *entity.EvaluatorOutputData, err error) + Run(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64, disableTracing bool) (output *entity.EvaluatorOutputData, runStatus entity.EvaluatorRunStatus, traceID string) + Debug(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64) (output *entity.EvaluatorOutputData, err error) PreHandle(ctx context.Context, evaluator *entity.Evaluator) error // Validate 验证评估器 Validate(ctx context.Context, evaluator *entity.Evaluator) error diff --git a/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go b/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go index ef42af588..3e2bc6da3 100644 --- a/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go +++ b/backend/modules/evaluation/domain/service/mocks/evaluator_service_mock.go @@ -132,18 +132,18 @@ func (mr *MockEvaluatorServiceMockRecorder) CreateEvaluator(ctx, evaluator, cid } // DebugEvaluator mocks base method. -func (m *MockEvaluatorService) DebugEvaluator(ctx context.Context, evaluatorDO *entity.Evaluator, inputData *entity.EvaluatorInputData) (*entity.EvaluatorOutputData, error) { +func (m *MockEvaluatorService) DebugEvaluator(ctx context.Context, evaluatorDO *entity.Evaluator, inputData *entity.EvaluatorInputData, exptSpaceID int64) (*entity.EvaluatorOutputData, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DebugEvaluator", ctx, evaluatorDO, inputData) + ret := m.ctrl.Call(m, "DebugEvaluator", ctx, evaluatorDO, inputData, exptSpaceID) ret0, _ := ret[0].(*entity.EvaluatorOutputData) ret1, _ := ret[1].(error) return ret0, ret1 } // DebugEvaluator indicates an expected call of DebugEvaluator. -func (mr *MockEvaluatorServiceMockRecorder) DebugEvaluator(ctx, evaluatorDO, inputData any) *gomock.Call { +func (mr *MockEvaluatorServiceMockRecorder) DebugEvaluator(ctx, evaluatorDO, inputData, exptSpaceID any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DebugEvaluator", reflect.TypeOf((*MockEvaluatorService)(nil).DebugEvaluator), ctx, evaluatorDO, inputData) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DebugEvaluator", reflect.TypeOf((*MockEvaluatorService)(nil).DebugEvaluator), ctx, evaluatorDO, inputData, exptSpaceID) } // DeleteEvaluator mocks base method. diff --git a/backend/modules/evaluation/domain/service/mocks/evaluator_source_service_mock.go b/backend/modules/evaluation/domain/service/mocks/evaluator_source_service_mock.go index 3b514b3fd..d6df4c8ea 100644 --- a/backend/modules/evaluation/domain/service/mocks/evaluator_source_service_mock.go +++ b/backend/modules/evaluation/domain/service/mocks/evaluator_source_service_mock.go @@ -42,18 +42,18 @@ func (m *MockEvaluatorSourceService) EXPECT() *MockEvaluatorSourceServiceMockRec } // Debug mocks base method. -func (m *MockEvaluatorSourceService) Debug(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData) (*entity.EvaluatorOutputData, error) { +func (m *MockEvaluatorSourceService) Debug(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64) (*entity.EvaluatorOutputData, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Debug", ctx, evaluator, input) + ret := m.ctrl.Call(m, "Debug", ctx, evaluator, input, exptSpaceID) ret0, _ := ret[0].(*entity.EvaluatorOutputData) ret1, _ := ret[1].(error) return ret0, ret1 } // Debug indicates an expected call of Debug. -func (mr *MockEvaluatorSourceServiceMockRecorder) Debug(ctx, evaluator, input any) *gomock.Call { +func (mr *MockEvaluatorSourceServiceMockRecorder) Debug(ctx, evaluator, input, exptSpaceID any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockEvaluatorSourceService)(nil).Debug), ctx, evaluator, input) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Debug", reflect.TypeOf((*MockEvaluatorSourceService)(nil).Debug), ctx, evaluator, input, exptSpaceID) } // EvaluatorType mocks base method. @@ -85,9 +85,9 @@ func (mr *MockEvaluatorSourceServiceMockRecorder) PreHandle(ctx, evaluator any) } // Run mocks base method. -func (m *MockEvaluatorSourceService) Run(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, disableTracing bool) (*entity.EvaluatorOutputData, entity.EvaluatorRunStatus, string) { +func (m *MockEvaluatorSourceService) Run(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64, disableTracing bool) (*entity.EvaluatorOutputData, entity.EvaluatorRunStatus, string) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Run", ctx, evaluator, input, disableTracing) + ret := m.ctrl.Call(m, "Run", ctx, evaluator, input, exptSpaceID, disableTracing) ret0, _ := ret[0].(*entity.EvaluatorOutputData) ret1, _ := ret[1].(entity.EvaluatorRunStatus) ret2, _ := ret[2].(string) @@ -95,9 +95,9 @@ func (m *MockEvaluatorSourceService) Run(ctx context.Context, evaluator *entity. } // Run indicates an expected call of Run. -func (mr *MockEvaluatorSourceServiceMockRecorder) Run(ctx, evaluator, input, disableTracing any) *gomock.Call { +func (mr *MockEvaluatorSourceServiceMockRecorder) Run(ctx, evaluator, input, exptSpaceID, disableTracing any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockEvaluatorSourceService)(nil).Run), ctx, evaluator, input, disableTracing) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockEvaluatorSourceService)(nil).Run), ctx, evaluator, input, exptSpaceID, disableTracing) } // Validate mocks base method. diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 90c11ada9..099c7c6d8 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -510,12 +510,12 @@ func (r *EvaluatorRepoImpl) UpdateEvaluatorMeta(ctx context.Context, req *entity if req.BoxType != nil { po.BoxType = int32(*req.BoxType) } - // 写入 EvaluatorInfo JSON - if req.EvaluatorInfo != nil { - if b, err := json.Marshal(req.EvaluatorInfo); err == nil { - po.EvaluatorInfo = &b - } - } + // 写入 EvaluatorInfo JSON + if req.EvaluatorInfo != nil { + if b, err := json.Marshal(req.EvaluatorInfo); err == nil { + po.EvaluatorInfo = &b + } + } if req.BuiltinVisibleVersion != nil { po.BuiltinVisibleVersion = gptr.Indirect(req.BuiltinVisibleVersion) } @@ -680,34 +680,34 @@ func (r *EvaluatorRepoImpl) ListEvaluator(ctx context.Context, req *repo.ListEva // ListBuiltinEvaluator 根据筛选条件查询内置评估器列表，支持tag筛选和分页 func (r *EvaluatorRepoImpl) ListBuiltinEvaluator(ctx context.Context, req *repo.ListBuiltinEvaluatorRequest) (*repo.ListBuiltinEvaluatorResponse, error) { - // 统一通过 tagDAO 获取分页与总数（即使无筛选条件也走该逻辑） - evaluatorIDs, total, err := r.tagDAO.GetSourceIDsByFilterConditions( - ctx, - int32(entity.EvaluatorTagKeyType_Evaluator), - req.FilterOption, - req.PageSize, - req.PageNum, - contexts.CtxLocale(ctx), - ) - if err != nil { - return nil, err - } - if len(evaluatorIDs) == 0 { - return &repo.ListBuiltinEvaluatorResponse{TotalCount: total, Evaluators: []*entity.Evaluator{}}, nil - } - - // 基于获得的 ID 集查询内置评估器实体；此处不再做分页，避免与 tagDAO 的分页重复 - daoReq := &mysql.ListBuiltinEvaluatorRequest{ - IDs: evaluatorIDs, - PageSize: 0, - PageNum: 0, - OrderBy: []*mysql.OrderBy{{Field: "name", ByDesc: false}}, - } - - daoResp, err := r.evaluatorDao.ListBuiltinEvaluator(ctx, daoReq) - if err != nil { - return nil, err - } + // 统一通过 tagDAO 获取分页与总数（即使无筛选条件也走该逻辑） + evaluatorIDs, total, err := r.tagDAO.GetSourceIDsByFilterConditions( + ctx, + int32(entity.EvaluatorTagKeyType_Evaluator), + req.FilterOption, + req.PageSize, + req.PageNum, + contexts.CtxLocale(ctx), + ) + if err != nil { + return nil, err + } + if len(evaluatorIDs) == 0 { + return &repo.ListBuiltinEvaluatorResponse{TotalCount: total, Evaluators: []*entity.Evaluator{}}, nil + } + + // 基于获得的 ID 集查询内置评估器实体；此处不再做分页，避免与 tagDAO 的分页重复 + daoReq := &mysql.ListBuiltinEvaluatorRequest{ + IDs: evaluatorIDs, + PageSize: 0, + PageNum: 0, + OrderBy: []*mysql.OrderBy{{Field: "name", ByDesc: false}}, + } + + daoResp, err := r.evaluatorDao.ListBuiltinEvaluator(ctx, daoReq) + if err != nil { + return nil, err + } // 直接以 evaluatorID 为 source_id 批量查标签 var allTags []*model.EvaluatorTag @@ -732,11 +732,9 @@ func (r *EvaluatorRepoImpl) ListBuiltinEvaluator(ctx context.Context, req *repo. r.setEvaluatorTags(evaluatorDO, evaluatorPO.ID, tagsBySourceID) evaluators = append(evaluators, evaluatorDO) } - return &repo.ListBuiltinEvaluatorResponse{TotalCount: total, Evaluators: evaluators}, nil + return &repo.ListBuiltinEvaluatorResponse{TotalCount: total, Evaluators: evaluators}, nil } -// 已合并内置与普通查询至 BatchGetEvaluatorByVersionID(builtin) - // setEvaluatorTags 设置评估器的tag信息 func (r *EvaluatorRepoImpl) setEvaluatorTags(evaluatorDO *entity.Evaluator, evaluatorID int64, tagsBySourceID map[int64][]*model.EvaluatorTag) { if tags, exists := tagsBySourceID[evaluatorID]; exists && len(tags) > 0 { diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift index 267d06384..be80296fe 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift @@ -380,13 +380,13 @@ struct ListTemplatesV2Response { 255: base.BaseResp BaseResp } -struct GetTemplateInfoV2Request { - 1: required i64 evaluator_template_id (api.body='evaluator_template_id', api.js_conv='true', go.tag='json:"evaluator_template_id"') +struct GetTemplateV2Request { + 1: required i64 evaluator_template_id (api.path='evaluator_template_id', api.js_conv='true', go.tag='json:"evaluator_template_id"') 255: optional base.Base Base } -struct GetTemplateInfoV2Response { +struct GetTemplateV2Response { 1: optional evaluator.EvaluatorTemplate evaluator_template (api.body='evaluator_template') 255: base.BaseResp BaseResp @@ -500,6 +500,7 @@ service EvaluatorService { // 查询评估器模板 ListTemplatesV2Response ListTemplatesV2(1: ListTemplatesV2Request request) (api.post="/api/evaluation/v1/evaluator_template/list") + GetTemplateV2Response GetTemplateV2(1: GetTemplateV2Request request) (api.post="/api/evaluation/v1/evaluator_template/:evaluator_template_id") // 创建评估器模板 CreateEvaluatorTemplateResponse CreateEvaluatorTemplate(1: CreateEvaluatorTemplateRequest request) (api.post="/api/evaluation/v1/evaluator_template") From d04b017be10af5c1b99b4e8c8bada8b68ed04c7a Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 21:59:48 +0800 Subject: [PATCH 29/42] fix get template --- backend/api/handler/coze/loop/apis/evaluator_service_test.go | 4 ++++ .../domain/service/evaluator_source_code_impl_test.go | 2 +- .../loop/evaluation/coze.loop.evaluation.evaluator.thrift | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/api/handler/coze/loop/apis/evaluator_service_test.go b/backend/api/handler/coze/loop/apis/evaluator_service_test.go index 0464fabd5..73187ea01 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service_test.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service_test.go @@ -111,6 +111,10 @@ func (m *mockEvaluatorClient) ListTemplatesV2(ctx context.Context, req *evaluato return &evaluator.ListTemplatesV2Response{}, nil } +func (m *mockEvaluatorClient) GetTemplateV2(ctx context.Context, req *evaluator.GetTemplateV2Request, callOptions ...callopt.Option) (r *evaluator.GetTemplateV2Response, err error) { + return &evaluator.GetTemplateV2Response{}, nil +} + func (m *mockEvaluatorClient) CreateEvaluatorTemplate(ctx context.Context, req *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { return &evaluator.CreateEvaluatorTemplateResponse{}, nil } diff --git a/backend/modules/evaluation/domain/service/evaluator_source_code_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_source_code_impl_test.go index 53530cafe..fd968c908 100755 --- a/backend/modules/evaluation/domain/service/evaluator_source_code_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_source_code_impl_test.go @@ -664,7 +664,7 @@ func TestEvaluatorSourceCodeServiceImpl_Debug(t *testing.T) { tt.mockSetup(ctrl, mockRuntimeManager, mockCodeBuilderFactory, mockRuntime, mockCodeBuilder) - output, err := service.Debug(context.Background(), tt.evaluator, tt.input) + output, err := service.Debug(context.Background(), tt.evaluator, tt.input, 0) if tt.wantErr { assert.Error(t, err) diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift index be80296fe..4353b7469 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift @@ -500,7 +500,7 @@ service EvaluatorService { // 查询评估器模板 ListTemplatesV2Response ListTemplatesV2(1: ListTemplatesV2Request request) (api.post="/api/evaluation/v1/evaluator_template/list") - GetTemplateV2Response GetTemplateV2(1: GetTemplateV2Request request) (api.post="/api/evaluation/v1/evaluator_template/:evaluator_template_id") + GetTemplateV2Response GetTemplateV2(1: GetTemplateV2Request request) (api.get="/api/evaluation/v1/evaluator_template/:evaluator_template_id") // 创建评估器模板 CreateEvaluatorTemplateResponse CreateEvaluatorTemplate(1: CreateEvaluatorTemplateRequest request) (api.post="/api/evaluation/v1/evaluator_template") From 3ab2b3964f50fb5ee84cb41d90b6c21e6b11de0b Mon Sep 17 00:00:00 2001 From: shenjiayun Date: Tue, 4 Nov 2025 22:19:29 +0800 Subject: [PATCH 30/42] fix: fix unexpected {} structure in UpdateEvaluatorTemplate tags --- .../repo/evaluator/evaluator_template_impl.go | 152 +++++++++--------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go index d154c1120..c48d6ca29 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go @@ -48,15 +48,15 @@ func (r *EvaluatorTemplateRepoImpl) ListEvaluatorTemplate(ctx context.Context, r hasValidFilters = true } - // 检查FilterConditions或SubFilters是否有效 - if req.FilterOption.Filters != nil { - if len(req.FilterOption.Filters.FilterConditions) > 0 { - hasValidFilters = true - } - if len(req.FilterOption.Filters.SubFilters) > 0 { - hasValidFilters = true - } - } + // 检查FilterConditions或SubFilters是否有效 + if req.FilterOption.Filters != nil { + if len(req.FilterOption.Filters.FilterConditions) > 0 { + hasValidFilters = true + } + if len(req.FilterOption.Filters.SubFilters) > 0 { + hasValidFilters = true + } + } // 如果有有效的筛选条件，进行标签查询 if hasValidFilters { @@ -216,83 +216,83 @@ func (r *EvaluatorTemplateRepoImpl) UpdateEvaluatorTemplate(ctx context.Context, return nil, err } - // 标签全量对齐：新增补充、删除不在集合内的，保持未变化的不动 - // 此处 template 已在入参校验中判空，无需再判空 - // 针对每种语言分别全量对齐 - userID := session.UserIDInCtxOrEmpty(ctx) - for lang, tagMap := range template.Tags { - existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{template.ID}, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), string(lang)) - if err != nil { - return nil, err + // 标签全量对齐：新增补充、删除不在集合内的，保持未变化的不动 + // 此处 template 已在入参校验中判空，无需再判空 + // 针对每种语言分别全量对齐 + userID := session.UserIDInCtxOrEmpty(ctx) + for lang, tagMap := range template.Tags { + existingTags, err := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{template.ID}, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), string(lang)) + if err != nil { + return nil, err + } + existing := make(map[string]map[string]bool) + for _, t := range existingTags { + if _, ok := existing[t.TagKey]; !ok { + existing[t.TagKey] = make(map[string]bool) } - existing := make(map[string]map[string]bool) - for _, t := range existingTags { - if _, ok := existing[t.TagKey]; !ok { - existing[t.TagKey] = make(map[string]bool) - } - existing[t.TagKey][t.TagValue] = true + existing[t.TagKey][t.TagValue] = true + } + target := make(map[string]map[string]bool) + for k, vs := range tagMap { + kstr := string(k) + if _, ok := target[kstr]; !ok { + target[kstr] = make(map[string]bool) } - target := make(map[string]map[string]bool) - for k, vs := range tagMap { - kstr := string(k) - if _, ok := target[kstr]; !ok { - target[kstr] = make(map[string]bool) - } - for _, v := range vs { - target[kstr][v] = true - } - del := make(map[string][]string) - for k, vals := range existing { - for v := range vals { - if !target[k][v] { - del[k] = append(del[k], v) - } - } + for _, v := range vs { + target[kstr][v] = true } - if len(del) > 0 { - if err := r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, template.ID, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), string(lang), del); err != nil { - return nil, err + } + del := make(map[string][]string) + for k, vals := range existing { + for v := range vals { + if !target[k][v] { + del[k] = append(del[k], v) } } - add := make(map[string][]string) - for k, vals := range target { - for v := range vals { - if !existing[k][v] { - add[k] = append(add[k], v) - } + } + if len(del) > 0 { + if err := r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, template.ID, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), string(lang), del); err != nil { + return nil, err + } + } + add := make(map[string][]string) + for k, vals := range target { + for v := range vals { + if !existing[k][v] { + add[k] = append(add[k], v) } } - if len(add) > 0 { - total := 0 - for _, vs := range add { - total += len(vs) + } + if len(add) > 0 { + total := 0 + for _, vs := range add { + total += len(vs) + } + if total > 0 { + ids, err := r.idgen.GenMultiIDs(ctx, total) + if err != nil { + return nil, err } - if total > 0 { - ids, err := r.idgen.GenMultiIDs(ctx, total) - if err != nil { - return nil, err - } - idx := 0 - evaluatorTags := make([]*model.EvaluatorTag, 0, total) - for k, vs := range add { - for _, v := range vs { - evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ - ID: ids[idx], - SourceID: template.ID, - TagType: int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), - TagKey: k, - TagValue: v, - LangType: string(lang), - CreatedBy: userID, - UpdatedBy: userID, - }) - idx++ - } - } - if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags); err != nil { - return nil, err + idx := 0 + evaluatorTags := make([]*model.EvaluatorTag, 0, total) + for k, vs := range add { + for _, v := range vs { + evaluatorTags = append(evaluatorTags, &model.EvaluatorTag{ + ID: ids[idx], + SourceID: template.ID, + TagType: int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), + TagKey: k, + TagValue: v, + LangType: string(lang), + CreatedBy: userID, + UpdatedBy: userID, + }) + idx++ } } + if err := r.tagDAO.BatchCreateEvaluatorTags(ctx, evaluatorTags); err != nil { + return nil, err + } } } } From d13ceb342c188030c0e363a83dd7dc12708c748c Mon Sep 17 00:00:00 2001 From: tpfz Date: Tue, 4 Nov 2025 22:26:47 +0800 Subject: [PATCH 31/42] add tags --- .../application/evaluator_app_test.go | 22 +++++++++---------- .../evaluator_source_code_impl_test.go | 2 +- .../repo/evaluator/evaluator_template_impl.go | 7 ++++++ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index ff36b42e3..9145ed7f3 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -2760,8 +2760,8 @@ func TestEvaluatorHandlerImpl_ListTemplatesV2(t *testing.T) { } } -// TestEvaluatorHandlerImpl_GetTemplateInfoV2 测试 GetTemplateInfoV2 方法 -func TestEvaluatorHandlerImpl_GetTemplateInfoV2(t *testing.T) { +// TestEvaluatorHandlerImpl_GetTemplateV2 测试 GetTemplateV2 方法 +func TestEvaluatorHandlerImpl_GetTemplateV2(t *testing.T) { t.Parallel() ctrl := gomock.NewController(t) @@ -2780,17 +2780,17 @@ func TestEvaluatorHandlerImpl_GetTemplateInfoV2(t *testing.T) { Description: "test description", } - tests := []struct { + tests := []struct { name string - req *evaluatorservice.GetTemplateInfoV2Request + req *evaluatorservice.GetTemplateV2Request mockSetup func() - wantResp *evaluatorservice.GetTemplateInfoV2Response + wantResp *evaluatorservice.GetTemplateV2Response wantErr bool wantErrCode int32 }{ { name: "success - normal request", - req: &evaluatorservice.GetTemplateInfoV2Request{ + req: &evaluatorservice.GetTemplateV2Request{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -2803,14 +2803,14 @@ func TestEvaluatorHandlerImpl_GetTemplateInfoV2(t *testing.T) { Template: template, }, nil) }, - wantResp: &evaluatorservice.GetTemplateInfoV2Response{ + wantResp: &evaluatorservice.GetTemplateV2Response{ EvaluatorTemplate: evaluator.ConvertEvaluatorTemplateDO2DTO(template), }, wantErr: false, }, { name: "success - template not found", - req: &evaluatorservice.GetTemplateInfoV2Request{ + req: &evaluatorservice.GetTemplateV2Request{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -2820,12 +2820,12 @@ func TestEvaluatorHandlerImpl_GetTemplateInfoV2(t *testing.T) { Template: nil, }, nil) }, - wantResp: &evaluatorservice.GetTemplateInfoV2Response{}, + wantResp: &evaluatorservice.GetTemplateV2Response{}, wantErr: false, }, { name: "error - service failure", - req: &evaluatorservice.GetTemplateInfoV2Request{ + req: &evaluatorservice.GetTemplateV2Request{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -2843,7 +2843,7 @@ func TestEvaluatorHandlerImpl_GetTemplateInfoV2(t *testing.T) { t.Run(tt.name, func(t *testing.T) { tt.mockSetup() - resp, err := app.GetTemplateInfoV2(context.Background(), tt.req) + resp, err := app.GetTemplateV2(context.Background(), tt.req) if tt.wantErr { assert.Error(t, err) diff --git a/backend/modules/evaluation/domain/service/evaluator_source_code_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_source_code_impl_test.go index fd968c908..309558e21 100755 --- a/backend/modules/evaluation/domain/service/evaluator_source_code_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_source_code_impl_test.go @@ -1057,7 +1057,7 @@ func TestEvaluatorSourceCodeServiceImpl_Run(t *testing.T) { tt.mockSetup(ctrl, mockRuntimeManager, mockCodeBuilderFactory, mockRuntime, mockMetrics) - output, runStatus, _ := service.Run(context.Background(), tt.evaluator, tt.input, tt.disableTracing) + output, runStatus, _ := service.Run(context.Background(), tt.evaluator, tt.input, 0, tt.disableTracing) // 验证结果 assert.Equal(t, tt.wantStatus, runStatus) diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go index c48d6ca29..e65c75da6 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go @@ -329,6 +329,13 @@ func (r *EvaluatorTemplateRepoImpl) GetEvaluatorTemplate(ctx context.Context, id return nil, err } + // 补充查询：回填模板标签（按当前语言） + allTags, tagErr := r.tagDAO.BatchGetTagsBySourceIDsAndType(ctx, []int64{id}, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), contexts.CtxLocale(ctx)) + if tagErr == nil && len(allTags) > 0 { + tagsBySourceID := map[int64][]*model.EvaluatorTag{id: allTags} + r.setTemplateTags(templateDO, id, tagsBySourceID) + } + return templateDO, nil } From 91285f4590781832fa1c3262004cb263078a52f6 Mon Sep 17 00:00:00 2001 From: tpfz Date: Wed, 5 Nov 2025 11:45:17 +0800 Subject: [PATCH 32/42] fix ut --- .../coze/loop/apis/evaluator_service_test.go | 2 +- .../application/evaluator_app_test.go | 152 +++++++++--------- .../application/experiment_app_test.go | 32 ++-- .../repo/evaluator/evaluator_impl_test.go | 97 ++++++----- .../evaluator/evaluator_template_impl_test.go | 18 ++- .../repo/evaluator/mysql/evaluator_tag.go | 4 +- .../mysql/evaluator_tag_filter_test.go | 53 ++++-- 7 files changed, 195 insertions(+), 163 deletions(-) diff --git a/backend/api/handler/coze/loop/apis/evaluator_service_test.go b/backend/api/handler/coze/loop/apis/evaluator_service_test.go index 73187ea01..f6aa41606 100644 --- a/backend/api/handler/coze/loop/apis/evaluator_service_test.go +++ b/backend/api/handler/coze/loop/apis/evaluator_service_test.go @@ -112,7 +112,7 @@ func (m *mockEvaluatorClient) ListTemplatesV2(ctx context.Context, req *evaluato } func (m *mockEvaluatorClient) GetTemplateV2(ctx context.Context, req *evaluator.GetTemplateV2Request, callOptions ...callopt.Option) (r *evaluator.GetTemplateV2Response, err error) { - return &evaluator.GetTemplateV2Response{}, nil + return &evaluator.GetTemplateV2Response{}, nil } func (m *mockEvaluatorClient) CreateEvaluatorTemplate(ctx context.Context, req *evaluator.CreateEvaluatorTemplateRequest, callOptions ...callopt.Option) (r *evaluator.CreateEvaluatorTemplateResponse, err error) { diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index 9145ed7f3..bdaae8465 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -399,9 +399,9 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { validWorkspaceID := int64(123) validEvaluatorVersionID := int64(456) validEvaluator := &entity.Evaluator{ - ID: 1, - SpaceID: validWorkspaceID, - Name: "test-evaluator", + ID: 1, + SpaceID: validWorkspaceID, + Name: "test-evaluator", EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ ID: validEvaluatorVersionID, @@ -411,10 +411,10 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { } builtinEvaluator := &entity.Evaluator{ - ID: 2, - SpaceID: validWorkspaceID, - Name: "builtin-evaluator", - Builtin: true, + ID: 2, + SpaceID: validWorkspaceID, + Name: "builtin-evaluator", + Builtin: true, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{ ID: validEvaluatorVersionID, @@ -437,7 +437,7 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { WorkspaceID: validWorkspaceID, EvaluatorVersionID: validEvaluatorVersionID, Builtin: gptr.Of(false), - IncludeDeleted: gptr.Of(false), + IncludeDeleted: gptr.Of(false), }, mockSetup: func() { // Mock service call - non-builtin, with spaceID @@ -468,7 +468,7 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { WorkspaceID: validWorkspaceID, EvaluatorVersionID: validEvaluatorVersionID, Builtin: gptr.Of(true), - IncludeDeleted: gptr.Of(false), + IncludeDeleted: gptr.Of(false), }, mockSetup: func() { // Mock service call - builtin, without spaceID @@ -504,7 +504,7 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { WorkspaceID: validWorkspaceID, EvaluatorVersionID: validEvaluatorVersionID, Builtin: gptr.Of(false), - IncludeDeleted: gptr.Of(false), + IncludeDeleted: gptr.Of(false), }, mockSetup: func() { // Mock service call - returns nil @@ -521,7 +521,7 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { WorkspaceID: validWorkspaceID, EvaluatorVersionID: validEvaluatorVersionID, Builtin: gptr.Of(false), - IncludeDeleted: gptr.Of(false), + IncludeDeleted: gptr.Of(false), }, mockSetup: func() { // Mock service call - returns error @@ -538,7 +538,7 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { WorkspaceID: validWorkspaceID, EvaluatorVersionID: validEvaluatorVersionID, Builtin: gptr.Of(false), - IncludeDeleted: gptr.Of(false), + IncludeDeleted: gptr.Of(false), }, mockSetup: func() { // Mock service call @@ -565,7 +565,7 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { WorkspaceID: validWorkspaceID, EvaluatorVersionID: validEvaluatorVersionID, Builtin: gptr.Of(true), - IncludeDeleted: gptr.Of(false), + IncludeDeleted: gptr.Of(false), }, mockSetup: func() { // Mock service call @@ -589,7 +589,7 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { WorkspaceID: validWorkspaceID, EvaluatorVersionID: validEvaluatorVersionID, Builtin: gptr.Of(true), - IncludeDeleted: gptr.Of(false), + IncludeDeleted: gptr.Of(false), }, mockSetup: func() { // Mock service call @@ -621,7 +621,7 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { WorkspaceID: validWorkspaceID, EvaluatorVersionID: validEvaluatorVersionID, Builtin: gptr.Of(true), - IncludeDeleted: gptr.Of(false), + IncludeDeleted: gptr.Of(false), }, mockSetup: func() { // Mock service call @@ -653,7 +653,7 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { WorkspaceID: validWorkspaceID, EvaluatorVersionID: validEvaluatorVersionID, Builtin: gptr.Of(false), - IncludeDeleted: gptr.Of(true), + IncludeDeleted: gptr.Of(true), }, mockSetup: func() { // Mock service call with includeDeleted=true @@ -821,9 +821,9 @@ func TestEvaluatorHandlerImpl_ComplexBusinessScenarios(t *testing.T) { Times(1) // 4. 评估器调试 - mockEvaluatorService.EXPECT(). - DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). - DoAndReturn(func(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64) (*entity.EvaluatorOutputData, error) { + mockEvaluatorService.EXPECT(). + DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). + DoAndReturn(func(ctx context.Context, evaluator *entity.Evaluator, input *entity.EvaluatorInputData, exptSpaceID int64) (*entity.EvaluatorOutputData, error) { // 验证输入数据已被正确处理 assert.Equal(t, int64(123), evaluator.SpaceID) assert.Equal(t, entity.EvaluatorTypePrompt, evaluator.EvaluatorType) @@ -2123,7 +2123,7 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { mockFileProvider.EXPECT().MGetFileURL(gomock.Any(), gomock.Any()).Return(map[string]string{}, nil).AnyTimes() - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( &entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.8), @@ -2182,14 +2182,14 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { // 使用 InOrder 来确保调用顺序 gomock.InOrder( - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( &entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.9), Reasoning: "result 1", }, }, nil), - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( &entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.7), @@ -2366,14 +2366,14 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { // 使用 InOrder 来确保调用顺序 gomock.InOrder( - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( &entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.8), Reasoning: "success result", }, }, nil), - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return( nil, errors.New("evaluation failed")), ) }, @@ -2450,7 +2450,7 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { mockFileProvider.EXPECT().MGetFileURL(gomock.Any(), gomock.Any()).Return(map[string]string{}, nil).AnyTimes() // Mock 100次调用 - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(&entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.8), @@ -2492,7 +2492,7 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { mockFileProvider.EXPECT().MGetFileURL(gomock.Any(), gomock.Any()).Return(map[string]string{}, nil).AnyTimes() // 返回 nil output 和 error - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(nil, errors.New("code execution failed")) }, wantResp: &evaluatorservice.BatchDebugEvaluatorResponse{ @@ -2551,7 +2551,7 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { mockFileProvider.EXPECT().MGetFileURL(gomock.Any(), gomock.Any()).Return(map[string]string{}, nil).AnyTimes() // 第一个成功 - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(&entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{ Score: gptr.Of(0.9), @@ -2560,7 +2560,7 @@ func TestEvaluatorHandlerImpl_BatchDebugEvaluator(t *testing.T) { }, nil).Times(1) // 第二个失败 (nil output + error) - mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT().DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(nil, errors.New("processing error")).Times(1) // 第三个成功但有 evaluator run error @@ -2702,8 +2702,8 @@ func TestEvaluatorHandlerImpl_ListTemplatesV2(t *testing.T) { { name: "success - with filter option", req: &evaluatorservice.ListTemplatesV2Request{ - PageSize: gptr.Of(int32(20)), - PageNumber: gptr.Of(int32(1)), + PageSize: gptr.Of(int32(20)), + PageNumber: gptr.Of(int32(1)), FilterOption: &evaluatordto.EvaluatorFilterOption{}, }, mockSetup: func() { @@ -2780,17 +2780,17 @@ func TestEvaluatorHandlerImpl_GetTemplateV2(t *testing.T) { Description: "test description", } - tests := []struct { + tests := []struct { name string - req *evaluatorservice.GetTemplateV2Request + req *evaluatorservice.GetTemplateV2Request mockSetup func() - wantResp *evaluatorservice.GetTemplateV2Response + wantResp *evaluatorservice.GetTemplateV2Response wantErr bool wantErrCode int32 }{ { name: "success - normal request", - req: &evaluatorservice.GetTemplateV2Request{ + req: &evaluatorservice.GetTemplateV2Request{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -2803,14 +2803,14 @@ func TestEvaluatorHandlerImpl_GetTemplateV2(t *testing.T) { Template: template, }, nil) }, - wantResp: &evaluatorservice.GetTemplateV2Response{ + wantResp: &evaluatorservice.GetTemplateV2Response{ EvaluatorTemplate: evaluator.ConvertEvaluatorTemplateDO2DTO(template), }, wantErr: false, }, { name: "success - template not found", - req: &evaluatorservice.GetTemplateV2Request{ + req: &evaluatorservice.GetTemplateV2Request{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -2820,12 +2820,12 @@ func TestEvaluatorHandlerImpl_GetTemplateV2(t *testing.T) { Template: nil, }, nil) }, - wantResp: &evaluatorservice.GetTemplateV2Response{}, + wantResp: &evaluatorservice.GetTemplateV2Response{}, wantErr: false, }, { name: "error - service failure", - req: &evaluatorservice.GetTemplateV2Request{ + req: &evaluatorservice.GetTemplateV2Request{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -2843,7 +2843,7 @@ func TestEvaluatorHandlerImpl_GetTemplateV2(t *testing.T) { t.Run(tt.name, func(t *testing.T) { tt.mockSetup() - resp, err := app.GetTemplateV2(context.Background(), tt.req) + resp, err := app.GetTemplateV2(context.Background(), tt.req) if tt.wantErr { assert.Error(t, err) @@ -2890,15 +2890,15 @@ func TestEvaluatorHandlerImpl_CreateEvaluatorTemplate(t *testing.T) { tests := []struct { name string - req *evaluatorservice.CreateEvaluatorTemplateRequest + req *evaluatorservice.CreateEvaluatorTemplateRequest mockSetup func() - wantResp *evaluatorservice.CreateEvaluatorTemplateResponse + wantResp *evaluatorservice.CreateEvaluatorTemplateResponse wantErr bool wantErrCode int32 }{ { name: "success - normal request", - req: &evaluatorservice.CreateEvaluatorTemplateRequest{ + req: &evaluatorservice.CreateEvaluatorTemplateRequest{ EvaluatorTemplate: templateDTO, }, mockSetup: func() { @@ -2912,14 +2912,14 @@ func TestEvaluatorHandlerImpl_CreateEvaluatorTemplate(t *testing.T) { Template: evaluator.ConvertEvaluatorTemplateDTO2DO(templateDTO), }, nil) }, - wantResp: &evaluatorservice.CreateEvaluatorTemplateResponse{ + wantResp: &evaluatorservice.CreateEvaluatorTemplateResponse{ EvaluatorTemplate: templateDTO, }, wantErr: false, }, { name: "error - nil template", - req: &evaluatorservice.CreateEvaluatorTemplateRequest{ + req: &evaluatorservice.CreateEvaluatorTemplateRequest{ EvaluatorTemplate: nil, }, mockSetup: func() {}, @@ -2929,7 +2929,7 @@ func TestEvaluatorHandlerImpl_CreateEvaluatorTemplate(t *testing.T) { }, { name: "error - auth failed", - req: &evaluatorservice.CreateEvaluatorTemplateRequest{ + req: &evaluatorservice.CreateEvaluatorTemplateRequest{ EvaluatorTemplate: &evaluatordto.EvaluatorTemplate{ ID: gptr.Of(int64(1)), WorkspaceID: gptr.Of(int64(789)), // 不在允许列表中 @@ -2952,7 +2952,7 @@ func TestEvaluatorHandlerImpl_CreateEvaluatorTemplate(t *testing.T) { }, { name: "error - service failure", - req: &evaluatorservice.CreateEvaluatorTemplateRequest{ + req: &evaluatorservice.CreateEvaluatorTemplateRequest{ EvaluatorTemplate: templateDTO, }, mockSetup: func() { @@ -3020,15 +3020,15 @@ func TestEvaluatorHandlerImpl_UpdateEvaluatorTemplate(t *testing.T) { tests := []struct { name string - req *evaluatorservice.UpdateEvaluatorTemplateRequest + req *evaluatorservice.UpdateEvaluatorTemplateRequest mockSetup func() - wantResp *evaluatorservice.UpdateEvaluatorTemplateResponse + wantResp *evaluatorservice.UpdateEvaluatorTemplateResponse wantErr bool wantErrCode int32 }{ { name: "success - normal request", - req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ + req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, EvaluatorTemplate: templateDTO, }, @@ -3043,14 +3043,14 @@ func TestEvaluatorHandlerImpl_UpdateEvaluatorTemplate(t *testing.T) { Template: evaluator.ConvertEvaluatorTemplateDTO2DO(templateDTO), }, nil) }, - wantResp: &evaluatorservice.UpdateEvaluatorTemplateResponse{ + wantResp: &evaluatorservice.UpdateEvaluatorTemplateResponse{ EvaluatorTemplate: templateDTO, }, wantErr: false, }, { name: "error - nil template", - req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ + req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, EvaluatorTemplate: nil, }, @@ -3061,7 +3061,7 @@ func TestEvaluatorHandlerImpl_UpdateEvaluatorTemplate(t *testing.T) { }, { name: "error - auth failed", - req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ + req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, EvaluatorTemplate: &evaluatordto.EvaluatorTemplate{ ID: gptr.Of(templateID), @@ -3085,7 +3085,7 @@ func TestEvaluatorHandlerImpl_UpdateEvaluatorTemplate(t *testing.T) { }, { name: "error - service failure", - req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ + req: &evaluatorservice.UpdateEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, EvaluatorTemplate: templateDTO, }, @@ -3153,15 +3153,15 @@ func TestEvaluatorHandlerImpl_DeleteEvaluatorTemplate(t *testing.T) { tests := []struct { name string - req *evaluatorservice.DeleteEvaluatorTemplateRequest + req *evaluatorservice.DeleteEvaluatorTemplateRequest mockSetup func() - wantResp *evaluatorservice.DeleteEvaluatorTemplateResponse + wantResp *evaluatorservice.DeleteEvaluatorTemplateResponse wantErr bool wantErrCode int32 }{ { name: "success - normal request", - req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ + req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -3184,12 +3184,12 @@ func TestEvaluatorHandlerImpl_DeleteEvaluatorTemplate(t *testing.T) { }). Return(&entity.DeleteEvaluatorTemplateResponse{}, nil) }, - wantResp: &evaluatorservice.DeleteEvaluatorTemplateResponse{}, + wantResp: &evaluatorservice.DeleteEvaluatorTemplateResponse{}, wantErr: false, }, { name: "error - template id is 0", - req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ + req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ EvaluatorTemplateID: 0, }, mockSetup: func() {}, @@ -3199,7 +3199,7 @@ func TestEvaluatorHandlerImpl_DeleteEvaluatorTemplate(t *testing.T) { }, { name: "error - template not found", - req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ + req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -3215,7 +3215,7 @@ func TestEvaluatorHandlerImpl_DeleteEvaluatorTemplate(t *testing.T) { }, { name: "error - auth failed", - req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ + req: &evaluatorservice.DeleteEvaluatorTemplateRequest{ EvaluatorTemplateID: templateID, }, mockSetup: func() { @@ -3308,15 +3308,15 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { tests := []struct { name string - req *evaluatorservice.DebugBuiltinEvaluatorRequest + req *evaluatorservice.DebugBuiltinEvaluatorRequest mockSetup func() - wantResp *evaluatorservice.DebugBuiltinEvaluatorResponse + wantResp *evaluatorservice.DebugBuiltinEvaluatorResponse wantErr bool wantErrCode int32 }{ { name: "success - normal request", - req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ + req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ EvaluatorID: evaluatorID, WorkspaceID: workspaceID, InputData: inputData, @@ -3335,17 +3335,17 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { Return(builtinEvaluator, nil) mockEvaluatorService.EXPECT(). - DebugEvaluator(gomock.Any(), builtinEvaluator, gomock.Any(), gomock.Any()). + DebugEvaluator(gomock.Any(), builtinEvaluator, gomock.Any(), gomock.Any()). Return(outputData, nil) }, - wantResp: &evaluatorservice.DebugBuiltinEvaluatorResponse{ + wantResp: &evaluatorservice.DebugBuiltinEvaluatorResponse{ OutputData: evaluator.ConvertEvaluatorOutputDataDO2DTO(outputData), }, wantErr: false, }, { name: "error - auth failed", - req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ + req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ EvaluatorID: evaluatorID, WorkspaceID: workspaceID, InputData: inputData, @@ -3361,7 +3361,7 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { }, { name: "error - evaluator not found", - req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ + req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ EvaluatorID: evaluatorID, WorkspaceID: workspaceID, InputData: inputData, @@ -3381,7 +3381,7 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { }, { name: "error - debug failure", - req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ + req: &evaluatorservice.DebugBuiltinEvaluatorRequest{ EvaluatorID: evaluatorID, WorkspaceID: workspaceID, InputData: inputData, @@ -3395,8 +3395,8 @@ func TestEvaluatorHandlerImpl_DebugBuiltinEvaluator(t *testing.T) { GetBuiltinEvaluator(gomock.Any(), evaluatorID). Return(builtinEvaluator, nil) - mockEvaluatorService.EXPECT(). - DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). + mockEvaluatorService.EXPECT(). + DebugEvaluator(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(nil, errorx.NewByCode(errno.CommonInternalErrorCode)) }, wantResp: nil, @@ -3600,7 +3600,7 @@ func TestEvaluatorHandlerImpl_ListEvaluatorTags(t *testing.T) { } tags := map[string][]string{ - evaluatordto.EvaluatorTagKeyCategory: {"category1", "category2"}, + evaluatordto.EvaluatorTagKeyCategory: {"category1", "category2"}, evaluatordto.EvaluatorTagKeyTargetType: {"domain1"}, } @@ -3614,7 +3614,7 @@ func TestEvaluatorHandlerImpl_ListEvaluatorTags(t *testing.T) { }{ { name: "success - normal request", - req: &evaluatorservice.ListEvaluatorTagsRequest{}, + req: &evaluatorservice.ListEvaluatorTagsRequest{}, mockSetup: func() { mockConfiger.EXPECT(). GetEvaluatorTagConf(gomock.Any()). @@ -3627,7 +3627,7 @@ func TestEvaluatorHandlerImpl_ListEvaluatorTags(t *testing.T) { }, { name: "success - empty tags", - req: &evaluatorservice.ListEvaluatorTagsRequest{}, + req: &evaluatorservice.ListEvaluatorTagsRequest{}, mockSetup: func() { mockConfiger.EXPECT(). GetEvaluatorTagConf(gomock.Any()). @@ -3640,18 +3640,18 @@ func TestEvaluatorHandlerImpl_ListEvaluatorTags(t *testing.T) { }, { name: "success - tags kept order from config", - req: &evaluatorservice.ListEvaluatorTagsRequest{}, + req: &evaluatorservice.ListEvaluatorTagsRequest{}, mockSetup: func() { mockConfiger.EXPECT(). GetEvaluatorTagConf(gomock.Any()). Return(map[string][]string{ - evaluatordto.EvaluatorTagKeyCategory: {"z", "a", "m"}, + evaluatordto.EvaluatorTagKeyCategory: {"z", "a", "m"}, evaluatordto.EvaluatorTagKeyTargetType: {"x", "b"}, }) }, wantResp: &evaluatorservice.ListEvaluatorTagsResponse{ Tags: map[string][]string{ - evaluatordto.EvaluatorTagKeyCategory: {"z", "a", "m"}, + evaluatordto.EvaluatorTagKeyCategory: {"z", "a", "m"}, evaluatordto.EvaluatorTagKeyTargetType: {"x", "b"}, }, }, diff --git a/backend/modules/evaluation/application/experiment_app_test.go b/backend/modules/evaluation/application/experiment_app_test.go index fc44d71ef..b399196a3 100644 --- a/backend/modules/evaluation/application/experiment_app_test.go +++ b/backend/modules/evaluation/application/experiment_app_test.go @@ -207,29 +207,29 @@ func Test_experimentApplication_resolveEvaluatorVersionIDs(t *testing.T) { // 期望： // - BuiltinVisible: eid=1 返回可见版本，其版本ID设为 10101 // - 普通对： (2,1.0.0) -> 20200, (3,2.0.0) -> 30300 - mockEvaluatorService.EXPECT().BatchGetBuiltinEvaluator(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ - {ID: 1, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 1, Version: "1.2.3", ID: 10101}}, - }, nil) + mockEvaluatorService.EXPECT().BatchGetBuiltinEvaluator(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ + {ID: 1, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 1, Version: "1.2.3", ID: 10101}}, + }, nil) - mockEvaluatorService.EXPECT().BatchGetEvaluatorByIDAndVersion(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ - {ID: 2, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 2, Version: "1.0.0", ID: 20200}}, - {ID: 3, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 3, Version: "2.0.0", ID: 30300}}, - }, nil) + mockEvaluatorService.EXPECT().BatchGetEvaluatorByIDAndVersion(gomock.Any(), gomock.Any()).Return([]*entity.Evaluator{ + {ID: 2, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 2, Version: "1.0.0", ID: 20200}}, + {ID: 3, EvaluatorType: entity.EvaluatorTypePrompt, PromptEvaluatorVersion: &entity.PromptEvaluatorVersion{EvaluatorID: 3, Version: "2.0.0", ID: 30300}}, + }, nil) ids, err := app.resolveEvaluatorVersionIDs(ctx, req) if err != nil { t.Fatalf("resolveEvaluatorVersionIDs error: %v", err) } - // 输入顺序：builtin(10101), (2,1.0.0)->20200, (2,1.0.0)->20200(重复), (3,2.0.0)->30300 - // 该函数本身不去重（去重发生在 SubmitExperiment 中），因此期望长度为 4 - if got, want := len(ids), 4; got != want { - t.Fatalf("len(ids)=%d want=%d", got, want) - } - if ids[0] != 10101 || ids[1] != 20200 || ids[2] != 20200 || ids[3] != 30300 { - t.Fatalf("ids=%v want=[10101 20200 20200 30300]", ids) - } + // 输入顺序：builtin(10101), (2,1.0.0)->20200, (2,1.0.0)->20200(重复), (3,2.0.0)->30300 + // 该函数本身不去重（去重发生在 SubmitExperiment 中），因此期望长度为 4 + if got, want := len(ids), 4; got != want { + t.Fatalf("len(ids)=%d want=%d", got, want) + } + if ids[0] != 10101 || ids[1] != 20200 || ids[2] != 20200 || ids[3] != 30300 { + t.Fatalf("ids=%v want=[10101 20200 20200 30300]", ids) + } - // 本用例不校验映射回填 + // 本用例不校验映射回填 } // Test_experimentApplication_resolveEvaluatorVersionIDs_WithEvaluatorFieldMapping 覆盖 EvaluatorFieldMapping 的回填逻辑 diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index d1e966b9c..161272f97 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -2320,67 +2320,59 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { mockEvaluatorVersionDao := evaluatormocks.NewMockEvaluatorVersionDAO(ctrl) mockTagDao := evaluatormocks.NewMockEvaluatorTagDAO(ctrl) - // 处理筛选条件 - if tt.request.FilterOption != nil { - hasValidFilters := false - if tt.request.FilterOption.SearchKeyword != nil && *tt.request.FilterOption.SearchKeyword != "" { - hasValidFilters = true - } - if tt.request.FilterOption.Filters != nil && len(tt.request.FilterOption.Filters.FilterConditions) > 0 { - hasValidFilters = true + // ListBuiltinEvaluator 现在总是会调用 GetSourceIDsByFilterConditions（即使 FilterOption 为 nil） + // 根据 GetSourceIDsByFilterConditions 返回的 IDs 来决定是否调用 ListBuiltinEvaluator + var evaluatorIDsFromFilter []int64 + var totalFromFilter int64 + + // 计算 GetSourceIDsByFilterConditions 应该返回的 IDs + if tt.name == "成功 - 筛选后无结果" { + evaluatorIDsFromFilter = []int64{} + totalFromFilter = 0 + } else if tt.name == "失败 - DAO查询错误" { + // DAO查询错误的情况：需要让 GetSourceIDsByFilterConditions 返回非空 IDs + // 这样才能调用 ListBuiltinEvaluator，然后测试 DAO 查询错误 + evaluatorIDsFromFilter = []int64{1} + totalFromFilter = 1 + } else if tt.mockDaoResult != nil && len(tt.mockDaoResult.Evaluators) > 0 { + // 有结果的情况，返回对应的evaluator IDs + evaluatorIDsFromFilter = make([]int64, 0, len(tt.mockDaoResult.Evaluators)) + for _, evaluator := range tt.mockDaoResult.Evaluators { + evaluatorIDsFromFilter = append(evaluatorIDsFromFilter, evaluator.ID) } - - if hasValidFilters { - // 设置标签筛选查询的期望 - if tt.name == "成功 - 筛选后无结果" { - mockTagDao.EXPECT(). - GetSourceIDsByFilterConditions( - gomock.Any(), - int32(entity.EvaluatorTagKeyType_Evaluator), - tt.request.FilterOption, - tt.request.PageSize, - tt.request.PageNum, - gomock.Any(), - ).Return([]int64{}, int64(0), nil) - } else { - mockTagDao.EXPECT(). - GetSourceIDsByFilterConditions( - gomock.Any(), - int32(entity.EvaluatorTagKeyType_Evaluator), - tt.request.FilterOption, - tt.request.PageSize, - tt.request.PageNum, - gomock.Any(), - ).Return([]int64{1}, int64(1), nil) + totalFromFilter = int64(tt.mockDaoResult.TotalCount) + } else { + // 其他情况（如无筛选条件但有结果），返回对应的evaluator IDs + evaluatorIDsFromFilter = make([]int64, 0) + if tt.mockDaoResult != nil { + for _, evaluator := range tt.mockDaoResult.Evaluators { + evaluatorIDsFromFilter = append(evaluatorIDsFromFilter, evaluator.ID) } } + totalFromFilter = int64(tt.expectedCount) } - // 设置evaluatorDao的期望 - if tt.mockDaoResult != nil || tt.mockDaoError != nil { - expectedIDs := []int64{} - if tt.request.FilterOption != nil { - hasValidFilters := false - if tt.request.FilterOption.SearchKeyword != nil && *tt.request.FilterOption.SearchKeyword != "" { - hasValidFilters = true - } - if tt.request.FilterOption.Filters != nil && len(tt.request.FilterOption.Filters.FilterConditions) > 0 { - hasValidFilters = true - } - if hasValidFilters { - if tt.name != "成功 - 筛选后无结果" { - expectedIDs = []int64{1} - } - } - } - + // Mock GetSourceIDsByFilterConditions + mockTagDao.EXPECT(). + GetSourceIDsByFilterConditions( + gomock.Any(), + int32(entity.EvaluatorTagKeyType_Evaluator), + tt.request.FilterOption, + tt.request.PageSize, + tt.request.PageNum, + gomock.Any(), + ).Return(evaluatorIDsFromFilter, totalFromFilter, nil) + + // 只有当 GetSourceIDsByFilterConditions 返回的 IDs 不为空时，才会调用 ListBuiltinEvaluator + // 并且根据实现，ListBuiltinEvaluator 的请求中 PageSize 和 PageNum 都是 0 + if len(evaluatorIDsFromFilter) > 0 { mockEvaluatorDao.EXPECT(). ListBuiltinEvaluator( gomock.Any(), &mysql.ListBuiltinEvaluatorRequest{ - IDs: expectedIDs, - PageSize: tt.request.PageSize, - PageNum: tt.request.PageNum, + IDs: evaluatorIDsFromFilter, + PageSize: 0, + PageNum: 0, OrderBy: []*mysql.OrderBy{{Field: "name", ByDesc: false}}, }, ).Return(tt.mockDaoResult, tt.mockDaoError) @@ -2968,3 +2960,4 @@ func TestEvaluatorRepoImpl_UpdateEvaluatorTags(t *testing.T) { }) } } + diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go index d03dbef96..38fe1f28a 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl_test.go @@ -17,8 +17,8 @@ import ( "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql" - mysqlmocks "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks" "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/gorm_gen/model" + mysqlmocks "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/repo/evaluator/mysql/mocks" ) // TestEvaluatorTemplateRepoImpl_ListEvaluatorTemplate 测试查询评估器模板列表 @@ -722,6 +722,22 @@ func TestEvaluatorTemplateRepoImpl_GetEvaluatorTemplate(t *testing.T) { tt.mockSetup(mockTemplateDAO) + // Mock tagDAO.BatchGetTagsBySourceIDsAndType 调用（GetEvaluatorTemplate 现在会查询标签） + // 对于成功的测试用例，mock tag查询返回空标签列表（不会影响结果） + // 对于模板不存在的用例，不需要mock tag查询（因为会提前返回） + // 对于数据库错误的用例，也不需要mock tag查询（因为会在tag查询之前就失败） + if !tt.expectedError && tt.name != "成功 - 模板不存在" { + mockTagDAO.EXPECT(). + BatchGetTagsBySourceIDsAndType( + gomock.Any(), + []int64{tt.id}, + int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), + gomock.Any(), + ). + Return([]*model.EvaluatorTag{}, nil). + AnyTimes() + } + repo := NewEvaluatorTemplateRepo(mockTagDAO, mockTemplateDAO, mockIDGen) result, err := repo.GetEvaluatorTemplate(context.Background(), tt.id, tt.includeDeleted) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go index 0e5f979d5..29ccb6bd2 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag.go @@ -150,10 +150,10 @@ func (dao *EvaluatorTagDAOImpl) GetSourceIDsByFilterConditions(ctx context.Conte } query = query.Joins(nameJoinSQL, nameJoinArgs...) - // 处理搜索关键词（在所有非 Category 标签范围内 LIKE 匹配） + // 处理搜索关键词（只在 Name 标签范围内 LIKE 匹配） if filterOption.SearchKeyword != nil && *filterOption.SearchKeyword != "" { keyword := "%" + *filterOption.SearchKeyword + "%" - query = query.Where("evaluator_tag.tag_key <> ? AND evaluator_tag.tag_value LIKE ?", string(entity.EvaluatorTagKey_Category), keyword) + query = query.Where("evaluator_tag.tag_key = ? AND evaluator_tag.tag_value LIKE ?", "Name", keyword) } // 处理筛选条件（自连接实现 AND，WHERE 实现 OR） diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go index 05a3ea2c0..5b64f40e4 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go @@ -286,20 +286,42 @@ func TestEvaluatorTagDAOImpl_GetSourceIDsByFilterConditions(t *testing.T) { // 创建mock provider mockProvider := dbmock.NewMockProvider(ctrl) - // 对于nil的filterOption，方法会直接返回，不需要数据库调用 - if tt.filterOption == nil { - // 这种情况下方法直接返回，不需要设置mock期望 + // GetSourceIDsByFilterConditions 即使 filterOption 为 nil，也会创建一个空的 EvaluatorFilterOption 并继续执行查询 + // 所以所有测试用例都需要 mock NewSession 和数据库查询 + mockProvider.EXPECT().NewSession(gomock.Any(), gomock.Any()).Return(gormDB).Times(1) + + // Mock COUNT 查询（放宽匹配，兼容 JOIN、别名与列限定） + // 所有查询都会包含 LEFT JOIN t_name（用于排序） + countRows := sqlmock.NewRows([]string{"count"}).AddRow(0) + mock.ExpectQuery("SELECT COUNT\\(DISTINCT\\(.*source_id.*\\)\\) FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*").WillReturnRows(countRows) + + // Mock SELECT 查询（放宽匹配，兼容 DISTINCT、JOIN、ORDER BY 等） + // 所有查询都会包含 LEFT JOIN t_name（用于排序）和 ORDER BY t_name.tag_value + selectRows := sqlmock.NewRows([]string{"source_id"}) + hasSearchKeyword := tt.filterOption != nil && tt.filterOption.SearchKeyword != nil && *tt.filterOption.SearchKeyword != "" + hasFilters := tt.filterOption != nil && tt.filterOption.Filters != nil + + if hasSearchKeyword && hasFilters { + // 既有 SearchKeyword 又有 Filters 时，SQL 包含： + // - LEFT JOIN t_name + // - JOIN t_1, JOIN t_2 等（自连接，来自 Filters 的 AND 条件） + // - WHERE evaluator_tag.tag_key = ? AND evaluator_tag.tag_value LIKE ? (来自 SearchKeyword，参数化查询) + // - 可能还有其他 WHERE 条件（来自 Filters 的 OR 条件） + // - ORDER BY + // 注意：WHERE 条件可能包含括号，且使用参数化查询（?），需要更宽松的匹配 + mock.ExpectQuery("SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*JOIN evaluator_tag AS.*WHERE .*tag_key.*=.*AND.*tag_value.*LIKE.*ORDER BY.*").WillReturnRows(selectRows) + } else if hasSearchKeyword { + // 只有 SearchKeyword 时，SQL 包含 WHERE evaluator_tag.tag_key = ? AND evaluator_tag.tag_value LIKE ? (参数化查询) + // 注意：WHERE 条件可能包含括号，且还有其他基础 WHERE 条件（tag_type, deleted_at），使用参数化查询 + // 匹配模式：tag_key = ? 和 tag_value LIKE ? + mock.ExpectQuery("SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*WHERE .*tag_key.*=.*AND.*tag_value.*LIKE.*ORDER BY.*").WillReturnRows(selectRows) + } else if hasFilters { + // 只有 Filters 时，SQL 可能包含 JOIN 其他表（自连接）和 WHERE 条件 + // 需要匹配可能包含的 JOIN 自连接 + mock.ExpectQuery("SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*ORDER BY.*").WillReturnRows(selectRows) } else { - // 对于非nil的filterOption，方法会调用NewSession并执行查询 - mockProvider.EXPECT().NewSession(gomock.Any(), gomock.Any()).Return(gormDB).Times(1) - - // Mock COUNT 查询（放宽匹配，兼容 JOIN、别名与列限定） - countRows := sqlmock.NewRows([]string{"count"}).AddRow(0) - mock.ExpectQuery("SELECT COUNT\\(DISTINCT\\(.*source_id.*\\)\\) FROM `evaluator_tag`.*").WillReturnRows(countRows) - - // Mock SELECT 查询（放宽匹配，兼容 DISTINCT、JOIN、ORDER BY 等） - selectRows := sqlmock.NewRows([]string{"source_id"}) - mock.ExpectQuery("SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*").WillReturnRows(selectRows) + // 无 SearchKeyword 和 Filters 时，SQL 只包含基础查询和 LEFT JOIN t_name + mock.ExpectQuery("SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*ORDER BY.*").WillReturnRows(selectRows) } // 创建DAO实例 @@ -520,10 +542,11 @@ func TestGetSourceIDsByFilterConditions_SelfJoinAndLike(t *testing.T) { "SELECT COUNT\\(DISTINCT\\(.*source_id.*\\)\\) FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*JOIN evaluator_tag AS t_1.*JOIN evaluator_tag AS t_2.*", ).WillReturnRows(countRows) - // 断言 SELECT：包含 DISTINCT、LEFT JOIN t_name、JOIN t_1 / t_2、LIKE 与 非 Category 限定 + // 断言 SELECT：包含 DISTINCT、LEFT JOIN t_name、JOIN t_1 / t_2、LIKE 与 Name 标签限定 + // SearchKeyword 现在只搜索 tag_key=Name selectRows := sqlmock.NewRows([]string{"source_id"}) mock.ExpectQuery( - "SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*JOIN evaluator_tag AS t_1.*JOIN evaluator_tag AS t_2.*WHERE .*evaluator_tag.tag_key <> .* AND evaluator_tag.tag_value LIKE .*", + "SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*JOIN evaluator_tag AS t_1.*JOIN evaluator_tag AS t_2.*WHERE .*evaluator_tag.tag_key = .*Name.* AND evaluator_tag.tag_value LIKE .*", ).WillReturnRows(selectRows) dao := &EvaluatorTagDAOImpl{provider: mockProvider} From c54575f62fd93c88a4349414efd2f32112b893ab Mon Sep 17 00:00:00 2001 From: tpfz Date: Wed, 5 Nov 2025 14:39:22 +0800 Subject: [PATCH 33/42] fix ut --- .../infra/repo/evaluator/mysql/evaluator_tag_filter_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go index 5b64f40e4..6062794b0 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/evaluator_tag_filter_test.go @@ -543,10 +543,10 @@ func TestGetSourceIDsByFilterConditions_SelfJoinAndLike(t *testing.T) { ).WillReturnRows(countRows) // 断言 SELECT：包含 DISTINCT、LEFT JOIN t_name、JOIN t_1 / t_2、LIKE 与 Name 标签限定 - // SearchKeyword 现在只搜索 tag_key=Name + // SearchKeyword 现在只搜索 tag_key=Name（使用参数化查询，且可能被括号包裹） selectRows := sqlmock.NewRows([]string{"source_id"}) mock.ExpectQuery( - "SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*JOIN evaluator_tag AS t_1.*JOIN evaluator_tag AS t_2.*WHERE .*evaluator_tag.tag_key = .*Name.* AND evaluator_tag.tag_value LIKE .*", + "SELECT DISTINCT .*source_id.* FROM `evaluator_tag`.*LEFT JOIN evaluator_tag AS t_name.*JOIN evaluator_tag AS t_1.*JOIN evaluator_tag AS t_2.*WHERE .*tag_key.*=.*AND.*tag_value.*LIKE.*ORDER BY.*", ).WillReturnRows(selectRows) dao := &EvaluatorTagDAOImpl{provider: mockProvider} From 9ea7bd2f26a96b8c0e92bf24c1782293e95bf114 Mon Sep 17 00:00:00 2001 From: tpfz Date: Wed, 5 Nov 2025 15:42:05 +0800 Subject: [PATCH 34/42] add custom --- .../router/coze/loop/apis/coze.loop.apis.go | 2 +- .../coze.loop.evaluation.evaluator.go | 138 ++++++++++++++---- .../k-coze.loop.evaluation.evaluator.go | 82 +++++++++-- .../convertor/evaluator/evaluator.go | 36 ++--- .../convertor/evaluator/evaluator_template.go | 100 ++++++------- .../evaluation/application/evaluator_app.go | 24 +++ .../repo/evaluator/evaluator_impl_test.go | 4 +- .../infra/repo/redis/convert/task_run.go | 2 +- .../coze.loop.evaluation.evaluator.thrift | 3 +- 9 files changed, 277 insertions(+), 114 deletions(-) diff --git a/backend/api/router/coze/loop/apis/coze.loop.apis.go b/backend/api/router/coze/loop/apis/coze.loop.apis.go index 0a0154fc6..ae9db33d4 100644 --- a/backend/api/router/coze/loop/apis/coze.loop.apis.go +++ b/backend/api/router/coze/loop/apis/coze.loop.apis.go @@ -186,7 +186,7 @@ func Register(r *server.Hertz, handler *apis.APIHandler) { } { _evaluator_template0 := _v11.Group("/evaluator_template", _evaluator_template0Mw(handler)...) - _evaluator_template0.POST("/:evaluator_template_id", append(_gettemplatev2Mw(handler), apis.GetTemplateV2)...) + _evaluator_template0.GET("/:evaluator_template_id", append(_gettemplatev2Mw(handler), apis.GetTemplateV2)...) _evaluator_template0.POST("/list", append(_listtemplatesv2Mw(handler), apis.ListTemplatesV2)...) } { diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go index 36d52d0bf..9793939cf 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/coze.loop.evaluation.evaluator.go @@ -18436,8 +18436,10 @@ func (p *ListTemplatesV2Response) Field255DeepEqual(src *base.BaseResp) bool { } type GetTemplateV2Request struct { - EvaluatorTemplateID int64 `thrift:"evaluator_template_id,1,required" frugal:"1,required,i64" json:"evaluator_template_id" path:"evaluator_template_id,required" ` - Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` + EvaluatorTemplateID *int64 `thrift:"evaluator_template_id,1,optional" frugal:"1,optional,i64" json:"evaluator_template_id" path:"evaluator_template_id" ` + // 是否查询自定义code评估器模板，默认不查询 + CustomCode *bool `thrift:"custom_code,2,optional" frugal:"2,optional,bool" json:"custom_code,omitempty" query:"custom_code"` + Base *base.Base `thrift:"Base,255,optional" frugal:"255,optional,base.Base" form:"Base" json:"Base,omitempty" query:"Base"` } func NewGetTemplateV2Request() *GetTemplateV2Request { @@ -18447,11 +18449,28 @@ func NewGetTemplateV2Request() *GetTemplateV2Request { func (p *GetTemplateV2Request) InitDefault() { } +var GetTemplateV2Request_EvaluatorTemplateID_DEFAULT int64 + func (p *GetTemplateV2Request) GetEvaluatorTemplateID() (v int64) { - if p != nil { - return p.EvaluatorTemplateID + if p == nil { + return } - return + if !p.IsSetEvaluatorTemplateID() { + return GetTemplateV2Request_EvaluatorTemplateID_DEFAULT + } + return *p.EvaluatorTemplateID +} + +var GetTemplateV2Request_CustomCode_DEFAULT bool + +func (p *GetTemplateV2Request) GetCustomCode() (v bool) { + if p == nil { + return + } + if !p.IsSetCustomCode() { + return GetTemplateV2Request_CustomCode_DEFAULT + } + return *p.CustomCode } var GetTemplateV2Request_Base_DEFAULT *base.Base @@ -18465,18 +18484,30 @@ func (p *GetTemplateV2Request) GetBase() (v *base.Base) { } return p.Base } -func (p *GetTemplateV2Request) SetEvaluatorTemplateID(val int64) { +func (p *GetTemplateV2Request) SetEvaluatorTemplateID(val *int64) { p.EvaluatorTemplateID = val } +func (p *GetTemplateV2Request) SetCustomCode(val *bool) { + p.CustomCode = val +} func (p *GetTemplateV2Request) SetBase(val *base.Base) { p.Base = val } var fieldIDToName_GetTemplateV2Request = map[int16]string{ 1: "evaluator_template_id", + 2: "custom_code", 255: "Base", } +func (p *GetTemplateV2Request) IsSetEvaluatorTemplateID() bool { + return p.EvaluatorTemplateID != nil +} + +func (p *GetTemplateV2Request) IsSetCustomCode() bool { + return p.CustomCode != nil +} + func (p *GetTemplateV2Request) IsSetBase() bool { return p.Base != nil } @@ -18484,7 +18515,6 @@ func (p *GetTemplateV2Request) IsSetBase() bool { func (p *GetTemplateV2Request) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 - var issetEvaluatorTemplateID bool = false if _, err = iprot.ReadStructBegin(); err != nil { goto ReadStructBeginError @@ -18505,7 +18535,14 @@ func (p *GetTemplateV2Request) Read(iprot thrift.TProtocol) (err error) { if err = p.ReadField1(iprot); err != nil { goto ReadFieldError } - issetEvaluatorTemplateID = true + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.BOOL { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } @@ -18530,10 +18567,6 @@ func (p *GetTemplateV2Request) Read(iprot thrift.TProtocol) (err error) { goto ReadStructEndError } - if !issetEvaluatorTemplateID { - fieldId = 1 - goto RequiredFieldNotSetError - } return nil ReadStructBeginError: return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) @@ -18548,21 +18581,30 @@ ReadFieldEndError: return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) ReadStructEndError: return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) -RequiredFieldNotSetError: - return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("required field %s is not set", fieldIDToName_GetTemplateV2Request[fieldId])) } func (p *GetTemplateV2Request) ReadField1(iprot thrift.TProtocol) error { - var _field int64 + var _field *int64 if v, err := iprot.ReadI64(); err != nil { return err } else { - _field = v + _field = &v } p.EvaluatorTemplateID = _field return nil } +func (p *GetTemplateV2Request) ReadField2(iprot thrift.TProtocol) error { + + var _field *bool + if v, err := iprot.ReadBool(); err != nil { + return err + } else { + _field = &v + } + p.CustomCode = _field + return nil +} func (p *GetTemplateV2Request) ReadField255(iprot thrift.TProtocol) error { _field := base.NewBase() if err := _field.Read(iprot); err != nil { @@ -18582,6 +18624,10 @@ func (p *GetTemplateV2Request) Write(oprot thrift.TProtocol) (err error) { fieldId = 1 goto WriteFieldError } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } if err = p.writeField255(oprot); err != nil { fieldId = 255 goto WriteFieldError @@ -18605,14 +18651,16 @@ WriteStructEndError: } func (p *GetTemplateV2Request) writeField1(oprot thrift.TProtocol) (err error) { - if err = oprot.WriteFieldBegin("evaluator_template_id", thrift.I64, 1); err != nil { - goto WriteFieldBeginError - } - if err := oprot.WriteI64(p.EvaluatorTemplateID); err != nil { - return err - } - if err = oprot.WriteFieldEnd(); err != nil { - goto WriteFieldEndError + if p.IsSetEvaluatorTemplateID() { + if err = oprot.WriteFieldBegin("evaluator_template_id", thrift.I64, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI64(*p.EvaluatorTemplateID); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } } return nil WriteFieldBeginError: @@ -18620,6 +18668,24 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) } +func (p *GetTemplateV2Request) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetCustomCode() { + if err = oprot.WriteFieldBegin("custom_code", thrift.BOOL, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteBool(*p.CustomCode); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} func (p *GetTemplateV2Request) writeField255(oprot thrift.TProtocol) (err error) { if p.IsSetBase() { if err = oprot.WriteFieldBegin("Base", thrift.STRUCT, 255); err != nil { @@ -18656,15 +18722,35 @@ func (p *GetTemplateV2Request) DeepEqual(ano *GetTemplateV2Request) bool { if !p.Field1DeepEqual(ano.EvaluatorTemplateID) { return false } + if !p.Field2DeepEqual(ano.CustomCode) { + return false + } if !p.Field255DeepEqual(ano.Base) { return false } return true } -func (p *GetTemplateV2Request) Field1DeepEqual(src int64) bool { +func (p *GetTemplateV2Request) Field1DeepEqual(src *int64) bool { - if p.EvaluatorTemplateID != src { + if p.EvaluatorTemplateID == src { + return true + } else if p.EvaluatorTemplateID == nil || src == nil { + return false + } + if *p.EvaluatorTemplateID != *src { + return false + } + return true +} +func (p *GetTemplateV2Request) Field2DeepEqual(src *bool) bool { + + if p.CustomCode == src { + return true + } else if p.CustomCode == nil || src == nil { + return false + } + if *p.CustomCode != *src { return false } return true diff --git a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go index 27b9d08dc..7213800e3 100644 --- a/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/evaluator/k-coze.loop.evaluation.evaluator.go @@ -13440,7 +13440,6 @@ func (p *GetTemplateV2Request) FastRead(buf []byte) (int, error) { var l int var fieldTypeId thrift.TType var fieldId int16 - var issetEvaluatorTemplateID bool = false for { fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) offset += l @@ -13458,7 +13457,20 @@ func (p *GetTemplateV2Request) FastRead(buf []byte) (int, error) { if err != nil { goto ReadFieldError } - issetEvaluatorTemplateID = true + } else { + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + case 2: + if fieldTypeId == thrift.BOOL { + l, err = p.FastReadField2(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldError + } } else { l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -13489,10 +13501,6 @@ func (p *GetTemplateV2Request) FastRead(buf []byte) (int, error) { } } - if !issetEvaluatorTemplateID { - fieldId = 1 - goto RequiredFieldNotSetError - } return offset, nil ReadFieldBeginError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) @@ -13500,24 +13508,36 @@ ReadFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_GetTemplateV2Request[fieldId]), err) SkipFieldError: return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) -RequiredFieldNotSetError: - return offset, thrift.NewProtocolException(thrift.INVALID_DATA, fmt.Sprintf("required field %s is not set", fieldIDToName_GetTemplateV2Request[fieldId])) } func (p *GetTemplateV2Request) FastReadField1(buf []byte) (int, error) { offset := 0 - var _field int64 + var _field *int64 if v, l, err := thrift.Binary.ReadI64(buf[offset:]); err != nil { return offset, err } else { offset += l - _field = v + _field = &v } p.EvaluatorTemplateID = _field return offset, nil } +func (p *GetTemplateV2Request) FastReadField2(buf []byte) (int, error) { + offset := 0 + + var _field *bool + if v, l, err := thrift.Binary.ReadBool(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.CustomCode = _field + return offset, nil +} + func (p *GetTemplateV2Request) FastReadField255(buf []byte) (int, error) { offset := 0 _field := base.NewBase() @@ -13538,6 +13558,7 @@ func (p *GetTemplateV2Request) FastWriteNocopy(buf []byte, w thrift.NocopyWriter offset := 0 if p != nil { offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) offset += p.fastWriteField255(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) @@ -13548,6 +13569,7 @@ func (p *GetTemplateV2Request) BLength() int { l := 0 if p != nil { l += p.field1Length() + l += p.field2Length() l += p.field255Length() } l += thrift.Binary.FieldStopLength() @@ -13556,8 +13578,19 @@ func (p *GetTemplateV2Request) BLength() int { func (p *GetTemplateV2Request) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { offset := 0 - offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) - offset += thrift.Binary.WriteI64(buf[offset:], p.EvaluatorTemplateID) + if p.IsSetEvaluatorTemplateID() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I64, 1) + offset += thrift.Binary.WriteI64(buf[offset:], *p.EvaluatorTemplateID) + } + return offset +} + +func (p *GetTemplateV2Request) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetCustomCode() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.BOOL, 2) + offset += thrift.Binary.WriteBool(buf[offset:], *p.CustomCode) + } return offset } @@ -13572,8 +13605,19 @@ func (p *GetTemplateV2Request) fastWriteField255(buf []byte, w thrift.NocopyWrit func (p *GetTemplateV2Request) field1Length() int { l := 0 - l += thrift.Binary.FieldBeginLength() - l += thrift.Binary.I64Length() + if p.IsSetEvaluatorTemplateID() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I64Length() + } + return l +} + +func (p *GetTemplateV2Request) field2Length() int { + l := 0 + if p.IsSetCustomCode() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.BoolLength() + } return l } @@ -13592,7 +13636,15 @@ func (p *GetTemplateV2Request) DeepCopy(s interface{}) error { return fmt.Errorf("%T's type not matched %T", s, p) } - p.EvaluatorTemplateID = src.EvaluatorTemplateID + if src.EvaluatorTemplateID != nil { + tmp := *src.EvaluatorTemplateID + p.EvaluatorTemplateID = &tmp + } + + if src.CustomCode != nil { + tmp := *src.CustomCode + p.CustomCode = &tmp + } var _base *base.Base if src.Base != nil { diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go index 86a2e457f..20ebca1ab 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go @@ -18,7 +18,7 @@ import ( func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.Evaluator { // 从DTO转换为DO - evaluatorDO := &evaluatordo.Evaluator{ + evaluatorDO := &evaluatordo.Evaluator{ ID: evaluatorDTO.GetEvaluatorID(), SpaceID: evaluatorDTO.GetWorkspaceID(), Name: evaluatorDTO.GetName(), @@ -33,14 +33,14 @@ func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.E BaseInfo: commonconvertor.ConvertBaseInfoDTO2DO(evaluatorDTO.GetBaseInfo()), Tags: ConvertEvaluatorLangTagsDTO2DO(evaluatorDTO.GetTags()), } - if evaluatorDTO.GetEvaluatorInfo() != nil { - evaluatorDO.EvaluatorInfo = &evaluatordo.EvaluatorInfo{ - Benchmark: evaluatorDTO.GetEvaluatorInfo().GetBenchmark(), - Vendor: evaluatorDTO.GetEvaluatorInfo().GetVendor(), - VendorURL: evaluatorDTO.GetEvaluatorInfo().GetVendorURL(), - UserManualURL: evaluatorDTO.GetEvaluatorInfo().GetUserManualURL(), - } - } + if evaluatorDTO.GetEvaluatorInfo() != nil { + evaluatorDO.EvaluatorInfo = &evaluatordo.EvaluatorInfo{ + Benchmark: evaluatorDTO.GetEvaluatorInfo().GetBenchmark(), + Vendor: evaluatorDTO.GetEvaluatorInfo().GetVendor(), + VendorURL: evaluatorDTO.GetEvaluatorInfo().GetVendorURL(), + UserManualURL: evaluatorDTO.GetEvaluatorInfo().GetUserManualURL(), + } + } if evaluatorDTO.CurrentVersion != nil { switch evaluatorDTO.GetEvaluatorType() { case evaluatordto.EvaluatorType_Prompt: @@ -67,7 +67,7 @@ func ConvertEvaluatorDO2DTO(do *evaluatordo.Evaluator) *evaluatordto.Evaluator { if do == nil { return nil } - dto := &evaluatordto.Evaluator{ + dto := &evaluatordto.Evaluator{ EvaluatorID: gptr.Of(do.ID), WorkspaceID: gptr.Of(do.SpaceID), Name: gptr.Of(do.Name), @@ -80,14 +80,14 @@ func ConvertEvaluatorDO2DTO(do *evaluatordo.Evaluator) *evaluatordto.Evaluator { BaseInfo: commonconvertor.ConvertBaseInfoDO2DTO(do.BaseInfo), Tags: ConvertEvaluatorLangTagsDO2DTO(do.Tags), } - if do.EvaluatorInfo != nil { - dto.EvaluatorInfo = &evaluatordto.EvaluatorInfo{ - Benchmark: gptr.Of(do.EvaluatorInfo.Benchmark), - Vendor: gptr.Of(do.EvaluatorInfo.Vendor), - VendorURL: gptr.Of(do.EvaluatorInfo.VendorURL), - UserManualURL: gptr.Of(do.EvaluatorInfo.UserManualURL), - } - } + if do.EvaluatorInfo != nil { + dto.EvaluatorInfo = &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of(do.EvaluatorInfo.Benchmark), + Vendor: gptr.Of(do.EvaluatorInfo.Vendor), + VendorURL: gptr.Of(do.EvaluatorInfo.VendorURL), + UserManualURL: gptr.Of(do.EvaluatorInfo.UserManualURL), + } + } // 设置 BoxType { val := convertBoxTypeDO2DTO(do.BoxType) diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go index 6f0cda7a0..f913e1f83 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go @@ -18,7 +18,7 @@ func ConvertEvaluatorTemplateDTO2DO(dto *evaluatordto.EvaluatorTemplate) *evalua return nil } - do := &evaluatordo.EvaluatorTemplate{ + do := &evaluatordo.EvaluatorTemplate{ ID: dto.GetID(), SpaceID: dto.GetWorkspaceID(), Name: dto.GetName(), @@ -29,14 +29,14 @@ func ConvertEvaluatorTemplateDTO2DO(dto *evaluatordto.EvaluatorTemplate) *evalua OutputSchemas: make([]*evaluatordo.ArgsSchema, 0), Tags: make(map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string), } - if dto.GetEvaluatorInfo() != nil { - do.EvaluatorInfo = &evaluatordo.EvaluatorInfo{ - Benchmark: dto.GetEvaluatorInfo().GetBenchmark(), - Vendor: dto.GetEvaluatorInfo().GetVendor(), - VendorURL: dto.GetEvaluatorInfo().GetVendorURL(), - UserManualURL: dto.GetEvaluatorInfo().GetUserManualURL(), - } - } + if dto.GetEvaluatorInfo() != nil { + do.EvaluatorInfo = &evaluatordo.EvaluatorInfo{ + Benchmark: dto.GetEvaluatorInfo().GetBenchmark(), + Vendor: dto.GetEvaluatorInfo().GetVendor(), + VendorURL: dto.GetEvaluatorInfo().GetVendorURL(), + UserManualURL: dto.GetEvaluatorInfo().GetUserManualURL(), + } + } // 处理标签 if len(dto.GetTags()) > 0 { @@ -95,7 +95,7 @@ func ConvertEvaluatorTemplateDO2DTO(do *evaluatordo.EvaluatorTemplate) *evaluato return nil } - dto := &evaluatordto.EvaluatorTemplate{ + dto := &evaluatordto.EvaluatorTemplate{ ID: gptr.Of(do.ID), WorkspaceID: gptr.Of(do.SpaceID), Name: gptr.Of(do.Name), @@ -104,14 +104,14 @@ func ConvertEvaluatorTemplateDO2DTO(do *evaluatordo.EvaluatorTemplate) *evaluato Popularity: gptr.Of(do.Popularity), Tags: make(map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string), } - if do.EvaluatorInfo != nil { - dto.EvaluatorInfo = &evaluatordto.EvaluatorInfo{ - Benchmark: gptr.Of(do.EvaluatorInfo.Benchmark), - Vendor: gptr.Of(do.EvaluatorInfo.Vendor), - VendorURL: gptr.Of(do.EvaluatorInfo.VendorURL), - UserManualURL: gptr.Of(do.EvaluatorInfo.UserManualURL), - } - } + if do.EvaluatorInfo != nil { + dto.EvaluatorInfo = &evaluatordto.EvaluatorInfo{ + Benchmark: gptr.Of(do.EvaluatorInfo.Benchmark), + Vendor: gptr.Of(do.EvaluatorInfo.Vendor), + VendorURL: gptr.Of(do.EvaluatorInfo.VendorURL), + UserManualURL: gptr.Of(do.EvaluatorInfo.UserManualURL), + } + } // 处理标签 if len(do.Tags) > 0 { @@ -249,21 +249,21 @@ func ConvertCodeEvaluatorContentDTO2DO(dto *evaluatordto.CodeEvaluator) *evaluat if dto == nil { return nil } - // 新字段优先：lang_2_code_content - if len(dto.GetLang2CodeContent()) > 0 { - // 直接映射为 DO 的 Lang2CodeContent - lang2 := make(map[evaluatordo.LanguageType]string, len(dto.GetLang2CodeContent())) - for k, v := range dto.GetLang2CodeContent() { - lang2[evaluatordo.LanguageType(k)] = v - } - return &evaluatordo.CodeEvaluatorContent{Lang2CodeContent: lang2} - } - // 兼容旧字段：language_type + code_content - return &evaluatordo.CodeEvaluatorContent{ - Lang2CodeContent: map[evaluatordo.LanguageType]string{ - evaluatordo.LanguageType(dto.GetLanguageType()): dto.GetCodeContent(), - }, - } + // 新字段优先：lang_2_code_content + if len(dto.GetLang2CodeContent()) > 0 { + // 直接映射为 DO 的 Lang2CodeContent + lang2 := make(map[evaluatordo.LanguageType]string, len(dto.GetLang2CodeContent())) + for k, v := range dto.GetLang2CodeContent() { + lang2[evaluatordo.LanguageType(k)] = v + } + return &evaluatordo.CodeEvaluatorContent{Lang2CodeContent: lang2} + } + // 兼容旧字段：language_type + code_content + return &evaluatordo.CodeEvaluatorContent{ + Lang2CodeContent: map[evaluatordo.LanguageType]string{ + evaluatordo.LanguageType(dto.GetLanguageType()): dto.GetCodeContent(), + }, + } } // ConvertCodeEvaluatorContentDO2DTO 将 CodeEvaluatorContent DO 转换为 DTO @@ -271,21 +271,21 @@ func ConvertCodeEvaluatorContentDO2DTO(do *evaluatordo.CodeEvaluatorContent) *ev if do == nil { return nil } - dto := &evaluatordto.CodeEvaluator{} - if len(do.Lang2CodeContent) > 0 { - lang2 := make(map[evaluatordto.LanguageType]string, len(do.Lang2CodeContent)) - for k, v := range do.Lang2CodeContent { - lang2[evaluatordto.LanguageType(k)] = v - } - dto.SetLang2CodeContent(lang2) - // 兼容旧字段：选择一个主语言回填（稳定选择） - for k, v := range do.Lang2CodeContent { - // 回填后跳出 - dto.LanguageType = gptr.Of(evaluatordto.LanguageType(k)) - dto.CodeContent = gptr.Of(v) - break - } - return dto - } - return dto + dto := &evaluatordto.CodeEvaluator{} + if len(do.Lang2CodeContent) > 0 { + lang2 := make(map[evaluatordto.LanguageType]string, len(do.Lang2CodeContent)) + for k, v := range do.Lang2CodeContent { + lang2[evaluatordto.LanguageType(k)] = v + } + dto.SetLang2CodeContent(lang2) + // 兼容旧字段：选择一个主语言回填（稳定选择） + for k, v := range do.Lang2CodeContent { + // 回填后跳出 + dto.LanguageType = gptr.Of(evaluatordto.LanguageType(k)) + dto.CodeContent = gptr.Of(v) + break + } + return dto + } + return dto } diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index 4154240a1..01f8f09ac 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -1404,6 +1404,30 @@ func (e *EvaluatorHandlerImpl) ListTemplatesV2(ctx context.Context, request *eva // GetTemplateV2 获取评估器模板详情 func (e *EvaluatorHandlerImpl) GetTemplateV2(ctx context.Context, request *evaluatorservice.GetTemplateV2Request) (resp *evaluatorservice.GetTemplateV2Response, err error) { + // 若请求指定custom_code，则直接返回自定义code评估器模板（包含所有语言），无需查询DB + if request.GetCustomCode() { + customTemplates := e.configer.GetCustomCodeEvaluatorTemplateConf(ctx) + lang2 := make(map[evaluatordto.LanguageType]string) + if len(customTemplates) > 0 { + if langMap, ok := customTemplates["custom"]; ok { + for lang, content := range langMap { + if content == nil || content.CodeEvaluator == nil || content.CodeEvaluator.CodeContent == nil { + continue + } + lt := lang + lang2[lt] = content.CodeEvaluator.GetCodeContent() + } + } + } + template := &evaluatordto.EvaluatorTemplate{ + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{Lang2CodeContent: lang2}, + }, + } + return &evaluatorservice.GetTemplateV2Response{EvaluatorTemplate: template}, nil + } + // 构建service层请求 serviceReq := &entity.GetEvaluatorTemplateRequest{ ID: request.GetEvaluatorTemplateID(), diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index 161272f97..bd69017cb 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -2340,7 +2340,7 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { for _, evaluator := range tt.mockDaoResult.Evaluators { evaluatorIDsFromFilter = append(evaluatorIDsFromFilter, evaluator.ID) } - totalFromFilter = int64(tt.mockDaoResult.TotalCount) + totalFromFilter = tt.mockDaoResult.TotalCount } else { // 其他情况（如无筛选条件但有结果），返回对应的evaluator IDs evaluatorIDsFromFilter = make([]int64, 0) @@ -2349,7 +2349,7 @@ func TestEvaluatorRepoImpl_ListBuiltinEvaluator(t *testing.T) { evaluatorIDsFromFilter = append(evaluatorIDsFromFilter, evaluator.ID) } } - totalFromFilter = int64(tt.expectedCount) + totalFromFilter = tt.expectedCount } // Mock GetSourceIDsByFilterConditions diff --git a/backend/modules/observability/infra/repo/redis/convert/task_run.go b/backend/modules/observability/infra/repo/redis/convert/task_run.go index 20803d80b..457b4da06 100755 --- a/backend/modules/observability/infra/repo/redis/convert/task_run.go +++ b/backend/modules/observability/infra/repo/redis/convert/task_run.go @@ -40,7 +40,7 @@ func (TaskRunConverter) ToDO(b []byte) (*entity.TaskRun, error) { // toTaskRunBytes // -//nolint:staticcheck,gosimple +//nolint:staticcheck func toTaskRunBytes(v any) []byte { switch v.(type) { case string: diff --git a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift index 4353b7469..5b0c5b267 100644 --- a/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/coze.loop.evaluation.evaluator.thrift @@ -381,7 +381,8 @@ struct ListTemplatesV2Response { } struct GetTemplateV2Request { - 1: required i64 evaluator_template_id (api.path='evaluator_template_id', api.js_conv='true', go.tag='json:"evaluator_template_id"') + 1: optional i64 evaluator_template_id (api.path='evaluator_template_id', api.js_conv='true', go.tag='json:"evaluator_template_id"') + 2: optional bool custom_code (api.query='custom_code') // 是否查询自定义code评估器模板，默认不查询 255: optional base.Base Base } From a4eede91df3e8b2bca3950ebbe49d3e7ee4975d7 Mon Sep 17 00:00:00 2001 From: Jiayun Shen Date: Wed, 5 Nov 2025 17:23:19 +0800 Subject: [PATCH 35/42] [feat][evaluation]: add evaluator-level rate limit to RunEvaluator (#290) feat: add evaluator-level rate limit to RunEvaluator --- backend/go.sum | 1 - .../loop/evaluation/domain/common/common.go | 335 ++++++++ .../domain/common/common_validator.go | 3 + .../loop/evaluation/domain/common/k-common.go | 226 ++++++ .../evaluation/domain/evaluator/evaluator.go | 70 ++ .../domain/evaluator/evaluator_validator.go | 5 + .../domain/evaluator/k-evaluator.go | 55 ++ .../application/convertor/common/common.go | 35 + .../convertor/evaluator/evaluator.go | 31 +- .../convertor/evaluator/evaluator_test.go | 753 +++++++++--------- .../evaluation/application/evaluator_app.go | 21 +- .../evaluation/domain/entity/common.go | 11 +- .../evaluation/domain/entity/evaluator.go | 10 + .../entity/evaluator_version_custom_rpc.go | 1 + .../evaluation/domain/repo/ratelimiter.go | 7 +- .../domain/service/evaluator_impl.go | 8 +- .../infra/repo/evaluator/ratelimiter_impl.go | 29 + .../coze/loop/evaluation/domain/common.thrift | 6 + .../loop/evaluation/domain/evaluator.thrift | 1 + 19 files changed, 1218 insertions(+), 390 deletions(-) diff --git a/backend/go.sum b/backend/go.sum index 53bf8e523..ed089935d 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -473,7 +473,6 @@ github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAx github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= -github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/common/common.go b/backend/kitex_gen/coze/loop/evaluation/domain/common/common.go index 5a3551379..28f111d35 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/common/common.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/common/common.go @@ -4927,3 +4927,338 @@ func (p *RuntimeParam) Field2DeepEqual(src *string) bool { } return true } + +type RateLimit struct { + Rate *int32 `thrift:"rate,1,optional" frugal:"1,optional,i32" form:"rate" json:"rate,omitempty" query:"rate"` + Burst *int32 `thrift:"burst,2,optional" frugal:"2,optional,i32" form:"burst" json:"burst,omitempty" query:"burst"` + Period *string `thrift:"period,3,optional" frugal:"3,optional,string" form:"period" json:"period,omitempty" query:"period"` +} + +func NewRateLimit() *RateLimit { + return &RateLimit{} +} + +func (p *RateLimit) InitDefault() { +} + +var RateLimit_Rate_DEFAULT int32 + +func (p *RateLimit) GetRate() (v int32) { + if p == nil { + return + } + if !p.IsSetRate() { + return RateLimit_Rate_DEFAULT + } + return *p.Rate +} + +var RateLimit_Burst_DEFAULT int32 + +func (p *RateLimit) GetBurst() (v int32) { + if p == nil { + return + } + if !p.IsSetBurst() { + return RateLimit_Burst_DEFAULT + } + return *p.Burst +} + +var RateLimit_Period_DEFAULT string + +func (p *RateLimit) GetPeriod() (v string) { + if p == nil { + return + } + if !p.IsSetPeriod() { + return RateLimit_Period_DEFAULT + } + return *p.Period +} +func (p *RateLimit) SetRate(val *int32) { + p.Rate = val +} +func (p *RateLimit) SetBurst(val *int32) { + p.Burst = val +} +func (p *RateLimit) SetPeriod(val *string) { + p.Period = val +} + +var fieldIDToName_RateLimit = map[int16]string{ + 1: "rate", + 2: "burst", + 3: "period", +} + +func (p *RateLimit) IsSetRate() bool { + return p.Rate != nil +} + +func (p *RateLimit) IsSetBurst() bool { + return p.Burst != nil +} + +func (p *RateLimit) IsSetPeriod() bool { + return p.Period != nil +} + +func (p *RateLimit) Read(iprot thrift.TProtocol) (err error) { + var fieldTypeId thrift.TType + var fieldId int16 + + if _, err = iprot.ReadStructBegin(); err != nil { + goto ReadStructBeginError + } + + for { + _, fieldTypeId, fieldId, err = iprot.ReadFieldBegin() + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + + switch fieldId { + case 1: + if fieldTypeId == thrift.I32 { + if err = p.ReadField1(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 2: + if fieldTypeId == thrift.I32 { + if err = p.ReadField2(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + case 3: + if fieldTypeId == thrift.STRING { + if err = p.ReadField3(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + default: + if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } + } + if err = iprot.ReadFieldEnd(); err != nil { + goto ReadFieldEndError + } + } + if err = iprot.ReadStructEnd(); err != nil { + goto ReadStructEndError + } + + return nil +ReadStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T read struct begin error: ", p), err) +ReadFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_RateLimit[fieldId]), err) +SkipFieldError: + return thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) + +ReadFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T read field end error", p), err) +ReadStructEndError: + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) +} + +func (p *RateLimit) ReadField1(iprot thrift.TProtocol) error { + + var _field *int32 + if v, err := iprot.ReadI32(); err != nil { + return err + } else { + _field = &v + } + p.Rate = _field + return nil +} +func (p *RateLimit) ReadField2(iprot thrift.TProtocol) error { + + var _field *int32 + if v, err := iprot.ReadI32(); err != nil { + return err + } else { + _field = &v + } + p.Burst = _field + return nil +} +func (p *RateLimit) ReadField3(iprot thrift.TProtocol) error { + + var _field *string + if v, err := iprot.ReadString(); err != nil { + return err + } else { + _field = &v + } + p.Period = _field + return nil +} + +func (p *RateLimit) Write(oprot thrift.TProtocol) (err error) { + var fieldId int16 + if err = oprot.WriteStructBegin("RateLimit"); err != nil { + goto WriteStructBeginError + } + if p != nil { + if err = p.writeField1(oprot); err != nil { + fieldId = 1 + goto WriteFieldError + } + if err = p.writeField2(oprot); err != nil { + fieldId = 2 + goto WriteFieldError + } + if err = p.writeField3(oprot); err != nil { + fieldId = 3 + goto WriteFieldError + } + } + if err = oprot.WriteFieldStop(); err != nil { + goto WriteFieldStopError + } + if err = oprot.WriteStructEnd(); err != nil { + goto WriteStructEndError + } + return nil +WriteStructBeginError: + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) +WriteFieldError: + return thrift.PrependError(fmt.Sprintf("%T write field %d error: ", p, fieldId), err) +WriteFieldStopError: + return thrift.PrependError(fmt.Sprintf("%T write field stop error: ", p), err) +WriteStructEndError: + return thrift.PrependError(fmt.Sprintf("%T write struct end error: ", p), err) +} + +func (p *RateLimit) writeField1(oprot thrift.TProtocol) (err error) { + if p.IsSetRate() { + if err = oprot.WriteFieldBegin("rate", thrift.I32, 1); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI32(*p.Rate); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 1 end error: ", p), err) +} +func (p *RateLimit) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetBurst() { + if err = oprot.WriteFieldBegin("burst", thrift.I32, 2); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteI32(*p.Burst); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 2 end error: ", p), err) +} +func (p *RateLimit) writeField3(oprot thrift.TProtocol) (err error) { + if p.IsSetPeriod() { + if err = oprot.WriteFieldBegin("period", thrift.STRING, 3); err != nil { + goto WriteFieldBeginError + } + if err := oprot.WriteString(*p.Period); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 3 end error: ", p), err) +} + +func (p *RateLimit) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("RateLimit(%+v)", *p) + +} + +func (p *RateLimit) DeepEqual(ano *RateLimit) bool { + if p == ano { + return true + } else if p == nil || ano == nil { + return false + } + if !p.Field1DeepEqual(ano.Rate) { + return false + } + if !p.Field2DeepEqual(ano.Burst) { + return false + } + if !p.Field3DeepEqual(ano.Period) { + return false + } + return true +} + +func (p *RateLimit) Field1DeepEqual(src *int32) bool { + + if p.Rate == src { + return true + } else if p.Rate == nil || src == nil { + return false + } + if *p.Rate != *src { + return false + } + return true +} +func (p *RateLimit) Field2DeepEqual(src *int32) bool { + + if p.Burst == src { + return true + } else if p.Burst == nil || src == nil { + return false + } + if *p.Burst != *src { + return false + } + return true +} +func (p *RateLimit) Field3DeepEqual(src *string) bool { + + if p.Period == src { + return true + } else if p.Period == nil || src == nil { + return false + } + if strings.Compare(*p.Period, *src) != 0 { + return false + } + return true +} diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/common/common_validator.go b/backend/kitex_gen/coze/loop/evaluation/domain/common/common_validator.go index 01106bb19..93f48c14f 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/common/common_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/common/common_validator.go @@ -92,3 +92,6 @@ func (p *Session) IsValid() error { func (p *RuntimeParam) IsValid() error { return nil } +func (p *RateLimit) IsValid() error { + return nil +} diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/common/k-common.go b/backend/kitex_gen/coze/loop/evaluation/domain/common/k-common.go index 04dcc0082..b05cc9ebd 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/common/k-common.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/common/k-common.go @@ -3449,3 +3449,229 @@ func (p *RuntimeParam) DeepCopy(s interface{}) error { return nil } + +func (p *RateLimit) FastRead(buf []byte) (int, error) { + + var err error + var offset int + var l int + var fieldTypeId thrift.TType + var fieldId int16 + for { + fieldTypeId, fieldId, l, err = thrift.Binary.ReadFieldBegin(buf[offset:]) + offset += l + if err != nil { + goto ReadFieldBeginError + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if fieldTypeId == thrift.I32 { + l, err = p.FastReadField1(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 2: + if fieldTypeId == thrift.I32 { + l, err = p.FastReadField2(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 3: + if fieldTypeId == thrift.STRING { + l, err = p.FastReadField3(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 + } + } + default: + l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) + offset += l + if err != nil { + goto SkipFieldError + } + } + } + + return offset, nil +ReadFieldBeginError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d begin error: ", p, fieldId), err) +ReadFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T read field %d '%s' error: ", p, fieldId, fieldIDToName_RateLimit[fieldId]), err) +SkipFieldError: + return offset, thrift.PrependError(fmt.Sprintf("%T field %d skip type %d error: ", p, fieldId, fieldTypeId), err) +} + +func (p *RateLimit) FastReadField1(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.Rate = _field + return offset, nil +} + +func (p *RateLimit) FastReadField2(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.Burst = _field + return offset, nil +} + +func (p *RateLimit) FastReadField3(buf []byte) (int, error) { + offset := 0 + + var _field *string + if v, l, err := thrift.Binary.ReadString(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + _field = &v + } + p.Period = _field + return offset, nil +} + +func (p *RateLimit) FastWrite(buf []byte) int { + return p.FastWriteNocopy(buf, nil) +} + +func (p *RateLimit) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p != nil { + offset += p.fastWriteField1(buf[offset:], w) + offset += p.fastWriteField2(buf[offset:], w) + offset += p.fastWriteField3(buf[offset:], w) + } + offset += thrift.Binary.WriteFieldStop(buf[offset:]) + return offset +} + +func (p *RateLimit) BLength() int { + l := 0 + if p != nil { + l += p.field1Length() + l += p.field2Length() + l += p.field3Length() + } + l += thrift.Binary.FieldStopLength() + return l +} + +func (p *RateLimit) fastWriteField1(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetRate() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I32, 1) + offset += thrift.Binary.WriteI32(buf[offset:], *p.Rate) + } + return offset +} + +func (p *RateLimit) fastWriteField2(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetBurst() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.I32, 2) + offset += thrift.Binary.WriteI32(buf[offset:], *p.Burst) + } + return offset +} + +func (p *RateLimit) fastWriteField3(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetPeriod() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRING, 3) + offset += thrift.Binary.WriteStringNocopy(buf[offset:], w, *p.Period) + } + return offset +} + +func (p *RateLimit) field1Length() int { + l := 0 + if p.IsSetRate() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I32Length() + } + return l +} + +func (p *RateLimit) field2Length() int { + l := 0 + if p.IsSetBurst() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.I32Length() + } + return l +} + +func (p *RateLimit) field3Length() int { + l := 0 + if p.IsSetPeriod() { + l += thrift.Binary.FieldBeginLength() + l += thrift.Binary.StringLengthNocopy(*p.Period) + } + return l +} + +func (p *RateLimit) DeepCopy(s interface{}) error { + src, ok := s.(*RateLimit) + if !ok { + return fmt.Errorf("%T's type not matched %T", s, p) + } + + if src.Rate != nil { + tmp := *src.Rate + p.Rate = &tmp + } + + if src.Burst != nil { + tmp := *src.Burst + p.Burst = &tmp + } + + if src.Period != nil { + var tmp string + if *src.Period != "" { + tmp = kutils.StringDeepCopy(*src.Period) + } + p.Period = &tmp + } + + return nil +} diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go index c8850b91a..9f42fc440 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator.go @@ -1982,6 +1982,8 @@ type CustomRPCEvaluator struct { Cluster *string `thrift:"cluster,4,optional" frugal:"4,optional,string" form:"cluster" json:"cluster,omitempty" query:"cluster"` // ms Timeout *int64 `thrift:"timeout,10,optional" frugal:"10,optional,i64" form:"timeout" json:"timeout,omitempty" query:"timeout"` + // 自定义评估器的限流配置 + RateLimit *common.RateLimit `thrift:"rate_limit,11,optional" frugal:"11,optional,common.RateLimit" form:"rate_limit" json:"rate_limit,omitempty" query:"rate_limit"` } func NewCustomRPCEvaluator() *CustomRPCEvaluator { @@ -2045,6 +2047,18 @@ func (p *CustomRPCEvaluator) GetTimeout() (v int64) { } return *p.Timeout } + +var CustomRPCEvaluator_RateLimit_DEFAULT *common.RateLimit + +func (p *CustomRPCEvaluator) GetRateLimit() (v *common.RateLimit) { + if p == nil { + return + } + if !p.IsSetRateLimit() { + return CustomRPCEvaluator_RateLimit_DEFAULT + } + return p.RateLimit +} func (p *CustomRPCEvaluator) SetProviderEvaluatorCode(val *string) { p.ProviderEvaluatorCode = val } @@ -2060,6 +2074,9 @@ func (p *CustomRPCEvaluator) SetCluster(val *string) { func (p *CustomRPCEvaluator) SetTimeout(val *int64) { p.Timeout = val } +func (p *CustomRPCEvaluator) SetRateLimit(val *common.RateLimit) { + p.RateLimit = val +} var fieldIDToName_CustomRPCEvaluator = map[int16]string{ 1: "provider_evaluator_code", @@ -2067,6 +2084,7 @@ var fieldIDToName_CustomRPCEvaluator = map[int16]string{ 3: "service_name", 4: "cluster", 10: "timeout", + 11: "rate_limit", } func (p *CustomRPCEvaluator) IsSetProviderEvaluatorCode() bool { @@ -2085,6 +2103,10 @@ func (p *CustomRPCEvaluator) IsSetTimeout() bool { return p.Timeout != nil } +func (p *CustomRPCEvaluator) IsSetRateLimit() bool { + return p.RateLimit != nil +} + func (p *CustomRPCEvaluator) Read(iprot thrift.TProtocol) (err error) { var fieldTypeId thrift.TType var fieldId int16 @@ -2145,6 +2167,14 @@ func (p *CustomRPCEvaluator) Read(iprot thrift.TProtocol) (err error) { } else if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError } + case 11: + if fieldTypeId == thrift.STRUCT { + if err = p.ReadField11(iprot); err != nil { + goto ReadFieldError + } + } else if err = iprot.Skip(fieldTypeId); err != nil { + goto SkipFieldError + } default: if err = iprot.Skip(fieldTypeId); err != nil { goto SkipFieldError @@ -2235,6 +2265,14 @@ func (p *CustomRPCEvaluator) ReadField10(iprot thrift.TProtocol) error { p.Timeout = _field return nil } +func (p *CustomRPCEvaluator) ReadField11(iprot thrift.TProtocol) error { + _field := common.NewRateLimit() + if err := _field.Read(iprot); err != nil { + return err + } + p.RateLimit = _field + return nil +} func (p *CustomRPCEvaluator) Write(oprot thrift.TProtocol) (err error) { var fieldId int16 @@ -2262,6 +2300,10 @@ func (p *CustomRPCEvaluator) Write(oprot thrift.TProtocol) (err error) { fieldId = 10 goto WriteFieldError } + if err = p.writeField11(oprot); err != nil { + fieldId = 11 + goto WriteFieldError + } } if err = oprot.WriteFieldStop(); err != nil { goto WriteFieldStopError @@ -2368,6 +2410,24 @@ WriteFieldBeginError: WriteFieldEndError: return thrift.PrependError(fmt.Sprintf("%T write field 10 end error: ", p), err) } +func (p *CustomRPCEvaluator) writeField11(oprot thrift.TProtocol) (err error) { + if p.IsSetRateLimit() { + if err = oprot.WriteFieldBegin("rate_limit", thrift.STRUCT, 11); err != nil { + goto WriteFieldBeginError + } + if err := p.RateLimit.Write(oprot); err != nil { + return err + } + if err = oprot.WriteFieldEnd(); err != nil { + goto WriteFieldEndError + } + } + return nil +WriteFieldBeginError: + return thrift.PrependError(fmt.Sprintf("%T write field 11 begin error: ", p), err) +WriteFieldEndError: + return thrift.PrependError(fmt.Sprintf("%T write field 11 end error: ", p), err) +} func (p *CustomRPCEvaluator) String() string { if p == nil { @@ -2398,6 +2458,9 @@ func (p *CustomRPCEvaluator) DeepEqual(ano *CustomRPCEvaluator) bool { if !p.Field10DeepEqual(ano.Timeout) { return false } + if !p.Field11DeepEqual(ano.RateLimit) { + return false + } return true } @@ -2456,6 +2519,13 @@ func (p *CustomRPCEvaluator) Field10DeepEqual(src *int64) bool { } return true } +func (p *CustomRPCEvaluator) Field11DeepEqual(src *common.RateLimit) bool { + + if !p.RateLimit.DeepEqual(src) { + return false + } + return true +} type EvaluatorVersion struct { // 版本id diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go index 19253f6e4..290cf14da 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/evaluator_validator.go @@ -44,6 +44,11 @@ func (p *CodeEvaluator) IsValid() error { return nil } func (p *CustomRPCEvaluator) IsValid() error { + if p.RateLimit != nil { + if err := p.RateLimit.IsValid(); err != nil { + return fmt.Errorf("field RateLimit not valid, %w", err) + } + } return nil } func (p *EvaluatorVersion) IsValid() error { diff --git a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go index 96956c1f8..b42794cb3 100644 --- a/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go +++ b/backend/kitex_gen/coze/loop/evaluation/domain/evaluator/k-evaluator.go @@ -1340,6 +1340,20 @@ func (p *CustomRPCEvaluator) FastRead(buf []byte) (int, error) { goto SkipFieldError } } + case 11: + if fieldTypeId == thrift.STRUCT { + l, err = p.FastReadField11(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 + } + } default: l, err = thrift.Binary.Skip(buf[offset:], fieldTypeId) offset += l @@ -1434,6 +1448,18 @@ func (p *CustomRPCEvaluator) FastReadField10(buf []byte) (int, error) { return offset, nil } +func (p *CustomRPCEvaluator) FastReadField11(buf []byte) (int, error) { + offset := 0 + _field := common.NewRateLimit() + if l, err := _field.FastRead(buf[offset:]); err != nil { + return offset, err + } else { + offset += l + } + p.RateLimit = _field + return offset, nil +} + func (p *CustomRPCEvaluator) FastWrite(buf []byte) int { return p.FastWriteNocopy(buf, nil) } @@ -1446,6 +1472,7 @@ func (p *CustomRPCEvaluator) FastWriteNocopy(buf []byte, w thrift.NocopyWriter) offset += p.fastWriteField2(buf[offset:], w) offset += p.fastWriteField3(buf[offset:], w) offset += p.fastWriteField4(buf[offset:], w) + offset += p.fastWriteField11(buf[offset:], w) } offset += thrift.Binary.WriteFieldStop(buf[offset:]) return offset @@ -1459,6 +1486,7 @@ func (p *CustomRPCEvaluator) BLength() int { l += p.field3Length() l += p.field4Length() l += p.field10Length() + l += p.field11Length() } l += thrift.Binary.FieldStopLength() return l @@ -1507,6 +1535,15 @@ func (p *CustomRPCEvaluator) fastWriteField10(buf []byte, w thrift.NocopyWriter) return offset } +func (p *CustomRPCEvaluator) fastWriteField11(buf []byte, w thrift.NocopyWriter) int { + offset := 0 + if p.IsSetRateLimit() { + offset += thrift.Binary.WriteFieldBegin(buf[offset:], thrift.STRUCT, 11) + offset += p.RateLimit.FastWriteNocopy(buf[offset:], w) + } + return offset +} + func (p *CustomRPCEvaluator) field1Length() int { l := 0 if p.IsSetProviderEvaluatorCode() { @@ -1550,6 +1587,15 @@ func (p *CustomRPCEvaluator) field10Length() int { return l } +func (p *CustomRPCEvaluator) field11Length() int { + l := 0 + if p.IsSetRateLimit() { + l += thrift.Binary.FieldBeginLength() + l += p.RateLimit.BLength() + } + return l +} + func (p *CustomRPCEvaluator) DeepCopy(s interface{}) error { src, ok := s.(*CustomRPCEvaluator) if !ok { @@ -1587,6 +1633,15 @@ func (p *CustomRPCEvaluator) DeepCopy(s interface{}) error { p.Timeout = &tmp } + var _rateLimit *common.RateLimit + if src.RateLimit != nil { + _rateLimit = &common.RateLimit{} + if err := _rateLimit.DeepCopy(src.RateLimit); err != nil { + return err + } + } + p.RateLimit = _rateLimit + return nil } diff --git a/backend/modules/evaluation/application/convertor/common/common.go b/backend/modules/evaluation/application/convertor/common/common.go index 3b4f2c305..8077bdc99 100644 --- a/backend/modules/evaluation/application/convertor/common/common.go +++ b/backend/modules/evaluation/application/convertor/common/common.go @@ -6,6 +6,7 @@ package common import ( "context" "strconv" + "time" "github.com/bytedance/gg/gptr" @@ -379,3 +380,37 @@ func ConvertFieldDisplayFormatDTO2DO(fdf int64) commonentity.FieldDisplayFormat func ConvertFieldDisplayFormatDO2DTO(fdf commonentity.FieldDisplayFormat) int64 { return int64(fdf) } + +func ConvertRateLimitDO2DTO(rateLimit *commonentity.RateLimit) *commondto.RateLimit { + if rateLimit == nil { + return nil + } + var period *string = nil + if rateLimit.Period != nil { + period = gptr.Of(rateLimit.Period.String()) + } + return &commondto.RateLimit{ + Rate: rateLimit.Rate, + Burst: rateLimit.Burst, + Period: period, + } +} + +func ConvertRateLimitDTO2DO(limit *commondto.RateLimit) (*commonentity.RateLimit, error) { + if limit == nil { + return nil, nil + } + var period *time.Duration = nil + if limit.Period != nil { + p, err := time.ParseDuration(*limit.Period) + if err != nil { + return nil, err + } + period = gptr.Of(p) + } + return &commonentity.RateLimit{ + Rate: limit.Rate, + Burst: limit.Burst, + Period: period, + }, nil +} diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go index 20ebca1ab..320875d56 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go @@ -16,7 +16,7 @@ import ( "github.com/coze-dev/coze-loop/backend/pkg/errorx" ) -func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.Evaluator { +func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) (*evaluatordo.Evaluator, error) { // 从DTO转换为DO evaluatorDO := &evaluatordo.Evaluator{ ID: evaluatorDTO.GetEvaluatorID(), @@ -48,10 +48,14 @@ func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) *evaluatordo.E case evaluatordto.EvaluatorType_Code: evaluatorDO.CodeEvaluatorVersion = ConvertCodeEvaluatorVersionDTO2DO(evaluatorDO.ID, evaluatorDO.SpaceID, evaluatorDTO.GetCurrentVersion()) case evaluatordto.EvaluatorType_CustomRPC: - evaluatorDO.CustomRPCEvaluatorVersion = ConvertCustomRPCEvaluatorVersionDTO2DO(evaluatorDO.ID, evaluatorDO.SpaceID, evaluatorDTO.GetCurrentVersion()) + customRPCEvaluatorVersion, err := ConvertCustomRPCEvaluatorVersionDTO2DO(evaluatorDO.ID, evaluatorDO.SpaceID, evaluatorDTO.GetCurrentVersion()) + if err != nil { + return nil, err + } + evaluatorDO.CustomRPCEvaluatorVersion = customRPCEvaluatorVersion } } - return evaluatorDO + return evaluatorDO, nil } func ConvertEvaluatorDOList2DTO(doList []*evaluatordo.Evaluator) []*evaluatordto.Evaluator { @@ -293,6 +297,13 @@ func ConvertEvaluatorContent2DO(content *evaluatordto.EvaluatorContent, evaluato Cluster: content.CustomRPCEvaluator.Cluster, Timeout: content.CustomRPCEvaluator.Timeout, } + if content.CustomRPCEvaluator.RateLimit != nil { + rateLimit, err := commonconvertor.ConvertRateLimitDTO2DO(content.CustomRPCEvaluator.RateLimit) + if err != nil { + return nil, err + } + customRPCVersion.RateLimit = rateLimit + } // 转换输入模式 if len(content.InputSchemas) > 0 { @@ -457,9 +468,9 @@ func ConvertEvaluatorTagKeyDO2DTO(doKey evaluatordo.EvaluatorTagKey) evaluatordt } } -func ConvertCustomRPCEvaluatorVersionDTO2DO(evaluatorID, spaceID int64, dto *evaluatordto.EvaluatorVersion) *evaluatordo.CustomRPCEvaluatorVersion { +func ConvertCustomRPCEvaluatorVersionDTO2DO(evaluatorID, spaceID int64, dto *evaluatordto.EvaluatorVersion) (*evaluatordo.CustomRPCEvaluatorVersion, error) { if dto == nil { - return nil + return nil, nil } customRPCEvaluatorVersion := &evaluatordo.CustomRPCEvaluatorVersion{ ID: dto.GetID(), @@ -479,9 +490,16 @@ func ConvertCustomRPCEvaluatorVersionDTO2DO(evaluatorID, spaceID int64, dto *eva customRPCEvaluatorVersion.ServiceName = dto.EvaluatorContent.CustomRPCEvaluator.ServiceName customRPCEvaluatorVersion.Cluster = dto.EvaluatorContent.CustomRPCEvaluator.Cluster customRPCEvaluatorVersion.Timeout = dto.EvaluatorContent.CustomRPCEvaluator.Timeout + if dto.EvaluatorContent.CustomRPCEvaluator.RateLimit != nil { + rateLimit, err := commonconvertor.ConvertRateLimitDTO2DO(dto.EvaluatorContent.CustomRPCEvaluator.RateLimit) + if err != nil { + return nil, err + } + customRPCEvaluatorVersion.RateLimit = rateLimit + } } } - return customRPCEvaluatorVersion + return customRPCEvaluatorVersion, nil } func ConvertCustomRPCEvaluatorVersionDO2DTO(do *evaluatordo.CustomRPCEvaluatorVersion) *evaluatordto.EvaluatorVersion { @@ -503,6 +521,7 @@ func ConvertCustomRPCEvaluatorVersionDO2DTO(do *evaluatordo.CustomRPCEvaluatorVe ServiceName: do.ServiceName, Cluster: do.Cluster, Timeout: do.Timeout, + RateLimit: commonconvertor.ConvertRateLimitDO2DTO(do.RateLimit), }, }, } diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go index c00bbab7a..8c8b0cfb7 100755 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_test.go @@ -15,284 +15,284 @@ import ( ) func TestConvertBoxType(t *testing.T) { - t.Parallel() - assert.Equal(t, evaluatordo.EvaluatorBoxTypeWhite, convertBoxTypeDTO2DO("White")) - assert.Equal(t, evaluatordo.EvaluatorBoxTypeBlack, convertBoxTypeDTO2DO("Black")) - assert.Equal(t, evaluatordo.EvaluatorBoxTypeWhite, convertBoxTypeDTO2DO("")) + t.Parallel() + assert.Equal(t, evaluatordo.EvaluatorBoxTypeWhite, convertBoxTypeDTO2DO("White")) + assert.Equal(t, evaluatordo.EvaluatorBoxTypeBlack, convertBoxTypeDTO2DO("Black")) + assert.Equal(t, evaluatordo.EvaluatorBoxTypeWhite, convertBoxTypeDTO2DO("")) - assert.Equal(t, "White", convertBoxTypeDO2DTO(evaluatordo.EvaluatorBoxTypeWhite)) - assert.Equal(t, "Black", convertBoxTypeDO2DTO(evaluatordo.EvaluatorBoxTypeBlack)) + assert.Equal(t, "White", convertBoxTypeDO2DTO(evaluatordo.EvaluatorBoxTypeWhite)) + assert.Equal(t, "Black", convertBoxTypeDO2DTO(evaluatordo.EvaluatorBoxTypeBlack)) } func TestNormalizeLanguageType(t *testing.T) { - t.Parallel() - assert.Equal(t, evaluatordo.LanguageTypePython, normalizeLanguageType(evaluatordo.LanguageType("python"))) - assert.Equal(t, evaluatordo.LanguageTypeJS, normalizeLanguageType(evaluatordo.LanguageType("js"))) - assert.Equal(t, evaluatordo.LanguageType("Java"), normalizeLanguageType(evaluatordo.LanguageType("java"))) + t.Parallel() + assert.Equal(t, evaluatordo.LanguageTypePython, normalizeLanguageType(evaluatordo.LanguageType("python"))) + assert.Equal(t, evaluatordo.LanguageTypeJS, normalizeLanguageType(evaluatordo.LanguageType("js"))) + assert.Equal(t, evaluatordo.LanguageType("Java"), normalizeLanguageType(evaluatordo.LanguageType("java"))) } func TestConvertEvaluatorDTO2DO_And_Back(t *testing.T) { - t.Parallel() - dto := &evaluatordto.Evaluator{ - EvaluatorID: gptr.Of(int64(1)), - WorkspaceID: gptr.Of(int64(2)), - Name: gptr.Of("n"), - Description: gptr.Of("d"), - DraftSubmitted: gptr.Of(true), - EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), - LatestVersion: gptr.Of("1.0.0"), - Builtin: gptr.Of(false), - BuiltinVisibleVersion: gptr.Of("1.0.0"), - BoxType: gptr.Of("Black"), - BaseInfo: &commondto.BaseInfo{}, - CurrentVersion: &evaluatordto.EvaluatorVersion{ID: gptr.Of(int64(10)), Version: gptr.Of("1.0.0"), - EvaluatorContent: &evaluatordto.EvaluatorContent{CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypePython), CodeTemplateKey: gptr.Of("tk"), CodeTemplateName: gptr.Of("tn"), CodeContent: gptr.Of("print(1)")}}}, - Tags: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{ - evaluatordto.EvaluatorTagLangType("en"): {evaluatordto.EvaluatorTagKeyName: {"tag"}}, - }, - } - do := ConvertEvaluatorDTO2DO(dto) - if assert.NotNil(t, do) { - assert.Equal(t, int64(1), do.ID) - assert.Equal(t, int64(2), do.SpaceID) - assert.Equal(t, "n", do.Name) - assert.Equal(t, true, do.DraftSubmitted) - assert.Equal(t, evaluatordo.EvaluatorBoxTypeBlack, do.BoxType) - // EvaluatorInfo 字段非本用例重点 - // Code 版本 - if assert.NotNil(t, do.CodeEvaluatorVersion) { - assert.Equal(t, "Python", string(do.CodeEvaluatorVersion.LanguageType)) - assert.Equal(t, "print(1)", do.CodeEvaluatorVersion.CodeContent) - } - // Tags - assert.Equal(t, []string{"tag"}, do.Tags[evaluatordo.EvaluatorTagLangType("en")][evaluatordo.EvaluatorTagKey("Name")]) - } - back := ConvertEvaluatorDO2DTO(do) - if assert.NotNil(t, back) { - assert.Equal(t, "Black", back.GetBoxType()) - if assert.NotNil(t, back.CurrentVersion) && assert.NotNil(t, back.CurrentVersion.EvaluatorContent) { - assert.Equal(t, evaluatordto.LanguageTypePython, back.CurrentVersion.EvaluatorContent.CodeEvaluator.GetLanguageType()) - } - // EvaluatorInfo 字段非本用例重点 - } + t.Parallel() + dto := &evaluatordto.Evaluator{ + EvaluatorID: gptr.Of(int64(1)), + WorkspaceID: gptr.Of(int64(2)), + Name: gptr.Of("n"), + Description: gptr.Of("d"), + DraftSubmitted: gptr.Of(true), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), + LatestVersion: gptr.Of("1.0.0"), + Builtin: gptr.Of(false), + BuiltinVisibleVersion: gptr.Of("1.0.0"), + BoxType: gptr.Of("Black"), + BaseInfo: &commondto.BaseInfo{}, + CurrentVersion: &evaluatordto.EvaluatorVersion{ID: gptr.Of(int64(10)), Version: gptr.Of("1.0.0"), + EvaluatorContent: &evaluatordto.EvaluatorContent{CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypePython), CodeTemplateKey: gptr.Of("tk"), CodeTemplateName: gptr.Of("tn"), CodeContent: gptr.Of("print(1)")}}}, + Tags: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{ + evaluatordto.EvaluatorTagLangType("en"): {evaluatordto.EvaluatorTagKeyName: {"tag"}}, + }, + } + do, err := ConvertEvaluatorDTO2DO(dto) + if assert.NotNil(t, do) && assert.NoError(t, err) { + assert.Equal(t, int64(1), do.ID) + assert.Equal(t, int64(2), do.SpaceID) + assert.Equal(t, "n", do.Name) + assert.Equal(t, true, do.DraftSubmitted) + assert.Equal(t, evaluatordo.EvaluatorBoxTypeBlack, do.BoxType) + // EvaluatorInfo 字段非本用例重点 + // Code 版本 + if assert.NotNil(t, do.CodeEvaluatorVersion) { + assert.Equal(t, "Python", string(do.CodeEvaluatorVersion.LanguageType)) + assert.Equal(t, "print(1)", do.CodeEvaluatorVersion.CodeContent) + } + // Tags + assert.Equal(t, []string{"tag"}, do.Tags[evaluatordo.EvaluatorTagLangType("en")][evaluatordo.EvaluatorTagKey("Name")]) + } + back := ConvertEvaluatorDO2DTO(do) + if assert.NotNil(t, back) { + assert.Equal(t, "Black", back.GetBoxType()) + if assert.NotNil(t, back.CurrentVersion) && assert.NotNil(t, back.CurrentVersion.EvaluatorContent) { + assert.Equal(t, evaluatordto.LanguageTypePython, back.CurrentVersion.EvaluatorContent.CodeEvaluator.GetLanguageType()) + } + // EvaluatorInfo 字段非本用例重点 + } } func TestConvertCodeEvaluatorVersionRoundTrip(t *testing.T) { - t.Parallel() - // DTO -> DO - dto := &evaluatordto.EvaluatorVersion{ID: gptr.Of(int64(11)), Version: gptr.Of("0.1.0"), Description: gptr.Of("desc"), - EvaluatorContent: &evaluatordto.EvaluatorContent{CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypeJS), CodeTemplateKey: gptr.Of("k"), CodeTemplateName: gptr.Of("n"), CodeContent: gptr.Of("console.log(1)")}}} - do := ConvertCodeEvaluatorVersionDTO2DO(1, 2, dto) - if assert.NotNil(t, do) { - assert.Equal(t, int64(11), do.ID) - assert.Equal(t, int64(2), do.SpaceID) - assert.Equal(t, evaluatordo.LanguageTypeJS, do.LanguageType) - } - // DO -> DTO - dtoBack := ConvertCodeEvaluatorVersionDO2DTO(do) - if assert.NotNil(t, dtoBack) { - assert.Equal(t, "0.1.0", dtoBack.GetVersion()) - if assert.NotNil(t, dtoBack.EvaluatorContent) && assert.NotNil(t, dtoBack.EvaluatorContent.CodeEvaluator) { - assert.Equal(t, evaluatordto.LanguageTypeJS, dtoBack.EvaluatorContent.CodeEvaluator.GetLanguageType()) - assert.Equal(t, "console.log(1)", dtoBack.EvaluatorContent.CodeEvaluator.GetCodeContent()) - } - } + t.Parallel() + // DTO -> DO + dto := &evaluatordto.EvaluatorVersion{ID: gptr.Of(int64(11)), Version: gptr.Of("0.1.0"), Description: gptr.Of("desc"), + EvaluatorContent: &evaluatordto.EvaluatorContent{CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypeJS), CodeTemplateKey: gptr.Of("k"), CodeTemplateName: gptr.Of("n"), CodeContent: gptr.Of("console.log(1)")}}} + do := ConvertCodeEvaluatorVersionDTO2DO(1, 2, dto) + if assert.NotNil(t, do) { + assert.Equal(t, int64(11), do.ID) + assert.Equal(t, int64(2), do.SpaceID) + assert.Equal(t, evaluatordo.LanguageTypeJS, do.LanguageType) + } + // DO -> DTO + dtoBack := ConvertCodeEvaluatorVersionDO2DTO(do) + if assert.NotNil(t, dtoBack) { + assert.Equal(t, "0.1.0", dtoBack.GetVersion()) + if assert.NotNil(t, dtoBack.EvaluatorContent) && assert.NotNil(t, dtoBack.EvaluatorContent.CodeEvaluator) { + assert.Equal(t, evaluatordto.LanguageTypeJS, dtoBack.EvaluatorContent.CodeEvaluator.GetLanguageType()) + assert.Equal(t, "console.log(1)", dtoBack.EvaluatorContent.CodeEvaluator.GetCodeContent()) + } + } } func TestConvertPromptEvaluatorVersionRoundTrip(t *testing.T) { - t.Parallel() - // DTO -> DO - dto := &evaluatordto.EvaluatorVersion{ - ID: gptr.Of(int64(21)), - Version: gptr.Of("0.2.0"), - Description: gptr.Of("desc"), - EvaluatorContent: &evaluatordto.EvaluatorContent{ - ReceiveChatHistory: gptr.Of(true), - InputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("in")}}, - PromptEvaluator: &evaluatordto.PromptEvaluator{ - PromptSourceType: evaluatordto.PromptSourceTypePtr(evaluatordto.PromptSourceType_BuiltinTemplate), - PromptTemplateKey: gptr.Of("ptk"), - MessageList: []*commondto.Message{{Content: &commondto.Content{Text: gptr.Of("t")}}}, - }, - }, - } - do := ConvertPromptEvaluatorVersionDTO2DO(100, 200, dto) - if assert.NotNil(t, do) { - assert.Equal(t, int64(21), do.ID) - assert.True(t, gptr.Indirect(do.ReceiveChatHistory)) - assert.Equal(t, "ptk", do.PromptTemplateKey) - assert.Len(t, do.InputSchemas, 1) - } - // DO -> DTO - dtoBack := ConvertPromptEvaluatorVersionDO2DTO(do) - if assert.NotNil(t, dtoBack) { - assert.Equal(t, "0.2.0", dtoBack.GetVersion()) - if assert.NotNil(t, dtoBack.EvaluatorContent) && assert.NotNil(t, dtoBack.EvaluatorContent.PromptEvaluator) { - assert.Equal(t, "ptk", dtoBack.EvaluatorContent.PromptEvaluator.GetPromptTemplateKey()) - } - } + t.Parallel() + // DTO -> DO + dto := &evaluatordto.EvaluatorVersion{ + ID: gptr.Of(int64(21)), + Version: gptr.Of("0.2.0"), + Description: gptr.Of("desc"), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + ReceiveChatHistory: gptr.Of(true), + InputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("in")}}, + PromptEvaluator: &evaluatordto.PromptEvaluator{ + PromptSourceType: evaluatordto.PromptSourceTypePtr(evaluatordto.PromptSourceType_BuiltinTemplate), + PromptTemplateKey: gptr.Of("ptk"), + MessageList: []*commondto.Message{{Content: &commondto.Content{Text: gptr.Of("t")}}}, + }, + }, + } + do := ConvertPromptEvaluatorVersionDTO2DO(100, 200, dto) + if assert.NotNil(t, do) { + assert.Equal(t, int64(21), do.ID) + assert.True(t, gptr.Indirect(do.ReceiveChatHistory)) + assert.Equal(t, "ptk", do.PromptTemplateKey) + assert.Len(t, do.InputSchemas, 1) + } + // DO -> DTO + dtoBack := ConvertPromptEvaluatorVersionDO2DTO(do) + if assert.NotNil(t, dtoBack) { + assert.Equal(t, "0.2.0", dtoBack.GetVersion()) + if assert.NotNil(t, dtoBack.EvaluatorContent) && assert.NotNil(t, dtoBack.EvaluatorContent.PromptEvaluator) { + assert.Equal(t, "ptk", dtoBack.EvaluatorContent.PromptEvaluator.GetPromptTemplateKey()) + } + } } func TestConvertEvaluatorContent2DO(t *testing.T) { - t.Parallel() - // nil content - e, err := ConvertEvaluatorContent2DO(nil, evaluatordto.EvaluatorType_Prompt) - assert.Nil(t, e) - assert.Error(t, err) - - // prompt missing content - _, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{}, evaluatordto.EvaluatorType_Prompt) - assert.Error(t, err) - - // code missing content - _, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{}, evaluatordto.EvaluatorType_Code) - assert.Error(t, err) - - // custom rpc missing content - _, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{}, evaluatordto.EvaluatorType_CustomRPC) - assert.Error(t, err) - - // code ok - e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ - CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypePython), CodeTemplateKey: gptr.Of("k"), CodeTemplateName: gptr.Of("n"), CodeContent: gptr.Of("print(1)")}, - }, evaluatordto.EvaluatorType_Code) - assert.NoError(t, err) - if assert.NotNil(t, e) && assert.NotNil(t, e.CodeEvaluatorVersion) { - assert.Equal(t, evaluatordo.LanguageTypePython, e.CodeEvaluatorVersion.LanguageType) - } - - // prompt ok - e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ - ReceiveChatHistory: gptr.Of(true), - PromptEvaluator: &evaluatordto.PromptEvaluator{ - PromptSourceType: evaluatordto.PromptSourceTypePtr(evaluatordto.PromptSourceType_BuiltinTemplate), - PromptTemplateKey: gptr.Of("key"), - MessageList: []*commondto.Message{{Content: &commondto.Content{Text: gptr.Of("t")}}}, - ModelConfig: &commondto.ModelConfig{}, - }, - InputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("in")}}, - }, evaluatordto.EvaluatorType_Prompt) - assert.NoError(t, err) - if assert.NotNil(t, e) && assert.NotNil(t, e.PromptEvaluatorVersion) { - assert.True(t, gptr.Indirect(e.PromptEvaluatorVersion.ReceiveChatHistory)) - assert.Equal(t, "key", e.PromptEvaluatorVersion.PromptTemplateKey) - } - - // custom rpc ok - basic fields - e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ - CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ - ProviderEvaluatorCode: gptr.Of("CN:480"), - AccessProtocol: evaluatordto.AccessProtocolRPC, - ServiceName: gptr.Of("test-service"), - Cluster: gptr.Of("test-cluster"), - Timeout: gptr.Of(int64(5000)), - }, - }, evaluatordto.EvaluatorType_CustomRPC) - assert.NoError(t, err) - if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { - assert.Equal(t, "CN:480", gptr.Indirect(e.CustomRPCEvaluatorVersion.ProviderEvaluatorCode)) - assert.Equal(t, evaluatordto.AccessProtocolRPC, e.CustomRPCEvaluatorVersion.AccessProtocol) - assert.Equal(t, "test-service", gptr.Indirect(e.CustomRPCEvaluatorVersion.ServiceName)) - assert.Equal(t, "test-cluster", gptr.Indirect(e.CustomRPCEvaluatorVersion.Cluster)) - assert.Equal(t, int64(5000), gptr.Indirect(e.CustomRPCEvaluatorVersion.Timeout)) - } - - // custom rpc ok - with input schemas - e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ - CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ - ProviderEvaluatorCode: gptr.Of("CN:480"), - AccessProtocol: evaluatordto.AccessProtocolRPC, - ServiceName: gptr.Of("test-service"), - }, - InputSchemas: []*commondto.ArgsSchema{ - {Key: gptr.Of("input1"), SupportContentTypes: []string{"text"}}, - {Key: gptr.Of("input2"), SupportContentTypes: []string{"image"}}, - }, - }, evaluatordto.EvaluatorType_CustomRPC) - assert.NoError(t, err) - if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { - assert.NotNil(t, e.CustomRPCEvaluatorVersion.InputSchemas) - assert.Equal(t, 2, len(e.CustomRPCEvaluatorVersion.InputSchemas)) - assert.Equal(t, "input1", gptr.Indirect(e.CustomRPCEvaluatorVersion.InputSchemas[0].Key)) - assert.Equal(t, "input2", gptr.Indirect(e.CustomRPCEvaluatorVersion.InputSchemas[1].Key)) - assert.Equal(t, 1, len(e.CustomRPCEvaluatorVersion.InputSchemas[0].SupportContentTypes)) - assert.Equal(t, evaluatordo.ContentType("text"), e.CustomRPCEvaluatorVersion.InputSchemas[0].SupportContentTypes[0]) - } - - // custom rpc ok - with output schemas - e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ - CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ - ProviderEvaluatorCode: gptr.Of("CN:480"), - AccessProtocol: evaluatordto.AccessProtocolRPC, - ServiceName: gptr.Of("test-service"), - }, - OutputSchemas: []*commondto.ArgsSchema{ - {Key: gptr.Of("output1"), SupportContentTypes: []string{"text"}}, - }, - }, evaluatordto.EvaluatorType_CustomRPC) - assert.NoError(t, err) - if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { - assert.NotNil(t, e.CustomRPCEvaluatorVersion.OutputSchemas) - assert.Equal(t, 1, len(e.CustomRPCEvaluatorVersion.OutputSchemas)) - assert.Equal(t, "output1", gptr.Indirect(e.CustomRPCEvaluatorVersion.OutputSchemas[0].Key)) - } - - // custom rpc ok - with both input and output schemas - e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ - CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ - ProviderEvaluatorCode: gptr.Of("CN:480"), - AccessProtocol: evaluatordto.AccessProtocolRPC, - ServiceName: gptr.Of("test-service"), - Cluster: gptr.Of("prod-cluster"), - Timeout: gptr.Of(int64(10000)), - }, - InputSchemas: []*commondto.ArgsSchema{ - {Key: gptr.Of("input1"), SupportContentTypes: []string{"text"}}, - }, - OutputSchemas: []*commondto.ArgsSchema{ - {Key: gptr.Of("output1"), SupportContentTypes: []string{"text"}}, - {Key: gptr.Of("output2"), SupportContentTypes: []string{"json"}}, - }, - }, evaluatordto.EvaluatorType_CustomRPC) - assert.NoError(t, err) - if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { - assert.Equal(t, "CN:480", gptr.Indirect(e.CustomRPCEvaluatorVersion.ProviderEvaluatorCode)) - assert.Equal(t, evaluatordto.AccessProtocolRPC, e.CustomRPCEvaluatorVersion.AccessProtocol) - assert.Equal(t, "test-service", gptr.Indirect(e.CustomRPCEvaluatorVersion.ServiceName)) - assert.Equal(t, "prod-cluster", gptr.Indirect(e.CustomRPCEvaluatorVersion.Cluster)) - assert.Equal(t, int64(10000), gptr.Indirect(e.CustomRPCEvaluatorVersion.Timeout)) - assert.NotNil(t, e.CustomRPCEvaluatorVersion.InputSchemas) - assert.Equal(t, 1, len(e.CustomRPCEvaluatorVersion.InputSchemas)) - assert.NotNil(t, e.CustomRPCEvaluatorVersion.OutputSchemas) - assert.Equal(t, 2, len(e.CustomRPCEvaluatorVersion.OutputSchemas)) - assert.Equal(t, "input1", gptr.Indirect(e.CustomRPCEvaluatorVersion.InputSchemas[0].Key)) - assert.Equal(t, "output1", gptr.Indirect(e.CustomRPCEvaluatorVersion.OutputSchemas[0].Key)) - assert.Equal(t, "output2", gptr.Indirect(e.CustomRPCEvaluatorVersion.OutputSchemas[1].Key)) - } - - // custom rpc ok - empty schemas - e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ - CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ - ProviderEvaluatorCode: gptr.Of("CN:480"), - AccessProtocol: evaluatordto.AccessProtocolRPC, - }, - InputSchemas: []*commondto.ArgsSchema{}, - OutputSchemas: []*commondto.ArgsSchema{}, - }, evaluatordto.EvaluatorType_CustomRPC) - assert.NoError(t, err) - if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { - assert.Nil(t, e.CustomRPCEvaluatorVersion.InputSchemas) - assert.Nil(t, e.CustomRPCEvaluatorVersion.OutputSchemas) - } + t.Parallel() + // nil content + e, err := ConvertEvaluatorContent2DO(nil, evaluatordto.EvaluatorType_Prompt) + assert.Nil(t, e) + assert.Error(t, err) + + // prompt missing content + _, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{}, evaluatordto.EvaluatorType_Prompt) + assert.Error(t, err) + + // code missing content + _, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{}, evaluatordto.EvaluatorType_Code) + assert.Error(t, err) + + // custom rpc missing content + _, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{}, evaluatordto.EvaluatorType_CustomRPC) + assert.Error(t, err) + + // code ok + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypePython), CodeTemplateKey: gptr.Of("k"), CodeTemplateName: gptr.Of("n"), CodeContent: gptr.Of("print(1)")}, + }, evaluatordto.EvaluatorType_Code) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CodeEvaluatorVersion) { + assert.Equal(t, evaluatordo.LanguageTypePython, e.CodeEvaluatorVersion.LanguageType) + } + + // prompt ok + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + ReceiveChatHistory: gptr.Of(true), + PromptEvaluator: &evaluatordto.PromptEvaluator{ + PromptSourceType: evaluatordto.PromptSourceTypePtr(evaluatordto.PromptSourceType_BuiltinTemplate), + PromptTemplateKey: gptr.Of("key"), + MessageList: []*commondto.Message{{Content: &commondto.Content{Text: gptr.Of("t")}}}, + ModelConfig: &commondto.ModelConfig{}, + }, + InputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("in")}}, + }, evaluatordto.EvaluatorType_Prompt) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.PromptEvaluatorVersion) { + assert.True(t, gptr.Indirect(e.PromptEvaluatorVersion.ReceiveChatHistory)) + assert.Equal(t, "key", e.PromptEvaluatorVersion.PromptTemplateKey) + } + + // custom rpc ok - basic fields + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("CN:480"), + AccessProtocol: evaluatordto.AccessProtocolRPC, + ServiceName: gptr.Of("test-service"), + Cluster: gptr.Of("test-cluster"), + Timeout: gptr.Of(int64(5000)), + }, + }, evaluatordto.EvaluatorType_CustomRPC) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { + assert.Equal(t, "CN:480", gptr.Indirect(e.CustomRPCEvaluatorVersion.ProviderEvaluatorCode)) + assert.Equal(t, evaluatordto.AccessProtocolRPC, e.CustomRPCEvaluatorVersion.AccessProtocol) + assert.Equal(t, "test-service", gptr.Indirect(e.CustomRPCEvaluatorVersion.ServiceName)) + assert.Equal(t, "test-cluster", gptr.Indirect(e.CustomRPCEvaluatorVersion.Cluster)) + assert.Equal(t, int64(5000), gptr.Indirect(e.CustomRPCEvaluatorVersion.Timeout)) + } + + // custom rpc ok - with input schemas + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("CN:480"), + AccessProtocol: evaluatordto.AccessProtocolRPC, + ServiceName: gptr.Of("test-service"), + }, + InputSchemas: []*commondto.ArgsSchema{ + {Key: gptr.Of("input1"), SupportContentTypes: []string{"text"}}, + {Key: gptr.Of("input2"), SupportContentTypes: []string{"image"}}, + }, + }, evaluatordto.EvaluatorType_CustomRPC) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { + assert.NotNil(t, e.CustomRPCEvaluatorVersion.InputSchemas) + assert.Equal(t, 2, len(e.CustomRPCEvaluatorVersion.InputSchemas)) + assert.Equal(t, "input1", gptr.Indirect(e.CustomRPCEvaluatorVersion.InputSchemas[0].Key)) + assert.Equal(t, "input2", gptr.Indirect(e.CustomRPCEvaluatorVersion.InputSchemas[1].Key)) + assert.Equal(t, 1, len(e.CustomRPCEvaluatorVersion.InputSchemas[0].SupportContentTypes)) + assert.Equal(t, evaluatordo.ContentType("text"), e.CustomRPCEvaluatorVersion.InputSchemas[0].SupportContentTypes[0]) + } + + // custom rpc ok - with output schemas + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("CN:480"), + AccessProtocol: evaluatordto.AccessProtocolRPC, + ServiceName: gptr.Of("test-service"), + }, + OutputSchemas: []*commondto.ArgsSchema{ + {Key: gptr.Of("output1"), SupportContentTypes: []string{"text"}}, + }, + }, evaluatordto.EvaluatorType_CustomRPC) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { + assert.NotNil(t, e.CustomRPCEvaluatorVersion.OutputSchemas) + assert.Equal(t, 1, len(e.CustomRPCEvaluatorVersion.OutputSchemas)) + assert.Equal(t, "output1", gptr.Indirect(e.CustomRPCEvaluatorVersion.OutputSchemas[0].Key)) + } + + // custom rpc ok - with both input and output schemas + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("CN:480"), + AccessProtocol: evaluatordto.AccessProtocolRPC, + ServiceName: gptr.Of("test-service"), + Cluster: gptr.Of("prod-cluster"), + Timeout: gptr.Of(int64(10000)), + }, + InputSchemas: []*commondto.ArgsSchema{ + {Key: gptr.Of("input1"), SupportContentTypes: []string{"text"}}, + }, + OutputSchemas: []*commondto.ArgsSchema{ + {Key: gptr.Of("output1"), SupportContentTypes: []string{"text"}}, + {Key: gptr.Of("output2"), SupportContentTypes: []string{"json"}}, + }, + }, evaluatordto.EvaluatorType_CustomRPC) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { + assert.Equal(t, "CN:480", gptr.Indirect(e.CustomRPCEvaluatorVersion.ProviderEvaluatorCode)) + assert.Equal(t, evaluatordto.AccessProtocolRPC, e.CustomRPCEvaluatorVersion.AccessProtocol) + assert.Equal(t, "test-service", gptr.Indirect(e.CustomRPCEvaluatorVersion.ServiceName)) + assert.Equal(t, "prod-cluster", gptr.Indirect(e.CustomRPCEvaluatorVersion.Cluster)) + assert.Equal(t, int64(10000), gptr.Indirect(e.CustomRPCEvaluatorVersion.Timeout)) + assert.NotNil(t, e.CustomRPCEvaluatorVersion.InputSchemas) + assert.Equal(t, 1, len(e.CustomRPCEvaluatorVersion.InputSchemas)) + assert.NotNil(t, e.CustomRPCEvaluatorVersion.OutputSchemas) + assert.Equal(t, 2, len(e.CustomRPCEvaluatorVersion.OutputSchemas)) + assert.Equal(t, "input1", gptr.Indirect(e.CustomRPCEvaluatorVersion.InputSchemas[0].Key)) + assert.Equal(t, "output1", gptr.Indirect(e.CustomRPCEvaluatorVersion.OutputSchemas[0].Key)) + assert.Equal(t, "output2", gptr.Indirect(e.CustomRPCEvaluatorVersion.OutputSchemas[1].Key)) + } + + // custom rpc ok - empty schemas + e, err = ConvertEvaluatorContent2DO(&evaluatordto.EvaluatorContent{ + CustomRPCEvaluator: &evaluatordto.CustomRPCEvaluator{ + ProviderEvaluatorCode: gptr.Of("CN:480"), + AccessProtocol: evaluatordto.AccessProtocolRPC, + }, + InputSchemas: []*commondto.ArgsSchema{}, + OutputSchemas: []*commondto.ArgsSchema{}, + }, evaluatordto.EvaluatorType_CustomRPC) + assert.NoError(t, err) + if assert.NotNil(t, e) && assert.NotNil(t, e.CustomRPCEvaluatorVersion) { + assert.Nil(t, e.CustomRPCEvaluatorVersion.InputSchemas) + assert.Nil(t, e.CustomRPCEvaluatorVersion.OutputSchemas) + } } func TestTagKeyConvert(t *testing.T) { - t.Parallel() - assert.Equal(t, evaluatordto.EvaluatorTagKeyCategory, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_Category)) - assert.Equal(t, evaluatordto.EvaluatorTagKeyTargetType, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_TargetType)) - assert.Equal(t, evaluatordto.EvaluatorTagKeyObjective, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_Objective)) - assert.Equal(t, evaluatordto.EvaluatorTagKeyBusinessScenario, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_BusinessScenario)) - assert.Equal(t, evaluatordto.EvaluatorTagKeyName, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_Name)) + t.Parallel() + assert.Equal(t, evaluatordto.EvaluatorTagKeyCategory, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_Category)) + assert.Equal(t, evaluatordto.EvaluatorTagKeyTargetType, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_TargetType)) + assert.Equal(t, evaluatordto.EvaluatorTagKeyObjective, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_Objective)) + assert.Equal(t, evaluatordto.EvaluatorTagKeyBusinessScenario, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_BusinessScenario)) + assert.Equal(t, evaluatordto.EvaluatorTagKeyName, ConvertEvaluatorTagKeyDO2DTO(evaluatordo.EvaluatorTagKey_Name)) } func TestConvertEvaluatorDOList2DTO(t *testing.T) { t.Parallel() @@ -393,7 +393,7 @@ func TestConvertEvaluatorDTO2DO_WithCurrentVersion(t *testing.T) { tests := []struct { name string evaluatorDTO *evaluatordto.Evaluator - validate func(t *testing.T, result *evaluatordo.Evaluator) + validate func(t *testing.T, result *evaluatordo.Evaluator, err error) }{ { name: "Prompt评估器带版本信息", @@ -418,7 +418,8 @@ func TestConvertEvaluatorDTO2DO_WithCurrentVersion(t *testing.T) { }, }, }, - validate: func(t *testing.T, result *evaluatordo.Evaluator) { + validate: func(t *testing.T, result *evaluatordo.Evaluator, err error) { + assert.NoError(t, err) assert.Equal(t, int64(123), result.ID) assert.Equal(t, evaluatordo.EvaluatorTypePrompt, result.EvaluatorType) assert.NotNil(t, result.PromptEvaluatorVersion) @@ -450,7 +451,8 @@ func TestConvertEvaluatorDTO2DO_WithCurrentVersion(t *testing.T) { }, }, }, - validate: func(t *testing.T, result *evaluatordo.Evaluator) { + validate: func(t *testing.T, result *evaluatordo.Evaluator, err error) { + assert.NoError(t, err) assert.Equal(t, int64(124), result.ID) assert.Equal(t, evaluatordo.EvaluatorTypeCode, result.EvaluatorType) assert.NotNil(t, result.CodeEvaluatorVersion) @@ -465,10 +467,10 @@ func TestConvertEvaluatorDTO2DO_WithCurrentVersion(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - result := ConvertEvaluatorDTO2DO(tt.evaluatorDTO) + result, err := ConvertEvaluatorDTO2DO(tt.evaluatorDTO) if tt.validate != nil { - tt.validate(t, result) + tt.validate(t, result, err) } }) } @@ -711,7 +713,7 @@ func TestConvertEvaluatorDTO2DO_EdgeCases(t *testing.T) { tests := []struct { name string evaluatorDTO *evaluatordto.Evaluator - validate func(t *testing.T, result *evaluatordo.Evaluator) + validate func(t *testing.T, result *evaluatordo.Evaluator, err error) }{ { name: "evaluator without current version", @@ -722,7 +724,8 @@ func TestConvertEvaluatorDTO2DO_EdgeCases(t *testing.T) { EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), CurrentVersion: nil, }, - validate: func(t *testing.T, result *evaluatordo.Evaluator) { + validate: func(t *testing.T, result *evaluatordo.Evaluator, err error) { + assert.NoError(t, err) assert.Equal(t, int64(123), result.ID) assert.Nil(t, result.PromptEvaluatorVersion) assert.Nil(t, result.CodeEvaluatorVersion) @@ -734,10 +737,10 @@ func TestConvertEvaluatorDTO2DO_EdgeCases(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - result := ConvertEvaluatorDTO2DO(tt.evaluatorDTO) + result, err := ConvertEvaluatorDTO2DO(tt.evaluatorDTO) if tt.validate != nil { - tt.validate(t, result) + tt.validate(t, result, err) } }) } @@ -1028,105 +1031,105 @@ func TestConvertEvaluatorTagKeyDO2DTO(t *testing.T) { // 新增：覆盖 CodeEvaluatorContent 的 lang_2_code_content 转换路径（DTO -> DO） func TestConvertCodeEvaluatorContentDTO2DO_OldFieldsToMap(t *testing.T) { - t.Parallel() - - dto := &evaluatordto.CodeEvaluator{ - LanguageType: gptr.Of(evaluatordto.LanguageType("Python")), - CodeContent: gptr.Of("print('old')"), - } - // 使用旧字段，期望转换为单元素 Lang2CodeContent - - do := ConvertCodeEvaluatorContentDTO2DO(dto) - // 期望将 map 完整落入 DO - assert.NotNil(t, do) - assert.NotNil(t, do.Lang2CodeContent) - assert.Equal(t, "print('old')", do.Lang2CodeContent[evaluatordo.LanguageType("Python")]) + t.Parallel() + + dto := &evaluatordto.CodeEvaluator{ + LanguageType: gptr.Of(evaluatordto.LanguageType("Python")), + CodeContent: gptr.Of("print('old')"), + } + // 使用旧字段，期望转换为单元素 Lang2CodeContent + + do := ConvertCodeEvaluatorContentDTO2DO(dto) + // 期望将 map 完整落入 DO + assert.NotNil(t, do) + assert.NotNil(t, do.Lang2CodeContent) + assert.Equal(t, "print('old')", do.Lang2CodeContent[evaluatordo.LanguageType("Python")]) } // 新增：覆盖 CodeEvaluatorContent 的 lang_2_code_content 转换路径（DO -> DTO） func TestConvertCodeEvaluatorContentDO2DTO_Lang2(t *testing.T) { - t.Parallel() - - do := &evaluatordo.CodeEvaluatorContent{ - Lang2CodeContent: map[evaluatordo.LanguageType]string{ - evaluatordo.LanguageType("Python"): "print('py')", - }, - } - - dto := ConvertCodeEvaluatorContentDO2DTO(do) - assert.NotNil(t, dto) - // 兼容旧字段：从 map 回填一个 language_type/code_content - assert.Equal(t, "Python", dto.GetLanguageType()) - assert.Equal(t, "print('py')", dto.GetCodeContent()) - // 不校验新字段（兼容老字段即可） + t.Parallel() + + do := &evaluatordo.CodeEvaluatorContent{ + Lang2CodeContent: map[evaluatordo.LanguageType]string{ + evaluatordo.LanguageType("Python"): "print('py')", + }, + } + + dto := ConvertCodeEvaluatorContentDO2DTO(do) + assert.NotNil(t, dto) + // 兼容旧字段：从 map 回填一个 language_type/code_content + assert.Equal(t, "Python", dto.GetLanguageType()) + assert.Equal(t, "print('py')", dto.GetCodeContent()) + // 不校验新字段（兼容老字段即可） } // 新增：覆盖 CodeEvaluatorVersion 的 DTO -> DO（优先根据 language_type 命中 lang_2_code_content） func TestConvertCodeEvaluatorVersionDTO2DO_Lang2_PickByLanguageType(t *testing.T) { - t.Parallel() - - ev := &evaluatordto.EvaluatorVersion{ - ID: gptr.Of(int64(100)), - Version: gptr.Of("1.0.0"), - Description: gptr.Of("desc"), - EvaluatorContent: &evaluatordto.EvaluatorContent{ - CodeEvaluator: &evaluatordto.CodeEvaluator{ - LanguageType: gptr.Of(evaluatordto.LanguageType("JS")), - CodeTemplateKey: gptr.Of("tpl-1"), - CodeTemplateName: gptr.Of("TPL1"), - }, - }, - } - // 不使用新字段，使用旧字段验证兼容路径 - ev.EvaluatorContent.CodeEvaluator.CodeContent = gptr.Of("console.log('js')") - - do := ConvertCodeEvaluatorVersionDTO2DO(1, 2, ev) - assert.NotNil(t, do) - assert.Equal(t, int64(1), do.EvaluatorID) - assert.Equal(t, int64(2), do.SpaceID) - // 根据 language_type=JS 命中 map - assert.Equal(t, "console.log('js')", do.CodeContent) - assert.Equal(t, evaluatordo.LanguageType("JS"), do.LanguageType) + t.Parallel() + + ev := &evaluatordto.EvaluatorVersion{ + ID: gptr.Of(int64(100)), + Version: gptr.Of("1.0.0"), + Description: gptr.Of("desc"), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{ + LanguageType: gptr.Of(evaluatordto.LanguageType("JS")), + CodeTemplateKey: gptr.Of("tpl-1"), + CodeTemplateName: gptr.Of("TPL1"), + }, + }, + } + // 不使用新字段，使用旧字段验证兼容路径 + ev.EvaluatorContent.CodeEvaluator.CodeContent = gptr.Of("console.log('js')") + + do := ConvertCodeEvaluatorVersionDTO2DO(1, 2, ev) + assert.NotNil(t, do) + assert.Equal(t, int64(1), do.EvaluatorID) + assert.Equal(t, int64(2), do.SpaceID) + // 根据 language_type=JS 命中 map + assert.Equal(t, "console.log('js')", do.CodeContent) + assert.Equal(t, evaluatordo.LanguageType("JS"), do.LanguageType) } // 新增：覆盖 CodeEvaluatorVersion 的 DTO -> DO（未给 language_type 时取第一个） func TestConvertCodeEvaluatorVersionDTO2DO_Lang2_PickFirst(t *testing.T) { - t.Parallel() - - ev := &evaluatordto.EvaluatorVersion{ - EvaluatorContent: &evaluatordto.EvaluatorContent{ - CodeEvaluator: &evaluatordto.CodeEvaluator{}, - }, - } - // 不使用新字段，使用旧字段验证兼容路径 - ev.EvaluatorContent.CodeEvaluator.LanguageType = gptr.Of(evaluatordto.LanguageType("Python")) - ev.EvaluatorContent.CodeEvaluator.CodeContent = gptr.Of("print('py')") - - do := ConvertCodeEvaluatorVersionDTO2DO(1, 2, ev) - assert.NotNil(t, do) - assert.Equal(t, "print('py')", do.CodeContent) - assert.Equal(t, evaluatordo.LanguageType("Python"), do.LanguageType) + t.Parallel() + + ev := &evaluatordto.EvaluatorVersion{ + EvaluatorContent: &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{}, + }, + } + // 不使用新字段，使用旧字段验证兼容路径 + ev.EvaluatorContent.CodeEvaluator.LanguageType = gptr.Of(evaluatordto.LanguageType("Python")) + ev.EvaluatorContent.CodeEvaluator.CodeContent = gptr.Of("print('py')") + + do := ConvertCodeEvaluatorVersionDTO2DO(1, 2, ev) + assert.NotNil(t, do) + assert.Equal(t, "print('py')", do.CodeContent) + assert.Equal(t, evaluatordo.LanguageType("Python"), do.LanguageType) } // 新增：覆盖 ConvertEvaluatorContent2DO 的 Code 分支（优先 lang_2_code_content） func TestConvertEvaluatorContent2DO_Code_Lang2(t *testing.T) { - t.Parallel() - content := &evaluatordto.EvaluatorContent{ - CodeEvaluator: &evaluatordto.CodeEvaluator{ - LanguageType: gptr.Of(evaluatordto.LanguageType("Python")), - }, - } - // 不使用新字段，使用旧字段验证兼容路径 - content.CodeEvaluator.CodeContent = gptr.Of("print('py')") - - do, err := ConvertEvaluatorContent2DO(content, evaluatordto.EvaluatorType_Code) - assert.NoError(t, err) - assert.NotNil(t, do) - if do.CodeEvaluatorVersion == nil { - t.Fatalf("expected CodeEvaluatorVersion not nil") - } - assert.Equal(t, "print('py')", do.CodeEvaluatorVersion.CodeContent) - assert.Equal(t, evaluatordo.LanguageType("Python"), do.CodeEvaluatorVersion.LanguageType) + t.Parallel() + content := &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{ + LanguageType: gptr.Of(evaluatordto.LanguageType("Python")), + }, + } + // 不使用新字段，使用旧字段验证兼容路径 + content.CodeEvaluator.CodeContent = gptr.Of("print('py')") + + do, err := ConvertEvaluatorContent2DO(content, evaluatordto.EvaluatorType_Code) + assert.NoError(t, err) + assert.NotNil(t, do) + if do.CodeEvaluatorVersion == nil { + t.Fatalf("expected CodeEvaluatorVersion not nil") + } + assert.Equal(t, "print('py')", do.CodeEvaluatorVersion.CodeContent) + assert.Equal(t, evaluatordo.LanguageType("Python"), do.CodeEvaluatorVersion.LanguageType) } // TestConvertCustomRPCEvaluatorVersionDTO2DO 测试将 CustomRPC EvaluatorVersion DTO 转换为 DO @@ -1138,7 +1141,7 @@ func TestConvertCustomRPCEvaluatorVersionDTO2DO(t *testing.T) { evaluatorID int64 spaceID int64 dto *evaluatordto.EvaluatorVersion - validate func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion) + validate func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion, err error) description string }{ { @@ -1146,8 +1149,9 @@ func TestConvertCustomRPCEvaluatorVersionDTO2DO(t *testing.T) { evaluatorID: 123, spaceID: 456, dto: nil, - validate: func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion) { + validate: func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion, err error) { assert.Nil(t, result) + assert.NoError(t, err) }, description: "nil输入应该返回nil", }, @@ -1183,7 +1187,8 @@ func TestConvertCustomRPCEvaluatorVersionDTO2DO(t *testing.T) { }, }, }, - validate: func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion) { + validate: func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion, err error) { + assert.NoError(t, err) assert.NotNil(t, result) assert.Equal(t, int64(789), result.ID) assert.Equal(t, int64(123), result.EvaluatorID) @@ -1193,7 +1198,7 @@ func TestConvertCustomRPCEvaluatorVersionDTO2DO(t *testing.T) { assert.Equal(t, evaluatordo.EvaluatorTypeCustomRPC, result.EvaluatorType) assert.NotNil(t, result.ProviderEvaluatorCode) assert.Equal(t, "PROVIDER_001", *result.ProviderEvaluatorCode) - assert.Equal(t, evaluatordo.AccessProtocol("HTTP"), result.AccessProtocol) + assert.Equal(t, evaluatordo.AccessProtocol("HTTP"), result.AccessProtocol) assert.NotNil(t, result.ServiceName) assert.Equal(t, "test_service", *result.ServiceName) assert.NotNil(t, result.Cluster) @@ -1212,12 +1217,13 @@ func TestConvertCustomRPCEvaluatorVersionDTO2DO(t *testing.T) { evaluatorID: 123, spaceID: 456, dto: &evaluatordto.EvaluatorVersion{ - ID: gptr.Of(int64(789)), - Version: gptr.Of("1.0.0"), - Description: gptr.Of("Test version"), + ID: gptr.Of(int64(789)), + Version: gptr.Of("1.0.0"), + Description: gptr.Of("Test version"), EvaluatorContent: &evaluatordto.EvaluatorContent{}, }, - validate: func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion) { + validate: func(t *testing.T, result *evaluatordo.CustomRPCEvaluatorVersion, err error) { + assert.NoError(t, err) assert.NotNil(t, result) assert.Equal(t, int64(789), result.ID) assert.Nil(t, result.InputSchemas) @@ -1231,10 +1237,10 @@ func TestConvertCustomRPCEvaluatorVersionDTO2DO(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - result := ConvertCustomRPCEvaluatorVersionDTO2DO(tt.evaluatorID, tt.spaceID, tt.dto) + result, err := ConvertCustomRPCEvaluatorVersionDTO2DO(tt.evaluatorID, tt.spaceID, tt.dto) if tt.validate != nil { - tt.validate(t, result) + tt.validate(t, result, err) } }) } @@ -1245,14 +1251,14 @@ func TestConvertCustomRPCEvaluatorVersionDO2DTO(t *testing.T) { t.Parallel() tests := []struct { - name string - do *evaluatordo.CustomRPCEvaluatorVersion - validate func(t *testing.T, result *evaluatordto.EvaluatorVersion) + name string + do *evaluatordo.CustomRPCEvaluatorVersion + validate func(t *testing.T, result *evaluatordto.EvaluatorVersion) description string }{ { - name: "nil输入", - do: nil, + name: "nil输入", + do: nil, validate: func(t *testing.T, result *evaluatordto.EvaluatorVersion) { assert.Nil(t, result) }, @@ -1261,12 +1267,12 @@ func TestConvertCustomRPCEvaluatorVersionDO2DTO(t *testing.T) { { name: "成功 - 完整转换", do: &evaluatordo.CustomRPCEvaluatorVersion{ - ID: 789, - EvaluatorID: 123, - SpaceID: 456, - Version: "1.0.0", - Description: "Test CustomRPC version", - EvaluatorType: evaluatordo.EvaluatorTypeCustomRPC, + ID: 789, + EvaluatorID: 123, + SpaceID: 456, + Version: "1.0.0", + Description: "Test CustomRPC version", + EvaluatorType: evaluatordo.EvaluatorTypeCustomRPC, ProviderEvaluatorCode: gptr.Of("PROVIDER_001"), AccessProtocol: evaluatordo.AccessProtocol("HTTP"), ServiceName: gptr.Of("test_service"), @@ -1295,7 +1301,7 @@ func TestConvertCustomRPCEvaluatorVersionDO2DTO(t *testing.T) { assert.NotNil(t, result.EvaluatorContent) assert.NotNil(t, result.EvaluatorContent.CustomRPCEvaluator) assert.Equal(t, "PROVIDER_001", *result.EvaluatorContent.CustomRPCEvaluator.ProviderEvaluatorCode) - assert.Equal(t, evaluatordto.AccessProtocol("HTTP"), result.EvaluatorContent.CustomRPCEvaluator.AccessProtocol) + assert.Equal(t, evaluatordto.AccessProtocol("HTTP"), result.EvaluatorContent.CustomRPCEvaluator.AccessProtocol) assert.Equal(t, "test_service", *result.EvaluatorContent.CustomRPCEvaluator.ServiceName) assert.Equal(t, "test_cluster", *result.EvaluatorContent.CustomRPCEvaluator.Cluster) assert.Equal(t, int64(5000), *result.EvaluatorContent.CustomRPCEvaluator.Timeout) @@ -1338,4 +1344,3 @@ func TestConvertCustomRPCEvaluatorVersionDO2DTO(t *testing.T) { }) } } - diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index 01f8f09ac..c9bcc4738 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -247,7 +247,10 @@ func (e *EvaluatorHandlerImpl) CreateEvaluator(ctx context.Context, request *eva e.metrics.EmitCreate(request.GetEvaluator().GetWorkspaceID(), err) }() // 转换请求参数为领域对象 - evaluatorDO := evaluatorconvertor.ConvertEvaluatorDTO2DO(request.GetEvaluator()) + evaluatorDO, err := evaluatorconvertor.ConvertEvaluatorDTO2DO(request.GetEvaluator()) + if err != nil { + return nil, err + } // 统一走 CreateEvaluator，是否创建tag由repo层依据 do.Builtin 决定 var evaluatorID int64 @@ -449,7 +452,11 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluatorDraft(ctx context.Context, request evaluatorDTO := evaluatorconvertor.ConvertEvaluatorDO2DTO(evaluatorDO) evaluatorDTO.CurrentVersion.EvaluatorContent = request.EvaluatorContent evaluatorDTO.DraftSubmitted = ptr.Of(false) - err = e.evaluatorService.UpdateEvaluatorDraft(ctx, evaluatorconvertor.ConvertEvaluatorDTO2DO(evaluatorDTO)) + evaluatorDO, err = evaluatorconvertor.ConvertEvaluatorDTO2DO(evaluatorDTO) + if err != nil { + return nil, err + } + err = e.evaluatorService.UpdateEvaluatorDraft(ctx, evaluatorDO) if err != nil { return nil, err } @@ -959,7 +966,10 @@ func (e *EvaluatorHandlerImpl) DebugEvaluator(ctx context.Context, request *eval EvaluatorContent: request.EvaluatorContent, }, } - do := evaluatorconvertor.ConvertEvaluatorDTO2DO(dto) + do, err := evaluatorconvertor.ConvertEvaluatorDTO2DO(dto) + if err != nil { + return nil, err + } inputData := evaluatorconvertor.ConvertEvaluatorInputDataDTO2DO(request.GetInputData()) outputData, err := e.evaluatorService.DebugEvaluator(ctx, do, inputData, request.WorkspaceID) if err != nil { @@ -1289,7 +1299,10 @@ func (e *EvaluatorHandlerImpl) BatchDebugEvaluator(ctx context.Context, request EvaluatorContent: request.EvaluatorContent, }, } - evaluatorDO := evaluatorconvertor.ConvertEvaluatorDTO2DO(dto) + evaluatorDO, err := evaluatorconvertor.ConvertEvaluatorDTO2DO(dto) + if err != nil { + return nil, err + } // 并发调试处理 return e.batchDebugWithConcurrency(ctx, evaluatorDO, request.InputData, request.WorkspaceID) diff --git a/backend/modules/evaluation/domain/entity/common.go b/backend/modules/evaluation/domain/entity/common.go index 12fe6a46f..57db7d8cd 100644 --- a/backend/modules/evaluation/domain/entity/common.go +++ b/backend/modules/evaluation/domain/entity/common.go @@ -3,7 +3,10 @@ package entity -import "fmt" +import ( + "fmt" + "time" +) // ContentType 定义内容类型 type ContentType string @@ -356,3 +359,9 @@ func StorageProviderFromString(s string) (StorageProvider, error) { } func StorageProviderPtr(v StorageProvider) *StorageProvider { return &v } + +type RateLimit struct { + Rate *int32 `json:"rate,omitempty"` + Burst *int32 `json:"burst,omitempty"` + Period *time.Duration `json:"period,omitempty"` +} diff --git a/backend/modules/evaluation/domain/entity/evaluator.go b/backend/modules/evaluation/domain/entity/evaluator.go index 55f33c916..e53db4c67 100644 --- a/backend/modules/evaluation/domain/entity/evaluator.go +++ b/backend/modules/evaluation/domain/entity/evaluator.go @@ -437,3 +437,13 @@ func (e *Evaluator) SetEvaluatorVersion(version *Evaluator) { return } } + +func (e *Evaluator) GetRateLimit() *RateLimit { + switch e.EvaluatorType { + case EvaluatorTypeCustomRPC: + if e.CustomRPCEvaluatorVersion != nil { + return e.CustomRPCEvaluatorVersion.RateLimit + } + } + return nil +} diff --git a/backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc.go b/backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc.go index 5da425290..dc5a0b00b 100644 --- a/backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc.go +++ b/backend/modules/evaluation/domain/entity/evaluator_version_custom_rpc.go @@ -35,6 +35,7 @@ type CustomRPCEvaluatorVersion struct { ServiceName *string `json:"service_name"` Cluster *string `json:"cluster"` Timeout *int64 `json:"timeout"` // timeout duration in milliseconds(ms) + RateLimit *RateLimit `json:"rate_limit,omitempty"` } func (do *CustomRPCEvaluatorVersion) SetID(id int64) { diff --git a/backend/modules/evaluation/domain/repo/ratelimiter.go b/backend/modules/evaluation/domain/repo/ratelimiter.go index 985b74298..760e5b8f8 100644 --- a/backend/modules/evaluation/domain/repo/ratelimiter.go +++ b/backend/modules/evaluation/domain/repo/ratelimiter.go @@ -3,9 +3,14 @@ package repo -import "context" +import ( + "context" + + commonentity "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" +) //go:generate mockgen -destination mocks/ratelimiter_mock.go -package mocks . RateLimiter type RateLimiter interface { AllowInvoke(ctx context.Context, spaceID int64) bool + AllowInvokeWithKeyLimit(ctx context.Context, key string, limit *commonentity.RateLimit) bool } diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index ab1538867..b50c1b5f3 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -594,9 +594,11 @@ func (e *EvaluatorServiceImpl) RunEvaluator(ctx context.Context, request *entity return nil, errorx.NewByCode(errno.EvaluatorVersionNotFoundCode, errorx.WithExtraMsg("evaluator_version not found in current space")) } } - allow := e.limiter.AllowInvoke(ctx, request.SpaceID) - if !allow { - return nil, errorx.NewByCode(errno.EvaluatorQPSLimitCode) + if allow := e.limiter.AllowInvoke(ctx, request.SpaceID); !allow { + return nil, errorx.NewByCode(errno.EvaluatorQPSLimitCode, errorx.WithExtraMsg("evaluator throttled due to space-level rate limit")) + } + if allow := e.limiter.AllowInvokeWithKeyLimit(ctx, fmt.Sprintf("run_evaluator:%v", evaluatorDO.ID), evaluatorDO.GetRateLimit()); !allow { + return nil, errorx.NewByCode(errno.EvaluatorQPSLimitCode, errorx.WithExtraMsg("evaluator throttled due to evaluator-level rate limit")) } evaluatorSourceService, ok := e.evaluatorSourceServices[evaluatorDO.EvaluatorType] if !ok { diff --git a/backend/modules/evaluation/infra/repo/evaluator/ratelimiter_impl.go b/backend/modules/evaluation/infra/repo/evaluator/ratelimiter_impl.go index be04cd3bb..d8d29cb4a 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/ratelimiter_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/ratelimiter_impl.go @@ -6,8 +6,11 @@ package evaluator import ( "context" + "github.com/bytedance/gg/gptr" + "github.com/coze-dev/coze-loop/backend/infra/limiter" "github.com/coze-dev/coze-loop/backend/modules/evaluation/consts" + commonentity "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo" "github.com/coze-dev/coze-loop/backend/modules/evaluation/pkg/conf" "github.com/coze-dev/coze-loop/backend/pkg/logs" @@ -39,3 +42,29 @@ func (s *RateLimiterImpl) AllowInvoke(ctx context.Context, spaceID int64) bool { logs.CtxInfo(ctx, "[AllowInvoke] not allow invoke") return false } + +func (s *RateLimiterImpl) AllowInvokeWithKeyLimit(ctx context.Context, key string, limit *commonentity.RateLimit) bool { + if len(key) == 0 { + logs.CtxError(ctx, "[AllowInvokeWithKeyLimit] key is empty") + return false + } + if limit == nil { + logs.CtxInfo(ctx, "[AllowInvokeWithKeyLimit] limit is not set, skip invoke limit") + return true + } + res, err := s.limiter.AllowN(ctx, key, 1, limiter.WithLimit(&limiter.Limit{ + Rate: int(gptr.Indirect(limit.Rate)), + Burst: int(gptr.Indirect(limit.Burst)), + Period: gptr.Indirect(limit.Period), + })) + if err != nil { + logs.CtxError(ctx, "[AllowInvokeWithKeyLimit] allow invoke failed, err=%v", err) + return true + } + if res.Allowed { + logs.CtxInfo(ctx, "[AllowInvokeWithKeyLimit] allow invoke") + return true + } + logs.CtxInfo(ctx, "[AllowInvokeWithKeyLimit] not allow invoke") + return false +} diff --git a/idl/thrift/coze/loop/evaluation/domain/common.thrift b/idl/thrift/coze/loop/evaluation/domain/common.thrift index 72ee4a53d..02dc21fe6 100644 --- a/idl/thrift/coze/loop/evaluation/domain/common.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/common.thrift @@ -102,3 +102,9 @@ struct RuntimeParam { 1: optional string json_value 2: optional string json_demo } + +struct RateLimit { + 1: optional i32 rate + 2: optional i32 burst + 3: optional string period +} diff --git a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift index 24acb835f..d108cff6a 100644 --- a/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift +++ b/idl/thrift/coze/loop/evaluation/domain/evaluator.thrift @@ -93,6 +93,7 @@ struct CustomRPCEvaluator { 4: optional string cluster 10: optional i64 timeout // ms + 11: optional common.RateLimit rate_limit // 自定义评估器的限流配置 } struct EvaluatorVersion { From 1a3defa7a73092ed52e1d17b5960060057f1374d Mon Sep 17 00:00:00 2001 From: tpfz Date: Wed, 5 Nov 2025 20:19:05 +0800 Subject: [PATCH 36/42] fix trace --- .../service/evaluator_source_code_impl.go | 2 +- .../service/evaluator_source_prompt_impl.go | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/backend/modules/evaluation/domain/service/evaluator_source_code_impl.go b/backend/modules/evaluation/domain/service/evaluator_source_code_impl.go index d0c91ba19..edff58a36 100755 --- a/backend/modules/evaluation/domain/service/evaluator_source_code_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_source_code_impl.go @@ -204,7 +204,7 @@ func (c *EvaluatorSourceCodeServiceImpl) Run(ctx context.Context, evaluator *ent var code string startTime := time.Now() // 创建trace span - rootSpan, ctx := c.newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(evaluator.SpaceID, 10), disableTracing) + rootSpan, ctx := c.newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(exptSpaceID, 10), disableTracing) traceID = rootSpan.GetTraceID() defer func() { diff --git a/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl.go b/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl.go index 7ae973c67..4158b20d0 100644 --- a/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_source_prompt_impl.go @@ -77,13 +77,13 @@ func (p *EvaluatorSourcePromptServiceImpl) Run(ctx context.Context, evaluator *e var rootSpan *evaluatorSpan if !disableTracing { - rootSpan, ctx = newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(evaluator.SpaceID, 10), false) + rootSpan, ctx = newEvaluatorSpan(ctx, evaluator.Name, "LoopEvaluation", strconv.FormatInt(exptSpaceID, 10), false) traceID = rootSpan.GetTraceID() } else { traceID = "" } - defer func() { + defer func() { if output == nil { output = &entity.EvaluatorOutputData{ EvaluatorRunError: &entity.EvaluatorRunError{}, @@ -137,10 +137,10 @@ func (p *EvaluatorSourcePromptServiceImpl) Run(ctx context.Context, evaluator *e modelID = strconv.FormatInt(evaluator.PromptEvaluatorVersion.ModelConfig.ModelID, 10) } - p.metric.EmitRun(evaluator.SpaceID, err, startTime, modelID) + p.metric.EmitRun(exptSpaceID, err, startTime, modelID) }() // 渲染变量 - err = renderTemplate(ctx, evaluator.PromptEvaluatorVersion, input, disableTracing) + err = renderTemplate(ctx, evaluator.PromptEvaluatorVersion, input, exptSpaceID, disableTracing) if err != nil { logs.CtxError(ctx, "[RunEvaluator] renderTemplate fail, err: %v", err) runStatus = entity.EvaluatorRunStatusFail @@ -148,13 +148,13 @@ func (p *EvaluatorSourcePromptServiceImpl) Run(ctx context.Context, evaluator *e } // 执行评估逻辑 userIDInContext := session.UserIDInCtxOrEmpty(ctx) - llmResp, err := p.chat(ctx, evaluator.PromptEvaluatorVersion, userIDInContext, disableTracing) + llmResp, err := p.chat(ctx, evaluator.PromptEvaluatorVersion, exptSpaceID, userIDInContext, disableTracing) if err != nil { logs.CtxError(ctx, "[RunEvaluator] chat fail, err: %v", err) runStatus = entity.EvaluatorRunStatusFail return nil, runStatus, traceID } - output, err = parseOutput(ctx, evaluator.PromptEvaluatorVersion, llmResp, disableTracing) + output, err = parseOutput(ctx, evaluator.PromptEvaluatorVersion, llmResp, exptSpaceID, disableTracing) if err != nil { logs.CtxWarn(ctx, "[RunEvaluator] parseOutput fail, err: %v", err) runStatus = entity.EvaluatorRunStatusFail @@ -163,12 +163,12 @@ func (p *EvaluatorSourcePromptServiceImpl) Run(ctx context.Context, evaluator *e return output, entity.EvaluatorRunStatusSuccess, traceID } -func (p *EvaluatorSourcePromptServiceImpl) chat(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, userIDInContext string, disableTracing bool) (resp *entity.ReplyItem, err error) { +func (p *EvaluatorSourcePromptServiceImpl) chat(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, exptSpaceID int64, userIDInContext string, disableTracing bool) (resp *entity.ReplyItem, err error) { var modelSpan *evaluatorSpan modelCtx := ctx - if !disableTracing { - modelSpan, modelCtx = newEvaluatorSpan(ctx, evaluatorVersion.ModelConfig.ModelName, "model", strconv.FormatInt(evaluatorVersion.SpaceID, 10), true) + if !disableTracing { + modelSpan, modelCtx = newEvaluatorSpan(ctx, evaluatorVersion.ModelConfig.ModelName, "model", strconv.FormatInt(exptSpaceID, 10), true) defer func() { modelSpan.reportModelSpan(modelCtx, evaluatorVersion, resp, err) }() @@ -182,8 +182,8 @@ func (p *EvaluatorSourcePromptServiceImpl) chat(ctx context.Context, evaluatorVe } } - llmCallParam := &entity.LLMCallParam{ - SpaceID: evaluatorVersion.GetSpaceID(), + llmCallParam := &entity.LLMCallParam{ + SpaceID: exptSpaceID, EvaluatorID: strconv.FormatInt(evaluatorVersion.EvaluatorID, 10), UserID: gptr.Of(userIDInContext), Scenario: entity.ScenarioEvaluator, @@ -326,14 +326,14 @@ func (e *evaluatorSpan) reportOutputParserSpan(ctx context.Context, replyItem *e e.Finish(ctx) } -func parseOutput(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, replyItem *entity.ReplyItem, disableTracing bool) (output *entity.EvaluatorOutputData, err error) { +func parseOutput(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, replyItem *entity.ReplyItem, exptSpaceID int64, disableTracing bool) (output *entity.EvaluatorOutputData, err error) { // 输出数据全空直接返回 var outputParserSpan *evaluatorSpan - if !disableTracing { - outputParserSpan, ctx = newEvaluatorSpan(ctx, "ParseOutput", "LoopEvaluation", strconv.FormatInt(evaluatorVersion.SpaceID, 10), true) - defer func() { - outputParserSpan.reportOutputParserSpan(ctx, replyItem, output, strconv.FormatInt(evaluatorVersion.SpaceID, 10), err) - }() + if !disableTracing { + outputParserSpan, ctx = newEvaluatorSpan(ctx, "ParseOutput", "LoopEvaluation", strconv.FormatInt(exptSpaceID, 10), true) + defer func() { + outputParserSpan.reportOutputParserSpan(ctx, replyItem, output, strconv.FormatInt(exptSpaceID, 10), err) + }() } output = &entity.EvaluatorOutputData{ EvaluatorResult: &entity.EvaluatorResult{}, @@ -481,7 +481,7 @@ func parseFunctionCallOutput(ctx context.Context, evaluatorVersion *entity.Promp return nil } -func renderTemplate(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, input *entity.EvaluatorInputData, disableTracing bool) error { +func renderTemplate(ctx context.Context, evaluatorVersion *entity.PromptEvaluatorVersion, input *entity.EvaluatorInputData, exptSpaceID int64, disableTracing bool) error { // 实现渲染模板的逻辑 variables := make([]*tracespec.PromptArgument, 0) for k, v := range input.InputFields { @@ -511,8 +511,8 @@ func renderTemplate(ctx context.Context, evaluatorVersion *entity.PromptEvaluato } var renderTemplateSpan *evaluatorSpan - if !disableTracing { - renderTemplateSpan, ctx = newEvaluatorSpan(ctx, "RenderTemplate", "prompt", strconv.FormatInt(evaluatorVersion.SpaceID, 10), true) + if !disableTracing { + renderTemplateSpan, ctx = newEvaluatorSpan(ctx, "RenderTemplate", "prompt", strconv.FormatInt(exptSpaceID, 10), true) renderTemplateSpan.SetInput(ctx, tracer.Convert2TraceString(tracer.ConvertPrompt2Ob(evaluatorVersion.MessageList, variables))) } for _, message := range evaluatorVersion.MessageList { From 64659d9d6e212358eeefa8c472953418387e5fcd Mon Sep 17 00:00:00 2001 From: shenjiayun Date: Thu, 6 Nov 2025 15:15:39 +0800 Subject: [PATCH 37/42] fix: fix the authBuiltinManagement R/W auth issue --- .../evaluation/application/evaluator_app.go | 36 ++++++++++--------- .../application/evaluator_app_test.go | 26 +++++++------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index c9bcc4738..f892a83cf 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -344,7 +344,7 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluator(ctx context.Context, request *eva } // 如果是builtin分支，补充管理空间校验 if request.GetBuiltin() { - if err := e.authBuiltinManagement(ctx, request.GetWorkspaceID(), spaceTypeBuiltin); err != nil { + if err := e.authBuiltinManagement(ctx, request.GetWorkspaceID(), spaceTypeBuiltin, true); err != nil { return nil, err } } @@ -583,7 +583,7 @@ func (e *EvaluatorHandlerImpl) GetEvaluatorVersion(ctx context.Context, request } // 鉴权 if request.GetBuiltin() { - err = e.authBuiltinManagement(ctx, evaluatorDO.SpaceID, spaceTypeBuiltin) + err = e.authBuiltinManagement(ctx, evaluatorDO.SpaceID, spaceTypeBuiltin, false) if err != nil { return nil, err } @@ -1473,7 +1473,7 @@ func (e *EvaluatorHandlerImpl) CreateEvaluatorTemplate(ctx context.Context, requ } // 校验评估器模板管理权限 - err = e.authBuiltinManagement(ctx, request.GetEvaluatorTemplate().GetWorkspaceID(), spaceTypeTemplate) + err = e.authBuiltinManagement(ctx, request.GetEvaluatorTemplate().GetWorkspaceID(), spaceTypeTemplate, true) if err != nil { return nil, err } @@ -1518,7 +1518,7 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluatorTemplate(ctx context.Context, requ } // 校验评估器模板管理权限 - err = e.authBuiltinManagement(ctx, request.GetEvaluatorTemplate().GetWorkspaceID(), spaceTypeTemplate) + err = e.authBuiltinManagement(ctx, request.GetEvaluatorTemplate().GetWorkspaceID(), spaceTypeTemplate, true) if err != nil { return nil, err } @@ -1574,7 +1574,7 @@ func (e *EvaluatorHandlerImpl) DeleteEvaluatorTemplate(ctx context.Context, requ } // 校验评估器模板管理权限 - err = e.authBuiltinManagement(ctx, templateDO.Template.SpaceID, spaceTypeTemplate) + err = e.authBuiltinManagement(ctx, templateDO.Template.SpaceID, spaceTypeTemplate, true) if err != nil { return nil, err } @@ -1637,7 +1637,7 @@ func (e *EvaluatorHandlerImpl) UpdateBuiltinEvaluatorTags(ctx context.Context, r return nil, errorx.NewByCode(errno.EvaluatorNotExistCode) } // 校验是否在builtin管理空间 - if err := e.authBuiltinManagement(ctx, request.GetWorkspaceID(), spaceTypeBuiltin); err != nil { + if err := e.authBuiltinManagement(ctx, request.GetWorkspaceID(), spaceTypeBuiltin, true); err != nil { return nil, err } @@ -1670,7 +1670,19 @@ const ( ) // validate 校验评估器管理权限 -func (e *EvaluatorHandlerImpl) authBuiltinManagement(ctx context.Context, workspaceID int64, spaceType SpaceType) error { +func (e *EvaluatorHandlerImpl) authBuiltinManagement(ctx context.Context, workspaceID int64, spaceType SpaceType, authWrite bool) error { + if authWrite { + // 鉴权 + err := e.auth.Authorization(ctx, &rpc.AuthorizationParam{ + ObjectID: strconv.FormatInt(workspaceID, 10), + SpaceID: workspaceID, + ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, // listLoopEvaluator为暂时复用的权限点 + }) + if err != nil { + return err + } + } + var allowedSpaceIDs []string switch spaceType { case spaceTypeBuiltin: @@ -1694,15 +1706,5 @@ func (e *EvaluatorHandlerImpl) authBuiltinManagement(ctx context.Context, worksp } } - // 鉴权 - err := e.auth.Authorization(ctx, &rpc.AuthorizationParam{ - ObjectID: strconv.FormatInt(workspaceID, 10), - SpaceID: workspaceID, - ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, - }) - if err != nil { - return err - } - return errorx.NewByCode(errno.CommonInvalidParamCode, errorx.WithExtraMsg("workspace_id not in allowed evaluator template spaces")) } diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index bdaae8465..8a147354d 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -2791,7 +2791,7 @@ func TestEvaluatorHandlerImpl_GetTemplateV2(t *testing.T) { { name: "success - normal request", req: &evaluatorservice.GetTemplateV2Request{ - EvaluatorTemplateID: templateID, + EvaluatorTemplateID: gptr.Of(templateID), }, mockSetup: func() { mockTemplateService.EXPECT(). @@ -2811,7 +2811,7 @@ func TestEvaluatorHandlerImpl_GetTemplateV2(t *testing.T) { { name: "success - template not found", req: &evaluatorservice.GetTemplateV2Request{ - EvaluatorTemplateID: templateID, + EvaluatorTemplateID: gptr.Of(templateID), }, mockSetup: func() { mockTemplateService.EXPECT(). @@ -2826,7 +2826,7 @@ func TestEvaluatorHandlerImpl_GetTemplateV2(t *testing.T) { { name: "error - service failure", req: &evaluatorservice.GetTemplateV2Request{ - EvaluatorTemplateID: templateID, + EvaluatorTemplateID: gptr.Of(templateID), }, mockSetup: func() { mockTemplateService.EXPECT(). @@ -3706,6 +3706,7 @@ func TestEvaluatorHandlerImpl_authBuiltinManagement(t *testing.T) { name string workspaceID int64 spaceType SpaceType + authWrite bool mockSetup func() wantErr bool wantErrCode int32 @@ -3714,6 +3715,7 @@ func TestEvaluatorHandlerImpl_authBuiltinManagement(t *testing.T) { name: "success - workspace in allowed list for builtin", workspaceID: 123, spaceType: spaceTypeBuiltin, + authWrite: false, mockSetup: func() { mockConfiger.EXPECT(). GetBuiltinEvaluatorSpaceConf(gomock.Any()). @@ -3725,6 +3727,7 @@ func TestEvaluatorHandlerImpl_authBuiltinManagement(t *testing.T) { name: "success - workspace in allowed list for template", workspaceID: 456, spaceType: spaceTypeTemplate, + authWrite: false, mockSetup: func() { mockConfiger.EXPECT(). GetEvaluatorTemplateSpaceConf(gomock.Any()). @@ -3736,6 +3739,7 @@ func TestEvaluatorHandlerImpl_authBuiltinManagement(t *testing.T) { name: "error - empty config for builtin", workspaceID: 123, spaceType: spaceTypeBuiltin, + authWrite: false, mockSetup: func() { mockConfiger.EXPECT(). GetBuiltinEvaluatorSpaceConf(gomock.Any()). @@ -3748,6 +3752,7 @@ func TestEvaluatorHandlerImpl_authBuiltinManagement(t *testing.T) { name: "error - empty config for template", workspaceID: 123, spaceType: spaceTypeTemplate, + authWrite: false, mockSetup: func() { mockConfiger.EXPECT(). GetEvaluatorTemplateSpaceConf(gomock.Any()). @@ -3760,14 +3765,14 @@ func TestEvaluatorHandlerImpl_authBuiltinManagement(t *testing.T) { name: "error - workspace not in allowed list", workspaceID: 789, spaceType: spaceTypeBuiltin, + authWrite: true, mockSetup: func() { - mockConfiger.EXPECT(). - GetBuiltinEvaluatorSpaceConf(gomock.Any()). - Return([]string{"123", "456"}) - mockAuth.EXPECT(). Authorization(gomock.Any(), gomock.Any()). Return(nil) + mockConfiger.EXPECT(). + GetBuiltinEvaluatorSpaceConf(gomock.Any()). + Return([]string{"123", "456"}) }, wantErr: true, wantErrCode: errno.CommonInvalidParamCode, @@ -3776,11 +3781,8 @@ func TestEvaluatorHandlerImpl_authBuiltinManagement(t *testing.T) { name: "error - auth failed", workspaceID: 789, spaceType: spaceTypeBuiltin, + authWrite: true, mockSetup: func() { - mockConfiger.EXPECT(). - GetBuiltinEvaluatorSpaceConf(gomock.Any()). - Return([]string{"123", "456"}) - mockAuth.EXPECT(). Authorization(gomock.Any(), gomock.Any()). Return(errorx.NewByCode(errno.CommonNoPermissionCode)) @@ -3794,7 +3796,7 @@ func TestEvaluatorHandlerImpl_authBuiltinManagement(t *testing.T) { t.Run(tt.name, func(t *testing.T) { tt.mockSetup() - err := app.authBuiltinManagement(context.Background(), tt.workspaceID, tt.spaceType) + err := app.authBuiltinManagement(context.Background(), tt.workspaceID, tt.spaceType, tt.authWrite) if tt.wantErr { assert.Error(t, err) From 569e06fd0047d1ce14b108a051e19e503267f560 Mon Sep 17 00:00:00 2001 From: Jiayun Shen Date: Mon, 10 Nov 2025 11:52:22 +0800 Subject: [PATCH 38/42] [feat][evaluation] add plain limiter factory (#297) * feat: add evaluator-level rate limit to RunEvaluator * feat: add evaluator-level rate limit to RunEvaluator * fix trace * feat: add evaluator-level rate limit to RunEvaluator * fix: fix the authBuiltinManagement R/W auth issue * feat: add plain limiter factory * feat: add more condition protection for plain limiter factory --------- Co-authored-by: tpfz --- backend/api/api.go | 3 + backend/api/handler/coze/loop/apis/wire.go | 4 +- .../api/handler/coze/loop/apis/wire_gen.go | 7 +-- backend/cmd/main.go | 56 ++++++++++--------- backend/infra/limiter/dist/dist.go | 6 ++ backend/infra/limiter/dist/plain_limiter.go | 42 ++++++++++++++ backend/infra/limiter/limiter.go | 10 ++++ backend/infra/limiter/mocks/rate_limiter.go | 39 ++++++------- .../limiter/mocks/rate_limiter_factory.go | 43 +++++++------- .../modules/evaluation/application/wire.go | 7 ++- .../evaluation/application/wire_gen.go | 20 ++++--- .../repo/mocks/plainratelimiter_mock.go | 56 +++++++++++++++++++ .../evaluation/domain/repo/ratelimiter.go | 4 ++ .../domain/service/evaluator_impl.go | 5 +- .../infra/repo/evaluator/ratelimiter_impl.go | 16 +++++- 15 files changed, 233 insertions(+), 85 deletions(-) create mode 100644 backend/infra/limiter/dist/plain_limiter.go create mode 100644 backend/modules/evaluation/domain/repo/mocks/plainratelimiter_mock.go diff --git a/backend/api/api.go b/backend/api/api.go index 3419c1a98..92b4f9910 100644 --- a/backend/api/api.go +++ b/backend/api/api.go @@ -11,6 +11,7 @@ import ( "github.com/cloudwego/hertz/pkg/app/server" "github.com/cloudwego/hertz/pkg/app/server/binding" "github.com/cloudwego/hertz/pkg/app/server/render" + "github.com/coze-dev/coze-loop/backend/modules/observability/domain/task/service/taskexe/processor" "github.com/coze-dev/coze-loop/backend/api/handler/coze/loop/apis" @@ -56,6 +57,7 @@ func Init( limiterFactory limiter.IRateLimiterFactory, ckDB ck.Provider, translater i18n.ITranslater, + plainLimiterFactory limiter.IPlainRateLimiterFactory, ) (*apis.APIHandler, error) { foundationHandler, err := apis.InitFoundationHandler(idgen, db, batchObjectStorage, configFactory) if err != nil { @@ -102,6 +104,7 @@ func Init( lofile.NewLocalFileService(foundationHandler.FileService), lotag.NewLocalTagService(dataHandler.TagService), objectStorage, + plainLimiterFactory, ) if err != nil { return nil, err diff --git a/backend/api/handler/coze/loop/apis/wire.go b/backend/api/handler/coze/loop/apis/wire.go index f05943b5b..3a79514ad 100644 --- a/backend/api/handler/coze/loop/apis/wire.go +++ b/backend/api/handler/coze/loop/apis/wire.go @@ -10,9 +10,10 @@ import ( "context" "github.com/cloudwego/kitex/pkg/endpoint" + "github.com/google/wire" + "github.com/coze-dev/coze-loop/backend/kitex_gen/coze/loop/evaluation/experimentservice" task_processor "github.com/coze-dev/coze-loop/backend/modules/observability/domain/task/service/taskexe/processor" - "github.com/google/wire" "github.com/coze-dev/coze-loop/backend/infra/ck" "github.com/coze-dev/coze-loop/backend/infra/db" @@ -169,6 +170,7 @@ func InitEvaluationHandler( fileClient fileservice.Client, tagClient tagservice.Client, objectStorage fileserver.ObjectStorage, + plainLimiterFactory limiter.IPlainRateLimiterFactory, ) (*EvaluationHandler, error) { wire.Build( evaluationSet, diff --git a/backend/api/handler/coze/loop/apis/wire_gen.go b/backend/api/handler/coze/loop/apis/wire_gen.go index f090ab564..f9f7acfab 100644 --- a/backend/api/handler/coze/loop/apis/wire_gen.go +++ b/backend/api/handler/coze/loop/apis/wire_gen.go @@ -8,7 +8,6 @@ package apis import ( "context" - "github.com/cloudwego/kitex/pkg/endpoint" "github.com/coze-dev/coze-loop/backend/infra/ck" "github.com/coze-dev/coze-loop/backend/infra/db" @@ -118,14 +117,14 @@ func InitLLMHandler(ctx context.Context, idgen2 idgen.IIDGenerator, db2 db.Provi return llmHandler, nil } -func InitEvaluationHandler(ctx context.Context, idgen2 idgen.IIDGenerator, db2 db.Provider, ckDb ck.Provider, cmdable redis.Cmdable, configFactory conf.IConfigLoaderFactory, mqFactory mq.IFactory, client datasetservice.Client, promptClient promptmanageservice.Client, pec promptexecuteservice.Client, authClient authservice.Client, meter metrics.Meter, auditClient audit.IAuditService, llmClient llmruntimeservice.Client, userClient userservice.Client, benefitSvc benefit.IBenefitService, limiterFactory limiter.IRateLimiterFactory, fileClient fileservice.Client, tagClient tagservice.Client, objectStorage fileserver.ObjectStorage) (*EvaluationHandler, error) { +func InitEvaluationHandler(ctx context.Context, idgen2 idgen.IIDGenerator, db2 db.Provider, ckDb ck.Provider, cmdable redis.Cmdable, configFactory conf.IConfigLoaderFactory, mqFactory mq.IFactory, client datasetservice.Client, promptClient promptmanageservice.Client, pec promptexecuteservice.Client, authClient authservice.Client, meter metrics.Meter, auditClient audit.IAuditService, llmClient llmruntimeservice.Client, userClient userservice.Client, benefitSvc benefit.IBenefitService, limiterFactory limiter.IRateLimiterFactory, fileClient fileservice.Client, tagClient tagservice.Client, objectStorage fileserver.ObjectStorage, plainLimiterFactory limiter.IPlainRateLimiterFactory) (*EvaluationHandler, error) { evaluationSetService := application4.InitEvaluationSetApplication(client, authClient, meter, userClient) - evaluatorService, err := application4.InitEvaluatorApplication(ctx, idgen2, authClient, db2, configFactory, mqFactory, llmClient, meter, userClient, auditClient, cmdable, benefitSvc, limiterFactory, fileClient) + evaluatorService, err := application4.InitEvaluatorApplication(ctx, idgen2, authClient, db2, configFactory, mqFactory, llmClient, meter, userClient, auditClient, cmdable, benefitSvc, limiterFactory, fileClient, plainLimiterFactory) if err != nil { return nil, err } evalTargetService := application4.InitEvalTargetApplication(ctx, idgen2, db2, promptClient, pec, authClient, cmdable, meter) - iExperimentApplication, err := application4.InitExperimentApplication(ctx, idgen2, db2, configFactory, mqFactory, cmdable, auditClient, meter, authClient, evaluationSetService, evaluatorService, evalTargetService, userClient, promptClient, pec, client, limiterFactory, llmClient, benefitSvc, ckDb, tagClient, objectStorage) + iExperimentApplication, err := application4.InitExperimentApplication(ctx, idgen2, db2, configFactory, mqFactory, cmdable, auditClient, meter, authClient, evaluationSetService, evaluatorService, evalTargetService, userClient, promptClient, pec, client, limiterFactory, llmClient, benefitSvc, ckDb, tagClient, objectStorage, plainLimiterFactory) if err != nil { return nil, err } diff --git a/backend/cmd/main.go b/backend/cmd/main.go index 4de5c066b..9b5b0369d 100644 --- a/backend/cmd/main.go +++ b/backend/cmd/main.go @@ -52,7 +52,7 @@ func main() { panic(err) } - handler, err := api.Init(ctx, c.idgen, c.db, c.redis, c.cfgFactory, c.mqFactory, c.objectStorage, c.batchObjectStorage, c.benefitSvc, c.auditClient, c.metric, c.limiterFactory, c.ckDb, c.translater) + handler, err := api.Init(ctx, c.idgen, c.db, c.redis, c.cfgFactory, c.mqFactory, c.objectStorage, c.batchObjectStorage, c.benefitSvc, c.auditClient, c.metric, c.limiterFactory, c.ckDb, c.translater, c.plainLimiterFactory) if err != nil { panic(err) } @@ -118,19 +118,20 @@ func getComponentConfig(configFactory conf.IConfigLoaderFactory) (*ComponentConf } type component struct { - idgen idgen.IIDGenerator - db db.Provider - redis redis.Cmdable - cfgFactory conf.IConfigLoaderFactory - mqFactory mq.IFactory - objectStorage fileserver.ObjectStorage - batchObjectStorage fileserver.BatchObjectStorage - benefitSvc benefit.IBenefitService - auditClient audit.IAuditService - metric metrics.Meter - limiterFactory limiter.IRateLimiterFactory - ckDb ck.Provider - translater i18n.ITranslater + idgen idgen.IIDGenerator + db db.Provider + redis redis.Cmdable + cfgFactory conf.IConfigLoaderFactory + mqFactory mq.IFactory + objectStorage fileserver.ObjectStorage + batchObjectStorage fileserver.BatchObjectStorage + benefitSvc benefit.IBenefitService + auditClient audit.IAuditService + metric metrics.Meter + limiterFactory limiter.IRateLimiterFactory + ckDb ck.Provider + translater i18n.ITranslater + plainLimiterFactory limiter.IPlainRateLimiterFactory } func initTracer(handler *apis.APIHandler) error { @@ -250,19 +251,20 @@ func newComponent(ctx context.Context) (*component, error) { } return &component{ - idgen: idgenerator, - db: db, - redis: cmdable, - cfgFactory: cfgFactory, - mqFactory: rocketmq.NewFactory(), - objectStorage: objectStorage, - batchObjectStorage: objectStorage, - benefitSvc: benefit.NewNoopBenefitService(), - auditClient: audit.NewNoopAuditService(), - metric: metrics.GetMeter(), - limiterFactory: dist.NewRateLimiterFactory(cmdable), - ckDb: ckDb, - translater: translater, + idgen: idgenerator, + db: db, + redis: cmdable, + cfgFactory: cfgFactory, + mqFactory: rocketmq.NewFactory(), + objectStorage: objectStorage, + batchObjectStorage: objectStorage, + benefitSvc: benefit.NewNoopBenefitService(), + auditClient: audit.NewNoopAuditService(), + metric: metrics.GetMeter(), + limiterFactory: dist.NewRateLimiterFactory(cmdable), + ckDb: ckDb, + translater: translater, + plainLimiterFactory: dist.NewPlainLimiterFactory(cmdable), }, nil } diff --git a/backend/infra/limiter/dist/dist.go b/backend/infra/limiter/dist/dist.go index 64b5f6837..cbe178f27 100644 --- a/backend/infra/limiter/dist/dist.go +++ b/backend/infra/limiter/dist/dist.go @@ -36,3 +36,9 @@ func WithExprCacheSize(size int) FactoryOpt { type factoryOpt struct { exprCacheSize int } + +func NewPlainLimiterFactory(cmdable redis.Cmdable) limiter.IPlainRateLimiterFactory { + return &plainLimiterFactory{ + cmdable: cmdable, + } +} diff --git a/backend/infra/limiter/dist/plain_limiter.go b/backend/infra/limiter/dist/plain_limiter.go new file mode 100644 index 000000000..1745e7695 --- /dev/null +++ b/backend/infra/limiter/dist/plain_limiter.go @@ -0,0 +1,42 @@ +package dist + +import ( + "fmt" + + "github.com/go-redis/redis_rate/v10" + + "github.com/coze-dev/coze-loop/backend/infra/limiter" + "github.com/coze-dev/coze-loop/backend/infra/redis" + "github.com/coze-dev/coze-loop/backend/pkg/logs" +) + +type plainLimiterFactory struct { + cmdable redis.Cmdable +} + +func (f *plainLimiterFactory) NewPlainRateLimiter(opts ...limiter.FactoryOptionFn) limiter.IPlainRateLimiter { + opt := &limiter.FactoryOption{} + for _, fn := range opts { + fn(opt) + } + + rawRedis, ok := redis.Unwrap(f.cmdable) + if !ok { + panic(fmt.Errorf("redis cmdable must be unwrappable")) + } + + rl := &rateLimiter{ + rules: make([]*rule, 0, len(opt.Rules)), + limiter: redis_rate.NewLimiter(rawRedis), + } + + for _, r := range opt.Rules { + if rr, err := rl.newRule(r); err != nil { + logs.Error("rate limiter set rule failed, rule: %v, err: %v", r, err) + } else { + rl.addRule(rr) + } + } + + return rl +} diff --git a/backend/infra/limiter/limiter.go b/backend/infra/limiter/limiter.go index 5f5c37c9a..3f64849f5 100644 --- a/backend/infra/limiter/limiter.go +++ b/backend/infra/limiter/limiter.go @@ -79,3 +79,13 @@ type Limit struct { Burst int `json:"burst" yaml:"burst" mapstructure:"burst"` Period time.Duration `json:"period" yaml:"period" mapstructure:"period"` } + +//go:generate mockgen -destination=mocks/rate_limiter_factory.go -package=mocks . IPlainRateLimiterFactory +type IPlainRateLimiterFactory interface { + NewPlainRateLimiter(opts ...FactoryOptionFn) IPlainRateLimiter +} + +//go:generate mockgen -destination=mocks/rate_limiter.go -package=mocks . IPlainRateLimiter +type IPlainRateLimiter interface { + AllowN(ctx context.Context, key string, n int, opts ...LimitOptionFn) (*Result, error) +} diff --git a/backend/infra/limiter/mocks/rate_limiter.go b/backend/infra/limiter/mocks/rate_limiter.go index a36427311..4902242a5 100644 --- a/backend/infra/limiter/mocks/rate_limiter.go +++ b/backend/infra/limiter/mocks/rate_limiter.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/coze-dev/coze-loop/backend/infra/limiter (interfaces: IRateLimiter) +// Source: github.com/coze-dev/coze-loop/backend/infra/limiter (interfaces: IPlainRateLimiter) // // Generated by this command: // -// mockgen -destination=mocks/rate_limiter.go -package=mocks . IRateLimiter +// mockgen -destination=mocks/rate_limiter.go -package=mocks . IPlainRateLimiter // // Package mocks is a generated GoMock package. @@ -17,34 +17,35 @@ import ( gomock "go.uber.org/mock/gomock" ) -// MockIRateLimiter is a mock of IRateLimiter interface. -type MockIRateLimiter struct { +// MockIPlainRateLimiter is a mock of IPlainRateLimiter interface. +type MockIPlainRateLimiter struct { ctrl *gomock.Controller - recorder *MockIRateLimiterMockRecorder + recorder *MockIPlainRateLimiterMockRecorder + isgomock struct{} } -// MockIRateLimiterMockRecorder is the mock recorder for MockIRateLimiter. -type MockIRateLimiterMockRecorder struct { - mock *MockIRateLimiter +// MockIPlainRateLimiterMockRecorder is the mock recorder for MockIPlainRateLimiter. +type MockIPlainRateLimiterMockRecorder struct { + mock *MockIPlainRateLimiter } -// NewMockIRateLimiter creates a new mock instance. -func NewMockIRateLimiter(ctrl *gomock.Controller) *MockIRateLimiter { - mock := &MockIRateLimiter{ctrl: ctrl} - mock.recorder = &MockIRateLimiterMockRecorder{mock} +// NewMockIPlainRateLimiter creates a new mock instance. +func NewMockIPlainRateLimiter(ctrl *gomock.Controller) *MockIPlainRateLimiter { + mock := &MockIPlainRateLimiter{ctrl: ctrl} + mock.recorder = &MockIPlainRateLimiterMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockIRateLimiter) EXPECT() *MockIRateLimiterMockRecorder { +func (m *MockIPlainRateLimiter) EXPECT() *MockIPlainRateLimiterMockRecorder { return m.recorder } // AllowN mocks base method. -func (m *MockIRateLimiter) AllowN(arg0 context.Context, arg1 string, arg2 int, arg3 ...limiter.LimitOptionFn) (*limiter.Result, error) { +func (m *MockIPlainRateLimiter) AllowN(ctx context.Context, key string, n int, opts ...limiter.LimitOptionFn) (*limiter.Result, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, key, n} + for _, a := range opts { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "AllowN", varargs...) @@ -54,8 +55,8 @@ func (m *MockIRateLimiter) AllowN(arg0 context.Context, arg1 string, arg2 int, a } // AllowN indicates an expected call of AllowN. -func (mr *MockIRateLimiterMockRecorder) AllowN(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockIPlainRateLimiterMockRecorder) AllowN(ctx, key, n any, opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllowN", reflect.TypeOf((*MockIRateLimiter)(nil).AllowN), varargs...) + varargs := append([]any{ctx, key, n}, opts...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllowN", reflect.TypeOf((*MockIPlainRateLimiter)(nil).AllowN), varargs...) } diff --git a/backend/infra/limiter/mocks/rate_limiter_factory.go b/backend/infra/limiter/mocks/rate_limiter_factory.go index 3a6c0154a..ed6dd52a3 100644 --- a/backend/infra/limiter/mocks/rate_limiter_factory.go +++ b/backend/infra/limiter/mocks/rate_limiter_factory.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/coze-dev/coze-loop/backend/infra/limiter (interfaces: IRateLimiterFactory) +// Source: github.com/coze-dev/coze-loop/backend/infra/limiter (interfaces: IPlainRateLimiterFactory) // // Generated by this command: // -// mockgen -destination=mocks/rate_limiter_factory.go -package=mocks . IRateLimiterFactory +// mockgen -destination=mocks/rate_limiter_factory.go -package=mocks . IPlainRateLimiterFactory // // Package mocks is a generated GoMock package. @@ -16,43 +16,44 @@ import ( gomock "go.uber.org/mock/gomock" ) -// MockIRateLimiterFactory is a mock of IRateLimiterFactory interface. -type MockIRateLimiterFactory struct { +// MockIPlainRateLimiterFactory is a mock of IPlainRateLimiterFactory interface. +type MockIPlainRateLimiterFactory struct { ctrl *gomock.Controller - recorder *MockIRateLimiterFactoryMockRecorder + recorder *MockIPlainRateLimiterFactoryMockRecorder + isgomock struct{} } -// MockIRateLimiterFactoryMockRecorder is the mock recorder for MockIRateLimiterFactory. -type MockIRateLimiterFactoryMockRecorder struct { - mock *MockIRateLimiterFactory +// MockIPlainRateLimiterFactoryMockRecorder is the mock recorder for MockIPlainRateLimiterFactory. +type MockIPlainRateLimiterFactoryMockRecorder struct { + mock *MockIPlainRateLimiterFactory } -// NewMockIRateLimiterFactory creates a new mock instance. -func NewMockIRateLimiterFactory(ctrl *gomock.Controller) *MockIRateLimiterFactory { - mock := &MockIRateLimiterFactory{ctrl: ctrl} - mock.recorder = &MockIRateLimiterFactoryMockRecorder{mock} +// NewMockIPlainRateLimiterFactory creates a new mock instance. +func NewMockIPlainRateLimiterFactory(ctrl *gomock.Controller) *MockIPlainRateLimiterFactory { + mock := &MockIPlainRateLimiterFactory{ctrl: ctrl} + mock.recorder = &MockIPlainRateLimiterFactoryMockRecorder{mock} return mock } // EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockIRateLimiterFactory) EXPECT() *MockIRateLimiterFactoryMockRecorder { +func (m *MockIPlainRateLimiterFactory) EXPECT() *MockIPlainRateLimiterFactoryMockRecorder { return m.recorder } -// NewRateLimiter mocks base method. -func (m *MockIRateLimiterFactory) NewRateLimiter(arg0 ...limiter.FactoryOptionFn) limiter.IRateLimiter { +// NewPlainRateLimiter mocks base method. +func (m *MockIPlainRateLimiterFactory) NewPlainRateLimiter(opts ...limiter.FactoryOptionFn) limiter.IPlainRateLimiter { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range opts { varargs = append(varargs, a) } - ret := m.ctrl.Call(m, "NewRateLimiter", varargs...) - ret0, _ := ret[0].(limiter.IRateLimiter) + ret := m.ctrl.Call(m, "NewPlainRateLimiter", varargs...) + ret0, _ := ret[0].(limiter.IPlainRateLimiter) return ret0 } -// NewRateLimiter indicates an expected call of NewRateLimiter. -func (mr *MockIRateLimiterFactoryMockRecorder) NewRateLimiter(arg0 ...any) *gomock.Call { +// NewPlainRateLimiter indicates an expected call of NewPlainRateLimiter. +func (mr *MockIPlainRateLimiterFactoryMockRecorder) NewPlainRateLimiter(opts ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewRateLimiter", reflect.TypeOf((*MockIRateLimiterFactory)(nil).NewRateLimiter), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewPlainRateLimiter", reflect.TypeOf((*MockIPlainRateLimiterFactory)(nil).NewPlainRateLimiter), opts...) } diff --git a/backend/modules/evaluation/application/wire.go b/backend/modules/evaluation/application/wire.go index 678315090..b2bfb22b9 100644 --- a/backend/modules/evaluation/application/wire.go +++ b/backend/modules/evaluation/application/wire.go @@ -9,10 +9,11 @@ package application import ( "context" - "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/rpc/notify" "github.com/google/wire" "github.com/sirupsen/logrus" + "github.com/coze-dev/coze-loop/backend/modules/evaluation/infra/rpc/notify" + "github.com/coze-dev/coze-loop/backend/infra/ck" "github.com/coze-dev/coze-loop/backend/infra/db" "github.com/coze-dev/coze-loop/backend/infra/external/audit" @@ -159,6 +160,7 @@ var ( evalconf.NewEvaluatorConfiger, evaluatormtr.NewEvaluatorMetrics, rmqproducer.NewEvaluatorEventPublisher, + evaluatorrepo.NewPlainRateLimiterImpl, ) evaluatorSet = wire.NewSet( @@ -223,7 +225,6 @@ var ( experimentSet, evalmtr.NewEvaluationOApiMetrics, domainservice.NewEvaluationSetSchemaServiceImpl, - data.NewDatasetRPCAdapter, ) ) @@ -260,6 +261,7 @@ func InitExperimentApplication( ckDb ck.Provider, tagClient tagservice.Client, objectStorage fileserver.ObjectStorage, + plainLimiterFactory limiter.IPlainRateLimiterFactory, ) (IExperimentApplication, error) { wire.Build( experimentSet, @@ -282,6 +284,7 @@ func InitEvaluatorApplication( benefitSvc benefit.IBenefitService, limiterFactory limiter.IRateLimiterFactory, fileClient fileservice.Client, + plainLimiterFactory limiter.IPlainRateLimiterFactory, ) (evaluation.EvaluatorService, error) { wire.Build( evaluatorSet, diff --git a/backend/modules/evaluation/application/wire_gen.go b/backend/modules/evaluation/application/wire_gen.go index d24a8fc68..f4ce17a7d 100644 --- a/backend/modules/evaluation/application/wire_gen.go +++ b/backend/modules/evaluation/application/wire_gen.go @@ -67,7 +67,7 @@ import ( // Injectors from wire.go: -func InitExperimentApplication(ctx context.Context, idgen2 idgen.IIDGenerator, db2 db.Provider, configFactory conf.IConfigLoaderFactory, rmqFactory mq.IFactory, cmdable redis.Cmdable, auditClient audit.IAuditService, meter metrics.Meter, authClient authservice.Client, evalSetService evaluation.EvaluationSetService, evaluatorService evaluation.EvaluatorService, targetService evaluation.EvalTargetService, uc userservice.Client, pms promptmanageservice.Client, pes promptexecuteservice.Client, sds datasetservice.Client, limiterFactory limiter.IRateLimiterFactory, llmcli llmruntimeservice.Client, benefitSvc benefit.IBenefitService, ckDb ck.Provider, tagClient tagservice.Client, objectStorage fileserver.ObjectStorage) (IExperimentApplication, error) { +func InitExperimentApplication(ctx context.Context, idgen2 idgen.IIDGenerator, db2 db.Provider, configFactory conf.IConfigLoaderFactory, rmqFactory mq.IFactory, cmdable redis.Cmdable, auditClient audit.IAuditService, meter metrics.Meter, authClient authservice.Client, evalSetService evaluation.EvaluationSetService, evaluatorService evaluation.EvaluatorService, targetService evaluation.EvalTargetService, uc userservice.Client, pms promptmanageservice.Client, pes promptexecuteservice.Client, sds datasetservice.Client, limiterFactory limiter.IRateLimiterFactory, llmcli llmruntimeservice.Client, benefitSvc benefit.IBenefitService, ckDb ck.Provider, tagClient tagservice.Client, objectStorage fileserver.ObjectStorage, plainLimiterFactory limiter.IPlainRateLimiterFactory) (IExperimentApplication, error) { exptTurnResultDAO := mysql.NewExptTurnResultDAO(db2) iExptTurnEvaluatorResultRefDAO := mysql.NewExptTurnEvaluatorResultRefDAO(db2) iExptTurnResultRepo := experiment.NewExptTurnResultRepo(idgen2, exptTurnResultDAO, iExptTurnEvaluatorResultRefDAO) @@ -97,7 +97,8 @@ func InitExperimentApplication(ctx context.Context, idgen2 idgen.IIDGenerator, d iRuntimeManager := NewRuntimeManagerFromFactory(iRuntimeFactory, logger) codeBuilderFactory := service.NewCodeBuilderFactory() v := NewEvaluatorSourceServices(illmProvider, evaluatorExecMetrics, iConfiger, iRuntimeManager, codeBuilderFactory) - serviceEvaluatorService := service.NewEvaluatorServiceImpl(idgen2, rateLimiter, rmqFactory, iEvaluatorRepo, iEvaluatorRecordRepo, idempotentService, iConfiger, v) + iPlainRateLimiter := evaluator.NewPlainRateLimiterImpl(plainLimiterFactory) + serviceEvaluatorService := service.NewEvaluatorServiceImpl(idgen2, rateLimiter, rmqFactory, iEvaluatorRepo, iEvaluatorRecordRepo, idempotentService, iConfiger, v, iPlainRateLimiter) exptEventPublisher, err := producer.NewExptEventPublisher(ctx, configFactory, rmqFactory) if err != nil { return nil, err @@ -166,7 +167,7 @@ func InitExperimentApplication(ctx context.Context, idgen2 idgen.IIDGenerator, d return iExperimentApplication, nil } -func InitEvaluatorApplication(ctx context.Context, idgen2 idgen.IIDGenerator, authClient authservice.Client, db2 db.Provider, configFactory conf.IConfigLoaderFactory, rmqFactory mq.IFactory, llmClient llmruntimeservice.Client, meter metrics.Meter, userClient userservice.Client, auditClient audit.IAuditService, cmdable redis.Cmdable, benefitSvc benefit.IBenefitService, limiterFactory limiter.IRateLimiterFactory, fileClient fileservice.Client) (evaluation.EvaluatorService, error) { +func InitEvaluatorApplication(ctx context.Context, idgen2 idgen.IIDGenerator, authClient authservice.Client, db2 db.Provider, configFactory conf.IConfigLoaderFactory, rmqFactory mq.IFactory, llmClient llmruntimeservice.Client, meter metrics.Meter, userClient userservice.Client, auditClient audit.IAuditService, cmdable redis.Cmdable, benefitSvc benefit.IBenefitService, limiterFactory limiter.IRateLimiterFactory, fileClient fileservice.Client, plainLimiterFactory limiter.IPlainRateLimiterFactory) (evaluation.EvaluatorService, error) { iConfiger := conf2.NewEvaluatorConfiger(configFactory) iAuthProvider := foundation.NewAuthRPCProvider(authClient) rateLimiter := evaluator.NewRateLimiterImpl(ctx, limiterFactory, iConfiger) @@ -188,7 +189,8 @@ func InitEvaluatorApplication(ctx context.Context, idgen2 idgen.IIDGenerator, au iRuntimeManager := NewRuntimeManagerFromFactory(iRuntimeFactory, logger) codeBuilderFactory := service.NewCodeBuilderFactory() v := NewEvaluatorSourceServices(illmProvider, evaluatorExecMetrics, iConfiger, iRuntimeManager, codeBuilderFactory) - evaluatorService := service.NewEvaluatorServiceImpl(idgen2, rateLimiter, rmqFactory, iEvaluatorRepo, iEvaluatorRecordRepo, idempotentService, iConfiger, v) + iPlainRateLimiter := evaluator.NewPlainRateLimiterImpl(plainLimiterFactory) + evaluatorService := service.NewEvaluatorServiceImpl(idgen2, rateLimiter, rmqFactory, iEvaluatorRepo, iEvaluatorRecordRepo, idempotentService, iConfiger, v, iPlainRateLimiter) exptEventPublisher, err := producer.NewExptEventPublisher(ctx, configFactory, rmqFactory) if err != nil { return nil, err @@ -241,7 +243,7 @@ func InitEvalTargetApplication(ctx context.Context, idgen2 idgen.IIDGenerator, d return evalTargetService } -func InitEvalOpenAPIApplication(ctx context.Context, configFactory conf.IConfigLoaderFactory, rmqFactory mq.IFactory, cmdable redis.Cmdable, idgen2 idgen.IIDGenerator, db2 db.Provider, client promptmanageservice.Client, executeClient promptexecuteservice.Client, authClient authservice.Client, meter metrics.Meter, dataClient datasetservice.Client, userClient userservice.Client, llmClient llmruntimeservice.Client, tagClient tagservice.Client, limiterFactory limiter.IRateLimiterFactory, objectStorage fileserver.ObjectStorage, auditClient audit.IAuditService, benefitService benefit.IBenefitService, ckProvider ck.Provider) (IEvalOpenAPIApplication, error) { +func InitEvalOpenAPIApplication(ctx context.Context, configFactory conf.IConfigLoaderFactory, rmqFactory mq.IFactory, cmdable redis.Cmdable, idgen2 idgen.IIDGenerator, db2 db.Provider, client promptmanageservice.Client, executeClient promptexecuteservice.Client, authClient authservice.Client, meter metrics.Meter, dataClient datasetservice.Client, userClient userservice.Client, llmClient llmruntimeservice.Client, tagClient tagservice.Client, limiterFactory limiter.IRateLimiterFactory, objectStorage fileserver.ObjectStorage, auditClient audit.IAuditService, benefitService benefit.IBenefitService, ckProvider ck.Provider) (evaluation.EvalOpenAPIService, error) { iEvalAsyncDAO := dao.NewEvalAsyncDAO(cmdable) iEvalAsyncRepo := experiment.NewEvalAsyncRepo(iEvalAsyncDAO) exptEventPublisher, err := producer.NewExptEventPublisher(ctx, configFactory, rmqFactory) @@ -266,8 +268,8 @@ func InitEvalOpenAPIApplication(ctx context.Context, configFactory conf.IConfigL openAPIEvaluationMetrics := openapi.NewEvaluationOApiMetrics(meter) iUserProvider := foundation.NewUserRPCProvider(userClient) userInfoService := userinfo.NewUserInfoServiceImpl(iUserProvider) - v2 := NewEvalOpenAPIApplication(iEvalAsyncRepo, exptEventPublisher, iEvalTargetService, iAuthProvider, iEvaluationSetService, evaluationSetVersionService, evaluationSetItemService, evaluationSetSchemaService, openAPIEvaluationMetrics, userInfoService) - return v2, nil + evalOpenAPIService := NewEvalOpenAPIApplication(iEvalAsyncRepo, exptEventPublisher, iEvalTargetService, iAuthProvider, iEvaluationSetService, evaluationSetVersionService, evaluationSetItemService, evaluationSetSchemaService, openAPIEvaluationMetrics, userInfoService) + return evalOpenAPIService, nil } // wire.go: @@ -287,7 +289,7 @@ var ( evaluatorDomainService = wire.NewSet(service.NewEvaluatorServiceImpl, service.NewEvaluatorRecordServiceImpl, service.NewEvaluatorTemplateService, NewEvaluatorSourceServices, llm.NewLLMRPCProvider, NewRuntimeFactory, NewRuntimeManagerFromFactory, NewSandboxConfig, - NewLogger, service.NewCodeBuilderFactory, evaluator.NewEvaluatorRepo, evaluator.NewEvaluatorRecordRepo, evaluator.NewEvaluatorTemplateRepo, mysql2.NewEvaluatorDAO, mysql2.NewEvaluatorVersionDAO, mysql2.NewEvaluatorRecordDAO, mysql2.NewEvaluatorTemplateDAO, mysql2.NewEvaluatorTagDAO, evaluator.NewRateLimiterImpl, conf2.NewEvaluatorConfiger, evaluator2.NewEvaluatorMetrics, producer.NewEvaluatorEventPublisher, + NewLogger, service.NewCodeBuilderFactory, evaluator.NewEvaluatorRepo, evaluator.NewEvaluatorRecordRepo, evaluator.NewEvaluatorTemplateRepo, mysql2.NewEvaluatorDAO, mysql2.NewEvaluatorVersionDAO, mysql2.NewEvaluatorRecordDAO, mysql2.NewEvaluatorTemplateDAO, mysql2.NewEvaluatorTagDAO, evaluator.NewRateLimiterImpl, conf2.NewEvaluatorConfiger, evaluator2.NewEvaluatorMetrics, producer.NewEvaluatorEventPublisher, evaluator.NewPlainRateLimiterImpl, ) evaluatorSet = wire.NewSet( @@ -314,7 +316,7 @@ var ( evalOpenAPISet = wire.NewSet( NewEvalOpenAPIApplication, - targetDomainService, metrics3.NewEvalTargetMetrics, flagSet, producer.NewExptEventPublisher, evalAsyncRepoSet, service.NewEvaluationSetServiceImpl, service.NewEvaluationSetVersionServiceImpl, service.NewEvaluationSetItemServiceImpl, service.NewEvaluationSetSchemaServiceImpl, data.NewDatasetRPCAdapter, openapi.NewEvaluationOApiMetrics, foundation.NewAuthRPCProvider, foundation.NewUserRPCProvider, userinfo.NewUserInfoServiceImpl, + experimentSet, openapi.NewEvaluationOApiMetrics, service.NewEvaluationSetSchemaServiceImpl, ) ) diff --git a/backend/modules/evaluation/domain/repo/mocks/plainratelimiter_mock.go b/backend/modules/evaluation/domain/repo/mocks/plainratelimiter_mock.go new file mode 100644 index 000000000..cd1631f4b --- /dev/null +++ b/backend/modules/evaluation/domain/repo/mocks/plainratelimiter_mock.go @@ -0,0 +1,56 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/repo (interfaces: IPlainRateLimiter) +// +// Generated by this command: +// +// mockgen -destination mocks/plainratelimiter_mock.go -package mocks . IPlainRateLimiter +// + +// Package mocks is a generated GoMock package. +package mocks + +import ( + context "context" + reflect "reflect" + + entity "github.com/coze-dev/coze-loop/backend/modules/evaluation/domain/entity" + gomock "go.uber.org/mock/gomock" +) + +// MockIPlainRateLimiter is a mock of IPlainRateLimiter interface. +type MockIPlainRateLimiter struct { + ctrl *gomock.Controller + recorder *MockIPlainRateLimiterMockRecorder + isgomock struct{} +} + +// MockIPlainRateLimiterMockRecorder is the mock recorder for MockIPlainRateLimiter. +type MockIPlainRateLimiterMockRecorder struct { + mock *MockIPlainRateLimiter +} + +// NewMockIPlainRateLimiter creates a new mock instance. +func NewMockIPlainRateLimiter(ctrl *gomock.Controller) *MockIPlainRateLimiter { + mock := &MockIPlainRateLimiter{ctrl: ctrl} + mock.recorder = &MockIPlainRateLimiterMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockIPlainRateLimiter) EXPECT() *MockIPlainRateLimiterMockRecorder { + return m.recorder +} + +// AllowInvokeWithKeyLimit mocks base method. +func (m *MockIPlainRateLimiter) AllowInvokeWithKeyLimit(ctx context.Context, key string, limit *entity.RateLimit) bool { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "AllowInvokeWithKeyLimit", ctx, key, limit) + ret0, _ := ret[0].(bool) + return ret0 +} + +// AllowInvokeWithKeyLimit indicates an expected call of AllowInvokeWithKeyLimit. +func (mr *MockIPlainRateLimiterMockRecorder) AllowInvokeWithKeyLimit(ctx, key, limit any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllowInvokeWithKeyLimit", reflect.TypeOf((*MockIPlainRateLimiter)(nil).AllowInvokeWithKeyLimit), ctx, key, limit) +} diff --git a/backend/modules/evaluation/domain/repo/ratelimiter.go b/backend/modules/evaluation/domain/repo/ratelimiter.go index 760e5b8f8..1bcd08381 100644 --- a/backend/modules/evaluation/domain/repo/ratelimiter.go +++ b/backend/modules/evaluation/domain/repo/ratelimiter.go @@ -12,5 +12,9 @@ import ( //go:generate mockgen -destination mocks/ratelimiter_mock.go -package mocks . RateLimiter type RateLimiter interface { AllowInvoke(ctx context.Context, spaceID int64) bool +} + +//go:generate mockgen -destination mocks/plainratelimiter_mock.go -package mocks . IPlainRateLimiter +type IPlainRateLimiter interface { AllowInvokeWithKeyLimit(ctx context.Context, key string, limit *commonentity.RateLimit) bool } diff --git a/backend/modules/evaluation/domain/service/evaluator_impl.go b/backend/modules/evaluation/domain/service/evaluator_impl.go index b50c1b5f3..9603db583 100644 --- a/backend/modules/evaluation/domain/service/evaluator_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_impl.go @@ -40,6 +40,7 @@ func NewEvaluatorServiceImpl( idem idem.IdempotentService, configer conf.IConfiger, evaluatorSourceServices map[entity.EvaluatorType]EvaluatorSourceService, + plainRateLimiter repo.IPlainRateLimiter, ) EvaluatorService { onceEvaluatorService.Do(func() { singletonEvaluatorService = &EvaluatorServiceImpl{ @@ -51,6 +52,7 @@ func NewEvaluatorServiceImpl( idem: idem, configer: configer, evaluatorSourceServices: evaluatorSourceServices, + plainRateLimiter: plainRateLimiter, } }) return singletonEvaluatorService @@ -66,6 +68,7 @@ type EvaluatorServiceImpl struct { idem idem.IdempotentService configer conf.IConfiger evaluatorSourceServices map[entity.EvaluatorType]EvaluatorSourceService + plainRateLimiter repo.IPlainRateLimiter } // ListEvaluator 按查询条件查询 evaluator_version @@ -597,7 +600,7 @@ func (e *EvaluatorServiceImpl) RunEvaluator(ctx context.Context, request *entity if allow := e.limiter.AllowInvoke(ctx, request.SpaceID); !allow { return nil, errorx.NewByCode(errno.EvaluatorQPSLimitCode, errorx.WithExtraMsg("evaluator throttled due to space-level rate limit")) } - if allow := e.limiter.AllowInvokeWithKeyLimit(ctx, fmt.Sprintf("run_evaluator:%v", evaluatorDO.ID), evaluatorDO.GetRateLimit()); !allow { + if allow := e.plainRateLimiter.AllowInvokeWithKeyLimit(ctx, fmt.Sprintf("run_evaluator:%v", evaluatorDO.ID), evaluatorDO.GetRateLimit()); !allow { return nil, errorx.NewByCode(errno.EvaluatorQPSLimitCode, errorx.WithExtraMsg("evaluator throttled due to evaluator-level rate limit")) } evaluatorSourceService, ok := e.evaluatorSourceServices[evaluatorDO.EvaluatorType] diff --git a/backend/modules/evaluation/infra/repo/evaluator/ratelimiter_impl.go b/backend/modules/evaluation/infra/repo/evaluator/ratelimiter_impl.go index d8d29cb4a..49d77a38f 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/ratelimiter_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/ratelimiter_impl.go @@ -43,7 +43,17 @@ func (s *RateLimiterImpl) AllowInvoke(ctx context.Context, spaceID int64) bool { return false } -func (s *RateLimiterImpl) AllowInvokeWithKeyLimit(ctx context.Context, key string, limit *commonentity.RateLimit) bool { +type PlainRateLimiterImpl struct { + limiter limiter.IPlainRateLimiter +} + +func NewPlainRateLimiterImpl(limiterFactory limiter.IPlainRateLimiterFactory) repo.IPlainRateLimiter { + return &PlainRateLimiterImpl{ + limiter: limiterFactory.NewPlainRateLimiter(), + } +} + +func (s *PlainRateLimiterImpl) AllowInvokeWithKeyLimit(ctx context.Context, key string, limit *commonentity.RateLimit) bool { if len(key) == 0 { logs.CtxError(ctx, "[AllowInvokeWithKeyLimit] key is empty") return false @@ -52,6 +62,10 @@ func (s *RateLimiterImpl) AllowInvokeWithKeyLimit(ctx context.Context, key strin logs.CtxInfo(ctx, "[AllowInvokeWithKeyLimit] limit is not set, skip invoke limit") return true } + if limit.Period == nil || limit.Rate == nil { + logs.CtxInfo(ctx, "[AllowInvokeWithKeyLimit] essential period or rate is not set, skip invoke limit") + return true + } res, err := s.limiter.AllowN(ctx, key, 1, limiter.WithLimit(&limiter.Limit{ Rate: int(gptr.Indirect(limit.Rate)), Burst: int(gptr.Indirect(limit.Burst)), From 24a82495cfee87dd341ddb96a1a45882d0a5e120 Mon Sep 17 00:00:00 2001 From: shenjiayun Date: Mon, 10 Nov 2025 19:25:33 +0800 Subject: [PATCH 39/42] fix: storage provider in image convert should be nil instead of 0 when unset --- .../application/convertor/common/common.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/modules/evaluation/application/convertor/common/common.go b/backend/modules/evaluation/application/convertor/common/common.go index 8077bdc99..3f8f47362 100644 --- a/backend/modules/evaluation/application/convertor/common/common.go +++ b/backend/modules/evaluation/application/convertor/common/common.go @@ -33,12 +33,16 @@ func ConvertImageDTO2DO(img *commondto.Image) *commonentity.Image { if img == nil { return nil } + var storageProvider *commonentity.StorageProvider = nil + if img.StorageProvider != nil { + storageProvider = gptr.Of(commonentity.StorageProvider(*img.StorageProvider)) + } return &commonentity.Image{ Name: img.Name, URL: img.URL, URI: img.URI, ThumbURL: img.ThumbURL, - StorageProvider: gptr.Of(commonentity.StorageProvider(gptr.Indirect(img.StorageProvider))), + StorageProvider: storageProvider, } } @@ -47,12 +51,16 @@ func ConvertImageDO2DTO(img *commonentity.Image) *commondto.Image { if img == nil { return nil } + var storageProvider *dataset.StorageProvider = nil + if img.StorageProvider != nil { + storageProvider = gptr.Of(dataset.StorageProvider(*img.StorageProvider)) + } return &commondto.Image{ Name: img.Name, URL: img.URL, URI: img.URI, ThumbURL: img.ThumbURL, - StorageProvider: gptr.Of(dataset.StorageProvider(gptr.Indirect(img.StorageProvider))), + StorageProvider: storageProvider, } } From 3639f4c6d64df29bef9801bc4ab2461b44985088 Mon Sep 17 00:00:00 2001 From: shenjiayun Date: Mon, 10 Nov 2025 21:54:06 +0800 Subject: [PATCH 40/42] fix: add missing ReceiveChatHistory in ConvertEvaluatorVersionPO2DO --- .../evaluator/mysql/convertor/evaluator.go | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go index ef0112d17..70ad75456 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator.go @@ -26,7 +26,7 @@ func ConvertEvaluatorDO2PO(do *evaluatordo.Evaluator) *model.Evaluator { if do.Builtin { builtinVal = 1 } - po := &model.Evaluator{ + po := &model.Evaluator{ ID: do.ID, SpaceID: do.SpaceID, Name: ptr.Of(do.Name), @@ -38,12 +38,12 @@ func ConvertEvaluatorDO2PO(do *evaluatordo.Evaluator) *model.Evaluator { Builtin: builtinVal, BoxType: int32(do.BoxType), } - if do.EvaluatorInfo != nil { - b, err := json.Marshal(do.EvaluatorInfo) - if err == nil { - po.EvaluatorInfo = ptr.Of(b) - } - } + if do.EvaluatorInfo != nil { + b, err := json.Marshal(do.EvaluatorInfo) + if err == nil { + po.EvaluatorInfo = ptr.Of(b) + } + } if do.BaseInfo != nil { if do.BaseInfo.CreatedBy != nil { po.CreatedBy = gptr.Indirect(do.BaseInfo.CreatedBy.UserID) // ignore_security_alert SQL_INJECTION @@ -66,7 +66,7 @@ func ConvertEvaluatorPO2DO(po *model.Evaluator) *evaluatordo.Evaluator { if po == nil { return nil } - do := &evaluatordo.Evaluator{ + do := &evaluatordo.Evaluator{ ID: po.ID, SpaceID: po.SpaceID, Name: gptr.Indirect(po.Name), @@ -78,12 +78,12 @@ func ConvertEvaluatorPO2DO(po *model.Evaluator) *evaluatordo.Evaluator { Builtin: po.Builtin == 1, BoxType: evaluatordo.EvaluatorBoxType(po.BoxType), } - if po.EvaluatorInfo != nil { - var info evaluatordo.EvaluatorInfo - if err := json.Unmarshal(*po.EvaluatorInfo, &info); err == nil { - do.EvaluatorInfo = &info - } - } + if po.EvaluatorInfo != nil { + var info evaluatordo.EvaluatorInfo + if err := json.Unmarshal(*po.EvaluatorInfo, &info); err == nil { + do.EvaluatorInfo = &info + } + } do.BaseInfo = &evaluatordo.BaseInfo{ CreatedBy: &evaluatordo.UserInfo{ UserID: ptr.Of(po.CreatedBy), @@ -204,7 +204,9 @@ func ConvertEvaluatorVersionPO2DO(po *model.EvaluatorVersion) (*evaluatordo.Eval } switch do.EvaluatorType { case evaluatordo.EvaluatorTypePrompt: - do.PromptEvaluatorVersion = &evaluatordo.PromptEvaluatorVersion{} + do.PromptEvaluatorVersion = &evaluatordo.PromptEvaluatorVersion{ + ReceiveChatHistory: po.ReceiveChatHistory, + } // 反序列化Metainfo获取完整配置 if po.Metainfo != nil { var meta struct { From 981cfffbd5775de688fee06353dff8ecb2715299 Mon Sep 17 00:00:00 2001 From: shenjiayun Date: Mon, 10 Nov 2025 22:54:07 +0800 Subject: [PATCH 41/42] fix: add omitted evaluator_tag deletion logic to BatchDeleteEvaluator, DeleteEvaluatorTemplate --- .../evaluation/infra/repo/evaluator/evaluator_impl.go | 5 +++++ .../infra/repo/evaluator/evaluator_template_impl.go | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go index 099c7c6d8..e4b40c5a0 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl.go @@ -633,6 +633,11 @@ func (r *EvaluatorRepoImpl) BatchDeleteEvaluator(ctx context.Context, ids []int6 if err != nil { return err } + for _, id := range ids { + if err := r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, id, int32(entity.EvaluatorTagKeyType_Evaluator), "", nil); err != nil { + return err + } + } return nil }) } diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go index e65c75da6..71adb6a3d 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_template_impl.go @@ -308,7 +308,13 @@ func (r *EvaluatorTemplateRepoImpl) UpdateEvaluatorTemplate(ctx context.Context, // DeleteEvaluatorTemplate 删除评估器模板（软删除） func (r *EvaluatorTemplateRepoImpl) DeleteEvaluatorTemplate(ctx context.Context, id int64, userID string) error { - return r.templateDAO.DeleteEvaluatorTemplate(ctx, id, userID) + if err := r.templateDAO.DeleteEvaluatorTemplate(ctx, id, userID); err != nil { + return err + } + if err := r.tagDAO.DeleteEvaluatorTagsByConditions(ctx, id, int32(entity.EvaluatorTagKeyType_EvaluatorTemplate), "", nil); err != nil { + return err + } + return nil } // GetEvaluatorTemplate 根据ID获取评估器模板 From b96093701d499ea0e400cd7e682caad25fd0a884 Mon Sep 17 00:00:00 2001 From: shenjiayun Date: Wed, 12 Nov 2025 16:38:54 +0800 Subject: [PATCH 42/42] fix: allow update EvaluatorInfo attrs when not nil --- .../convertor/common/common_test.go | 16 +- .../convertor/evaluator/evaluator.go | 16 +- .../convertor/evaluator/evaluator_template.go | 16 +- .../evaluator/evaluator_template_test.go | 358 +++++++++--------- .../evaluation/application/evaluator_app.go | 8 +- .../application/evaluator_app_test.go | 11 +- .../evaluation/domain/entity/evaluator.go | 8 +- .../domain/service/evaluator_template_impl.go | 104 ++--- .../service/evaluator_template_impl_test.go | 274 +++++++------- .../repo/evaluator/evaluator_impl_test.go | 25 +- .../convertor/evaluator_template_test.go | 18 +- 11 files changed, 419 insertions(+), 435 deletions(-) diff --git a/backend/modules/evaluation/application/convertor/common/common_test.go b/backend/modules/evaluation/application/convertor/common/common_test.go index 9cbd94870..6dfd7a96e 100755 --- a/backend/modules/evaluation/application/convertor/common/common_test.go +++ b/backend/modules/evaluation/application/convertor/common/common_test.go @@ -118,8 +118,7 @@ func TestConvertImageDTO2DO(t *testing.T) { Name: gptr.Of("minimal.jpg"), }, expected: &commonentity.Image{ - Name: gptr.Of("minimal.jpg"), - StorageProvider: gptr.Of(commonentity.StorageProvider(0)), + Name: gptr.Of("minimal.jpg"), }, }, } @@ -169,8 +168,7 @@ func TestConvertImageDO2DTO(t *testing.T) { Name: gptr.Of("minimal.jpg"), }, expected: &commondto.Image{ - Name: gptr.Of("minimal.jpg"), - StorageProvider: gptr.Of(dataset.StorageProvider(0)), + Name: gptr.Of("minimal.jpg"), }, }, } @@ -308,9 +306,8 @@ func TestConvertContentDTO2DO(t *testing.T) { expected: &commonentity.Content{ ContentType: gptr.Of(commonentity.ContentType("image")), Image: &commonentity.Image{ - Name: gptr.Of("test.jpg"), - URL: gptr.Of("https://example.com/test.jpg"), - StorageProvider: gptr.Of(commonentity.StorageProvider(0)), + Name: gptr.Of("test.jpg"), + URL: gptr.Of("https://example.com/test.jpg"), }, }, }, @@ -407,9 +404,8 @@ func TestConvertContentDO2DTO(t *testing.T) { expected: &commondto.Content{ ContentType: gptr.Of("image"), Image: &commondto.Image{ - Name: gptr.Of("test.jpg"), - URL: gptr.Of("https://example.com/test.jpg"), - StorageProvider: gptr.Of(dataset.StorageProvider(0)), + Name: gptr.Of("test.jpg"), + URL: gptr.Of("https://example.com/test.jpg"), }, }, }, diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go index 320875d56..4562beffd 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator.go @@ -35,10 +35,10 @@ func ConvertEvaluatorDTO2DO(evaluatorDTO *evaluatordto.Evaluator) (*evaluatordo. } if evaluatorDTO.GetEvaluatorInfo() != nil { evaluatorDO.EvaluatorInfo = &evaluatordo.EvaluatorInfo{ - Benchmark: evaluatorDTO.GetEvaluatorInfo().GetBenchmark(), - Vendor: evaluatorDTO.GetEvaluatorInfo().GetVendor(), - VendorURL: evaluatorDTO.GetEvaluatorInfo().GetVendorURL(), - UserManualURL: evaluatorDTO.GetEvaluatorInfo().GetUserManualURL(), + Benchmark: evaluatorDTO.GetEvaluatorInfo().Benchmark, + Vendor: evaluatorDTO.GetEvaluatorInfo().Vendor, + VendorURL: evaluatorDTO.GetEvaluatorInfo().VendorURL, + UserManualURL: evaluatorDTO.GetEvaluatorInfo().UserManualURL, } } if evaluatorDTO.CurrentVersion != nil { @@ -86,10 +86,10 @@ func ConvertEvaluatorDO2DTO(do *evaluatordo.Evaluator) *evaluatordto.Evaluator { } if do.EvaluatorInfo != nil { dto.EvaluatorInfo = &evaluatordto.EvaluatorInfo{ - Benchmark: gptr.Of(do.EvaluatorInfo.Benchmark), - Vendor: gptr.Of(do.EvaluatorInfo.Vendor), - VendorURL: gptr.Of(do.EvaluatorInfo.VendorURL), - UserManualURL: gptr.Of(do.EvaluatorInfo.UserManualURL), + Benchmark: do.EvaluatorInfo.Benchmark, + Vendor: do.EvaluatorInfo.Vendor, + VendorURL: do.EvaluatorInfo.VendorURL, + UserManualURL: do.EvaluatorInfo.UserManualURL, } } // 设置 BoxType diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go index f913e1f83..db3ab6710 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template.go @@ -31,10 +31,10 @@ func ConvertEvaluatorTemplateDTO2DO(dto *evaluatordto.EvaluatorTemplate) *evalua } if dto.GetEvaluatorInfo() != nil { do.EvaluatorInfo = &evaluatordo.EvaluatorInfo{ - Benchmark: dto.GetEvaluatorInfo().GetBenchmark(), - Vendor: dto.GetEvaluatorInfo().GetVendor(), - VendorURL: dto.GetEvaluatorInfo().GetVendorURL(), - UserManualURL: dto.GetEvaluatorInfo().GetUserManualURL(), + Benchmark: dto.GetEvaluatorInfo().Benchmark, + Vendor: dto.GetEvaluatorInfo().Vendor, + VendorURL: dto.GetEvaluatorInfo().VendorURL, + UserManualURL: dto.GetEvaluatorInfo().UserManualURL, } } @@ -106,10 +106,10 @@ func ConvertEvaluatorTemplateDO2DTO(do *evaluatordo.EvaluatorTemplate) *evaluato } if do.EvaluatorInfo != nil { dto.EvaluatorInfo = &evaluatordto.EvaluatorInfo{ - Benchmark: gptr.Of(do.EvaluatorInfo.Benchmark), - Vendor: gptr.Of(do.EvaluatorInfo.Vendor), - VendorURL: gptr.Of(do.EvaluatorInfo.VendorURL), - UserManualURL: gptr.Of(do.EvaluatorInfo.UserManualURL), + Benchmark: do.EvaluatorInfo.Benchmark, + Vendor: do.EvaluatorInfo.Vendor, + VendorURL: do.EvaluatorInfo.VendorURL, + UserManualURL: do.EvaluatorInfo.UserManualURL, } } diff --git a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go index 60ed1968a..a31d8af58 100644 --- a/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go +++ b/backend/modules/evaluation/application/convertor/evaluator/evaluator_template_test.go @@ -15,166 +15,166 @@ import ( ) func TestConvertEvaluatorTemplateDTO2DO_Nil(t *testing.T) { - t.Parallel() - assert.Nil(t, ConvertEvaluatorTemplateDTO2DO(nil)) + t.Parallel() + assert.Nil(t, ConvertEvaluatorTemplateDTO2DO(nil)) } func TestConvertEvaluatorTemplateDTO2DO_BasicAndTagsAndInfo(t *testing.T) { - t.Parallel() - dto := &evaluatordto.EvaluatorTemplate{ - ID: gptr.Of(int64(123)), - WorkspaceID: gptr.Of(int64(456)), - Name: gptr.Of("name"), - Description: gptr.Of("desc"), - EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), - Popularity: gptr.Of(int64(9)), - BaseInfo: &commondto.BaseInfo{CreatedBy: &commondto.UserInfo{UserID: gptr.Of("u1")}}, - EvaluatorContent: &evaluatordto.EvaluatorContent{ - ReceiveChatHistory: gptr.Of(true), - InputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("in")}}, - OutputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("out")}}, - PromptEvaluator: &evaluatordto.PromptEvaluator{MessageList: []*commondto.Message{{Content: &commondto.Content{Text: gptr.Of("t")}}}}, - }, - Tags: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{ - evaluatordto.EvaluatorTagLangType("zh"): { - evaluatordto.EvaluatorTagKeyName: {"n1", "n2"}, - }, - }, - } - do := ConvertEvaluatorTemplateDTO2DO(dto) - assert.NotNil(t, do) - assert.Equal(t, int64(123), do.ID) - assert.Equal(t, int64(456), do.SpaceID) - assert.Equal(t, "name", do.Name) - assert.Equal(t, "desc", do.Description) - assert.Equal(t, evaluatordo.EvaluatorTypePrompt, do.EvaluatorType) - assert.Equal(t, int64(9), do.Popularity) - // EvaluatorInfo 字段在模板DTO可能不存在，忽略该字段校验 - assert.NotNil(t, do.BaseInfo) - assert.True(t, gptr.Indirect(do.ReceiveChatHistory)) - assert.Len(t, do.InputSchemas, 1) - assert.Len(t, do.OutputSchemas, 1) - if assert.NotNil(t, do.PromptEvaluatorContent) { - assert.Len(t, do.PromptEvaluatorContent.MessageList, 1) - } - if assert.NotNil(t, do.Tags) { - assert.Equal(t, []string{"n1", "n2"}, do.Tags[evaluatordo.EvaluatorTagLangType("zh")][evaluatordo.EvaluatorTagKey("Name")]) - } + t.Parallel() + dto := &evaluatordto.EvaluatorTemplate{ + ID: gptr.Of(int64(123)), + WorkspaceID: gptr.Of(int64(456)), + Name: gptr.Of("name"), + Description: gptr.Of("desc"), + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Prompt), + Popularity: gptr.Of(int64(9)), + BaseInfo: &commondto.BaseInfo{CreatedBy: &commondto.UserInfo{UserID: gptr.Of("u1")}}, + EvaluatorContent: &evaluatordto.EvaluatorContent{ + ReceiveChatHistory: gptr.Of(true), + InputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("in")}}, + OutputSchemas: []*commondto.ArgsSchema{{Key: gptr.Of("out")}}, + PromptEvaluator: &evaluatordto.PromptEvaluator{MessageList: []*commondto.Message{{Content: &commondto.Content{Text: gptr.Of("t")}}}}, + }, + Tags: map[evaluatordto.EvaluatorTagLangType]map[evaluatordto.EvaluatorTagKey][]string{ + evaluatordto.EvaluatorTagLangType("zh"): { + evaluatordto.EvaluatorTagKeyName: {"n1", "n2"}, + }, + }, + } + do := ConvertEvaluatorTemplateDTO2DO(dto) + assert.NotNil(t, do) + assert.Equal(t, int64(123), do.ID) + assert.Equal(t, int64(456), do.SpaceID) + assert.Equal(t, "name", do.Name) + assert.Equal(t, "desc", do.Description) + assert.Equal(t, evaluatordo.EvaluatorTypePrompt, do.EvaluatorType) + assert.Equal(t, int64(9), do.Popularity) + // EvaluatorInfo 字段在模板DTO可能不存在，忽略该字段校验 + assert.NotNil(t, do.BaseInfo) + assert.True(t, gptr.Indirect(do.ReceiveChatHistory)) + assert.Len(t, do.InputSchemas, 1) + assert.Len(t, do.OutputSchemas, 1) + if assert.NotNil(t, do.PromptEvaluatorContent) { + assert.Len(t, do.PromptEvaluatorContent.MessageList, 1) + } + if assert.NotNil(t, do.Tags) { + assert.Equal(t, []string{"n1", "n2"}, do.Tags[evaluatordo.EvaluatorTagLangType("zh")][evaluatordo.EvaluatorTagKey("Name")]) + } } func TestConvertEvaluatorTemplateDTO2DO_CodeEval_NewAndCompat(t *testing.T) { - t.Parallel() - // 新字段：lang_2_code_content - dtoNew := &evaluatordto.EvaluatorTemplate{ - EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), - EvaluatorContent: &evaluatordto.EvaluatorContent{ - CodeEvaluator: &evaluatordto.CodeEvaluator{}, - }, - } - dtoNew.EvaluatorContent.CodeEvaluator.SetLang2CodeContent(map[evaluatordto.LanguageType]string{ - evaluatordto.LanguageTypePython: "print('hi')", - }) - doNew := ConvertEvaluatorTemplateDTO2DO(dtoNew) - if assert.NotNil(t, doNew) && assert.NotNil(t, doNew.CodeEvaluatorContent) { - assert.Equal(t, "print('hi')", doNew.CodeEvaluatorContent.Lang2CodeContent[evaluatordo.LanguageTypePython]) - } - - // 兼容旧字段：language_type + code_content - dtoOld := &evaluatordto.EvaluatorTemplate{ - EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), - EvaluatorContent: &evaluatordto.EvaluatorContent{ - CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypePython), CodeContent: gptr.Of("print('ok')")}, - }, - } - doOld := ConvertEvaluatorTemplateDTO2DO(dtoOld) - if assert.NotNil(t, doOld) && assert.NotNil(t, doOld.CodeEvaluatorContent) { - assert.Equal(t, "print('ok')", doOld.CodeEvaluatorContent.Lang2CodeContent[evaluatordo.LanguageTypePython]) - } + t.Parallel() + // 新字段：lang_2_code_content + dtoNew := &evaluatordto.EvaluatorTemplate{ + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{}, + }, + } + dtoNew.EvaluatorContent.CodeEvaluator.SetLang2CodeContent(map[evaluatordto.LanguageType]string{ + evaluatordto.LanguageTypePython: "print('hi')", + }) + doNew := ConvertEvaluatorTemplateDTO2DO(dtoNew) + if assert.NotNil(t, doNew) && assert.NotNil(t, doNew.CodeEvaluatorContent) { + assert.Equal(t, "print('hi')", doNew.CodeEvaluatorContent.Lang2CodeContent[evaluatordo.LanguageTypePython]) + } + + // 兼容旧字段：language_type + code_content + dtoOld := &evaluatordto.EvaluatorTemplate{ + EvaluatorType: evaluatordto.EvaluatorTypePtr(evaluatordto.EvaluatorType_Code), + EvaluatorContent: &evaluatordto.EvaluatorContent{ + CodeEvaluator: &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypePython), CodeContent: gptr.Of("print('ok')")}, + }, + } + doOld := ConvertEvaluatorTemplateDTO2DO(dtoOld) + if assert.NotNil(t, doOld) && assert.NotNil(t, doOld.CodeEvaluatorContent) { + assert.Equal(t, "print('ok')", doOld.CodeEvaluatorContent.Lang2CodeContent[evaluatordo.LanguageTypePython]) + } } func TestConvertEvaluatorTemplateDO2DTO_Nil(t *testing.T) { - t.Parallel() - assert.Nil(t, ConvertEvaluatorTemplateDO2DTO(nil)) + t.Parallel() + assert.Nil(t, ConvertEvaluatorTemplateDO2DTO(nil)) } func TestConvertEvaluatorTemplateDO2DTO_Full(t *testing.T) { - t.Parallel() - do := &evaluatordo.EvaluatorTemplate{ - ID: 1, - SpaceID: 2, - Name: "n", - Description: "d", - EvaluatorType: evaluatordo.EvaluatorTypePrompt, - Popularity: 3, - BaseInfo: &evaluatordo.BaseInfo{}, - InputSchemas: []*evaluatordo.ArgsSchema{{Key: gptr.Of("in")}}, - OutputSchemas: []*evaluatordo.ArgsSchema{{Key: gptr.Of("out")}}, - ReceiveChatHistory: gptr.Of(true), - PromptEvaluatorContent: &evaluatordo.PromptEvaluatorContent{MessageList: []*evaluatordo.Message{{Content: &evaluatordo.Content{Text: gptr.Of("t")}}}}, - Tags: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{ - evaluatordo.EvaluatorTagLangType("en"): {evaluatordo.EvaluatorTagKey("Name"): {"x"}}, - }, - } - dto := ConvertEvaluatorTemplateDO2DTO(do) - if assert.NotNil(t, dto) { - assert.Equal(t, int64(1), dto.GetID()) - assert.Equal(t, int64(2), dto.GetWorkspaceID()) - assert.Equal(t, "n", dto.GetName()) - assert.Equal(t, "d", dto.GetDescription()) - assert.Equal(t, evaluatordto.EvaluatorType_Prompt, dto.GetEvaluatorType()) - assert.Equal(t, int64(3), dto.GetPopularity()) - // EvaluatorInfo 字段在模板DTO可能不存在，忽略该字段校验 - if assert.NotNil(t, dto.EvaluatorContent) { - assert.True(t, gptr.Indirect(dto.EvaluatorContent.ReceiveChatHistory)) - assert.Len(t, dto.EvaluatorContent.InputSchemas, 1) - assert.Len(t, dto.EvaluatorContent.OutputSchemas, 1) - if assert.NotNil(t, dto.EvaluatorContent.PromptEvaluator) { - assert.Len(t, dto.EvaluatorContent.PromptEvaluator.MessageList, 1) - } - } - assert.Equal(t, []string{"x"}, dto.Tags[evaluatordto.EvaluatorTagLangType("en")][evaluatordto.EvaluatorTagKey("Name")]) - } + t.Parallel() + do := &evaluatordo.EvaluatorTemplate{ + ID: 1, + SpaceID: 2, + Name: "n", + Description: "d", + EvaluatorType: evaluatordo.EvaluatorTypePrompt, + Popularity: 3, + BaseInfo: &evaluatordo.BaseInfo{}, + InputSchemas: []*evaluatordo.ArgsSchema{{Key: gptr.Of("in")}}, + OutputSchemas: []*evaluatordo.ArgsSchema{{Key: gptr.Of("out")}}, + ReceiveChatHistory: gptr.Of(true), + PromptEvaluatorContent: &evaluatordo.PromptEvaluatorContent{MessageList: []*evaluatordo.Message{{Content: &evaluatordo.Content{Text: gptr.Of("t")}}}}, + Tags: map[evaluatordo.EvaluatorTagLangType]map[evaluatordo.EvaluatorTagKey][]string{ + evaluatordo.EvaluatorTagLangType("en"): {evaluatordo.EvaluatorTagKey("Name"): {"x"}}, + }, + } + dto := ConvertEvaluatorTemplateDO2DTO(do) + if assert.NotNil(t, dto) { + assert.Equal(t, int64(1), dto.GetID()) + assert.Equal(t, int64(2), dto.GetWorkspaceID()) + assert.Equal(t, "n", dto.GetName()) + assert.Equal(t, "d", dto.GetDescription()) + assert.Equal(t, evaluatordto.EvaluatorType_Prompt, dto.GetEvaluatorType()) + assert.Equal(t, int64(3), dto.GetPopularity()) + // EvaluatorInfo 字段在模板DTO可能不存在，忽略该字段校验 + if assert.NotNil(t, dto.EvaluatorContent) { + assert.True(t, gptr.Indirect(dto.EvaluatorContent.ReceiveChatHistory)) + assert.Len(t, dto.EvaluatorContent.InputSchemas, 1) + assert.Len(t, dto.EvaluatorContent.OutputSchemas, 1) + if assert.NotNil(t, dto.EvaluatorContent.PromptEvaluator) { + assert.Len(t, dto.EvaluatorContent.PromptEvaluator.MessageList, 1) + } + } + assert.Equal(t, []string{"x"}, dto.Tags[evaluatordto.EvaluatorTagLangType("en")][evaluatordto.EvaluatorTagKey("Name")]) + } } func TestConvertEvaluatorTemplateDOList2DTO(t *testing.T) { - t.Parallel() - doList := []*evaluatordo.EvaluatorTemplate{{Name: "a"}, {Name: "b"}} - dtoList := ConvertEvaluatorTemplateDOList2DTO(doList) - assert.Len(t, dtoList, 2) - assert.Equal(t, "a", dtoList[0].GetName()) - assert.Equal(t, "b", dtoList[1].GetName()) + t.Parallel() + doList := []*evaluatordo.EvaluatorTemplate{{Name: "a"}, {Name: "b"}} + dtoList := ConvertEvaluatorTemplateDOList2DTO(doList) + assert.Len(t, dtoList, 2) + assert.Equal(t, "a", dtoList[0].GetName()) + assert.Equal(t, "b", dtoList[1].GetName()) } func TestCodeEvaluatorContentDTOAndDO(t *testing.T) { - t.Parallel() - // DTO2DO 新字段 - dto := &evaluatordto.CodeEvaluator{} - dto.SetLang2CodeContent(map[evaluatordto.LanguageType]string{ - evaluatordto.LanguageTypePython: "print(1)", - }) - do := ConvertCodeEvaluatorContentDTO2DO(dto) - if assert.NotNil(t, do) { - assert.Equal(t, "print(1)", do.Lang2CodeContent[evaluatordo.LanguageTypePython]) - } - - // DTO2DO 旧字段 - dto2 := &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypeJS), CodeContent: gptr.Of("console.log(1)")} - do2 := ConvertCodeEvaluatorContentDTO2DO(dto2) - if assert.NotNil(t, do2) { - assert.Equal(t, "console.log(1)", do2.Lang2CodeContent[evaluatordo.LanguageTypeJS]) - } - - // DO2DTO - back := ConvertCodeEvaluatorContentDO2DTO(&evaluatordo.CodeEvaluatorContent{Lang2CodeContent: map[evaluatordo.LanguageType]string{ - evaluatordo.LanguageTypePython: "print(2)", - }}) - if assert.NotNil(t, back) { - m := back.GetLang2CodeContent() - assert.Equal(t, "print(2)", m[evaluatordto.LanguageTypePython]) - // 回填旧字段 - assert.NotNil(t, back.LanguageType) - assert.NotNil(t, back.CodeContent) - } + t.Parallel() + // DTO2DO 新字段 + dto := &evaluatordto.CodeEvaluator{} + dto.SetLang2CodeContent(map[evaluatordto.LanguageType]string{ + evaluatordto.LanguageTypePython: "print(1)", + }) + do := ConvertCodeEvaluatorContentDTO2DO(dto) + if assert.NotNil(t, do) { + assert.Equal(t, "print(1)", do.Lang2CodeContent[evaluatordo.LanguageTypePython]) + } + + // DTO2DO 旧字段 + dto2 := &evaluatordto.CodeEvaluator{LanguageType: gptr.Of(evaluatordto.LanguageTypeJS), CodeContent: gptr.Of("console.log(1)")} + do2 := ConvertCodeEvaluatorContentDTO2DO(dto2) + if assert.NotNil(t, do2) { + assert.Equal(t, "console.log(1)", do2.Lang2CodeContent[evaluatordo.LanguageTypeJS]) + } + + // DO2DTO + back := ConvertCodeEvaluatorContentDO2DTO(&evaluatordo.CodeEvaluatorContent{Lang2CodeContent: map[evaluatordo.LanguageType]string{ + evaluatordo.LanguageTypePython: "print(2)", + }}) + if assert.NotNil(t, back) { + m := back.GetLang2CodeContent() + assert.Equal(t, "print(2)", m[evaluatordto.LanguageTypePython]) + // 回填旧字段 + assert.NotNil(t, back.LanguageType) + assert.NotNil(t, back.CodeContent) + } } // TestConvertEvaluatorTemplateDTO2DO_EvaluatorInfo 测试 ConvertEvaluatorTemplateDTO2DO 的 EvaluatorInfo 处理逻辑 @@ -182,10 +182,10 @@ func TestConvertEvaluatorTemplateDTO2DO_EvaluatorInfo(t *testing.T) { t.Parallel() tests := []struct { - name string - dto *evaluatordto.EvaluatorTemplate - expectedInfo *evaluatordo.EvaluatorInfo - description string + name string + dto *evaluatordto.EvaluatorTemplate + expectedInfo *evaluatordo.EvaluatorInfo + description string }{ { name: "成功 - EvaluatorInfo为nil", @@ -210,10 +210,10 @@ func TestConvertEvaluatorTemplateDTO2DO_EvaluatorInfo(t *testing.T) { EvaluatorInfo: &evaluatordto.EvaluatorInfo{}, }, expectedInfo: &evaluatordo.EvaluatorInfo{ - Benchmark: "", - Vendor: "", - VendorURL: "", - UserManualURL: "", + Benchmark: nil, + Vendor: nil, + VendorURL: nil, + UserManualURL: nil, }, description: "当DTO的EvaluatorInfo存在但所有字段为nil时，DO的EvaluatorInfo应该创建但所有字段为空字符串", }, @@ -233,10 +233,10 @@ func TestConvertEvaluatorTemplateDTO2DO_EvaluatorInfo(t *testing.T) { }, }, expectedInfo: &evaluatordo.EvaluatorInfo{ - Benchmark: "GLUE", - Vendor: "OpenAI", - VendorURL: "https://openai.com", - UserManualURL: "https://docs.openai.com", + Benchmark: gptr.Of("GLUE"), + Vendor: gptr.Of("OpenAI"), + VendorURL: gptr.Of("https://openai.com"), + UserManualURL: gptr.Of("https://docs.openai.com"), }, description: "当DTO的EvaluatorInfo存在且所有字段都有值时，DO的EvaluatorInfo应该正确转换所有字段", }, @@ -255,10 +255,10 @@ func TestConvertEvaluatorTemplateDTO2DO_EvaluatorInfo(t *testing.T) { }, }, expectedInfo: &evaluatordo.EvaluatorInfo{ - Benchmark: "GLUE", - Vendor: "OpenAI", - VendorURL: "", - UserManualURL: "", + Benchmark: gptr.Of("GLUE"), + Vendor: gptr.Of("OpenAI"), + VendorURL: nil, + UserManualURL: nil, }, description: "当DTO的EvaluatorInfo存在但部分字段有值时，DO的EvaluatorInfo应该正确转换，nil字段转为空字符串", }, @@ -278,10 +278,10 @@ func TestConvertEvaluatorTemplateDTO2DO_EvaluatorInfo(t *testing.T) { }, }, expectedInfo: &evaluatordo.EvaluatorInfo{ - Benchmark: "", - Vendor: "", - VendorURL: "", - UserManualURL: "", + Benchmark: gptr.Of(""), + Vendor: gptr.Of(""), + VendorURL: gptr.Of(""), + UserManualURL: gptr.Of(""), }, description: "当DTO的EvaluatorInfo字段为空字符串时，DO的EvaluatorInfo应该保持为空字符串", }, @@ -312,10 +312,10 @@ func TestConvertEvaluatorTemplateDO2DTO_EvaluatorInfo(t *testing.T) { t.Parallel() tests := []struct { - name string - do *evaluatordo.EvaluatorTemplate - expectedInfo *evaluatordto.EvaluatorInfo - description string + name string + do *evaluatordo.EvaluatorTemplate + expectedInfo *evaluatordto.EvaluatorInfo + description string }{ { name: "成功 - EvaluatorInfo为nil", @@ -338,10 +338,10 @@ func TestConvertEvaluatorTemplateDO2DTO_EvaluatorInfo(t *testing.T) { EvaluatorType: evaluatordo.EvaluatorTypePrompt, Popularity: 0, EvaluatorInfo: &evaluatordo.EvaluatorInfo{ - Benchmark: "", - Vendor: "", - VendorURL: "", - UserManualURL: "", + Benchmark: gptr.Of(""), + Vendor: gptr.Of(""), + VendorURL: gptr.Of(""), + UserManualURL: gptr.Of(""), }, }, expectedInfo: &evaluatordto.EvaluatorInfo{ @@ -361,10 +361,10 @@ func TestConvertEvaluatorTemplateDO2DTO_EvaluatorInfo(t *testing.T) { EvaluatorType: evaluatordo.EvaluatorTypePrompt, Popularity: 0, EvaluatorInfo: &evaluatordo.EvaluatorInfo{ - Benchmark: "GLUE", - Vendor: "OpenAI", - VendorURL: "https://openai.com", - UserManualURL: "https://docs.openai.com", + Benchmark: gptr.Of("GLUE"), + Vendor: gptr.Of("OpenAI"), + VendorURL: gptr.Of("https://openai.com"), + UserManualURL: gptr.Of("https://docs.openai.com"), }, }, expectedInfo: &evaluatordto.EvaluatorInfo{ @@ -384,11 +384,11 @@ func TestConvertEvaluatorTemplateDO2DTO_EvaluatorInfo(t *testing.T) { EvaluatorType: evaluatordo.EvaluatorTypePrompt, Popularity: 0, EvaluatorInfo: &evaluatordo.EvaluatorInfo{ - Benchmark: "GLUE", - Vendor: "OpenAI", + Benchmark: gptr.Of("GLUE"), + Vendor: gptr.Of("OpenAI"), // VendorURL 和 UserManualURL 为空字符串 - VendorURL: "", - UserManualURL: "", + VendorURL: gptr.Of(""), + UserManualURL: gptr.Of(""), }, }, expectedInfo: &evaluatordto.EvaluatorInfo{ @@ -517,5 +517,3 @@ func TestConvertEvaluatorTemplate_EvaluatorInfo_RoundTrip(t *testing.T) { }) } } - - diff --git a/backend/modules/evaluation/application/evaluator_app.go b/backend/modules/evaluation/application/evaluator_app.go index f892a83cf..fd4e87bd3 100644 --- a/backend/modules/evaluation/application/evaluator_app.go +++ b/backend/modules/evaluation/application/evaluator_app.go @@ -367,10 +367,10 @@ func (e *EvaluatorHandlerImpl) UpdateEvaluator(ctx context.Context, request *eva // 转换 EvaluatorInfo if request.IsSetEvaluatorInfo() && request.GetEvaluatorInfo() != nil { req.EvaluatorInfo = &entity.EvaluatorInfo{ - Benchmark: request.GetEvaluatorInfo().GetBenchmark(), - Vendor: request.GetEvaluatorInfo().GetVendor(), - VendorURL: request.GetEvaluatorInfo().GetVendorURL(), - UserManualURL: request.GetEvaluatorInfo().GetUserManualURL(), + Benchmark: request.GetEvaluatorInfo().Benchmark, + Vendor: request.GetEvaluatorInfo().Vendor, + VendorURL: request.GetEvaluatorInfo().VendorURL, + UserManualURL: request.GetEvaluatorInfo().UserManualURL, } } // box_type 映射（White/Black -> 1/2） diff --git a/backend/modules/evaluation/application/evaluator_app_test.go b/backend/modules/evaluation/application/evaluator_app_test.go index 8a147354d..7431e93cf 100644 --- a/backend/modules/evaluation/application/evaluator_app_test.go +++ b/backend/modules/evaluation/application/evaluator_app_test.go @@ -601,19 +601,10 @@ func TestEvaluatorHandlerImpl_GetEvaluatorVersion(t *testing.T) { mockConfiger.EXPECT(). GetBuiltinEvaluatorSpaceConf(gomock.Any()). Return([]string{"999"}) // Different workspace ID - - // Mock auth - returns error when space not in config - mockAuth.EXPECT(). - Authorization(gomock.Any(), &rpc.AuthorizationParam{ - ObjectID: strconv.FormatInt(validWorkspaceID, 10), - SpaceID: validWorkspaceID, - ActionObjects: []*rpc.ActionObject{{Action: gptr.Of("listLoopEvaluator"), EntityType: gptr.Of(rpc.AuthEntityType_Space)}}, - }). - Return(errorx.NewByCode(errno.CommonNoPermissionCode)) }, wantResp: nil, wantErr: true, - wantErrCode: errno.CommonNoPermissionCode, + wantErrCode: errno.CommonInvalidParamCode, }, { name: "error - builtin second auth failed", diff --git a/backend/modules/evaluation/domain/entity/evaluator.go b/backend/modules/evaluation/domain/entity/evaluator.go index e53db4c67..849ab6fbf 100644 --- a/backend/modules/evaluation/domain/entity/evaluator.go +++ b/backend/modules/evaluation/domain/entity/evaluator.go @@ -25,10 +25,10 @@ type Evaluator struct { } type EvaluatorInfo struct { - Benchmark string `json:"benchmark"` - Vendor string `json:"vendor"` - VendorURL string `json:"vendor_url"` - UserManualURL string `json:"user_manual_url"` + Benchmark *string `json:"benchmark"` + Vendor *string `json:"vendor"` + VendorURL *string `json:"vendor_url"` + UserManualURL *string `json:"user_manual_url"` } type EvaluatorBoxType int64 diff --git a/backend/modules/evaluation/domain/service/evaluator_template_impl.go b/backend/modules/evaluation/domain/service/evaluator_template_impl.go index dd944606a..245275b9f 100644 --- a/backend/modules/evaluation/domain/service/evaluator_template_impl.go +++ b/backend/modules/evaluation/domain/service/evaluator_template_impl.go @@ -40,7 +40,7 @@ func (s *EvaluatorTemplateServiceImpl) CreateEvaluatorTemplate(ctx context.Conte } // 构建模板实体 - template := &entity.EvaluatorTemplate{ + template := &entity.EvaluatorTemplate{ SpaceID: req.SpaceID, Name: req.Name, Description: req.Description, @@ -52,10 +52,10 @@ func (s *EvaluatorTemplateServiceImpl) CreateEvaluatorTemplate(ctx context.Conte PromptEvaluatorContent: req.PromptEvaluatorContent, CodeEvaluatorContent: req.CodeEvaluatorContent, } - // EvaluatorInfo（优先使用新字段） - if req.EvaluatorInfo != nil { - template.EvaluatorInfo = req.EvaluatorInfo - } + // EvaluatorInfo（优先使用新字段） + if req.EvaluatorInfo != nil { + template.EvaluatorInfo = req.EvaluatorInfo + } // 设置基础信息 baseInfo := &entity.BaseInfo{ @@ -108,25 +108,25 @@ func (s *EvaluatorTemplateServiceImpl) UpdateEvaluatorTemplate(ctx context.Conte if req.Description != nil { existingTemplate.Description = *req.Description } - // 更新 EvaluatorInfo - if req.EvaluatorInfo != nil { - if existingTemplate.EvaluatorInfo == nil { - existingTemplate.EvaluatorInfo = &entity.EvaluatorInfo{} - } - // 按字段级别覆盖，避免丢失未提供字段 - if req.EvaluatorInfo.Benchmark != "" { - existingTemplate.EvaluatorInfo.Benchmark = req.EvaluatorInfo.Benchmark - } - if req.EvaluatorInfo.Vendor != "" { - existingTemplate.EvaluatorInfo.Vendor = req.EvaluatorInfo.Vendor - } - if req.EvaluatorInfo.VendorURL != "" { - existingTemplate.EvaluatorInfo.VendorURL = req.EvaluatorInfo.VendorURL - } - if req.EvaluatorInfo.UserManualURL != "" { - existingTemplate.EvaluatorInfo.UserManualURL = req.EvaluatorInfo.UserManualURL - } - } + // 更新 EvaluatorInfo + if req.EvaluatorInfo != nil { + if existingTemplate.EvaluatorInfo == nil { + existingTemplate.EvaluatorInfo = &entity.EvaluatorInfo{} + } + // 按字段级别覆盖，避免丢失未提供字段 + if req.EvaluatorInfo.Benchmark != nil { + existingTemplate.EvaluatorInfo.Benchmark = req.EvaluatorInfo.Benchmark + } + if req.EvaluatorInfo.Vendor != nil { + existingTemplate.EvaluatorInfo.Vendor = req.EvaluatorInfo.Vendor + } + if req.EvaluatorInfo.VendorURL != nil { + existingTemplate.EvaluatorInfo.VendorURL = req.EvaluatorInfo.VendorURL + } + if req.EvaluatorInfo.UserManualURL != nil { + existingTemplate.EvaluatorInfo.UserManualURL = req.EvaluatorInfo.UserManualURL + } + } if req.InputSchemas != nil { existingTemplate.InputSchemas = req.InputSchemas } @@ -266,20 +266,20 @@ func (s *EvaluatorTemplateServiceImpl) validateCreateRequest(req *entity.CreateE if len(req.Description) > 500 { return errors.New("模板描述长度不能超过500个字符") } - if req.EvaluatorInfo != nil { - if req.EvaluatorInfo.Benchmark != "" && len(req.EvaluatorInfo.Benchmark) > 100 { - return errors.New("基准长度不能超过100个字符") - } - if req.EvaluatorInfo.Vendor != "" && len(req.EvaluatorInfo.Vendor) > 100 { - return errors.New("供应商长度不能超过100个字符") - } - if req.EvaluatorInfo.VendorURL != "" && len(req.EvaluatorInfo.VendorURL) > 500 { - return errors.New("供应商链接长度不能超过500个字符") - } - if req.EvaluatorInfo.UserManualURL != "" && len(req.EvaluatorInfo.UserManualURL) > 500 { - return errors.New("用户手册链接长度不能超过500个字符") - } - } + if req.EvaluatorInfo != nil { + if req.EvaluatorInfo.Benchmark != nil && len(*req.EvaluatorInfo.Benchmark) > 100 { + return errors.New("基准长度不能超过100个字符") + } + if req.EvaluatorInfo.Vendor != nil && len(*req.EvaluatorInfo.Vendor) > 100 { + return errors.New("供应商长度不能超过100个字符") + } + if req.EvaluatorInfo.VendorURL != nil && len(*req.EvaluatorInfo.VendorURL) > 500 { + return errors.New("供应商链接长度不能超过500个字符") + } + if req.EvaluatorInfo.UserManualURL != nil && len(*req.EvaluatorInfo.UserManualURL) > 500 { + return errors.New("用户手册链接长度不能超过500个字符") + } + } // 验证评估器类型和内容匹配 if req.EvaluatorType == entity.EvaluatorTypePrompt && req.PromptEvaluatorContent == nil { @@ -306,20 +306,20 @@ func (s *EvaluatorTemplateServiceImpl) validateUpdateRequest(req *entity.UpdateE if req.Description != nil && len(*req.Description) > 500 { return errors.New("模板描述长度不能超过500个字符") } - if req.EvaluatorInfo != nil { - if req.EvaluatorInfo.Benchmark != "" && len(req.EvaluatorInfo.Benchmark) > 100 { - return errors.New("基准长度不能超过100个字符") - } - if req.EvaluatorInfo.Vendor != "" && len(req.EvaluatorInfo.Vendor) > 100 { - return errors.New("供应商长度不能超过100个字符") - } - if req.EvaluatorInfo.VendorURL != "" && len(req.EvaluatorInfo.VendorURL) > 500 { - return errors.New("供应商链接长度不能超过500个字符") - } - if req.EvaluatorInfo.UserManualURL != "" && len(req.EvaluatorInfo.UserManualURL) > 500 { - return errors.New("用户手册链接长度不能超过500个字符") - } - } + if req.EvaluatorInfo != nil { + if req.EvaluatorInfo.Benchmark != nil && len(*req.EvaluatorInfo.Benchmark) > 100 { + return errors.New("基准长度不能超过100个字符") + } + if req.EvaluatorInfo.Vendor != nil && len(*req.EvaluatorInfo.Vendor) > 100 { + return errors.New("供应商长度不能超过100个字符") + } + if req.EvaluatorInfo.VendorURL != nil && len(*req.EvaluatorInfo.VendorURL) > 500 { + return errors.New("供应商链接长度不能超过500个字符") + } + if req.EvaluatorInfo.UserManualURL != nil && len(*req.EvaluatorInfo.UserManualURL) > 500 { + return errors.New("用户手册链接长度不能超过500个字符") + } + } return nil } diff --git a/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go b/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go index 5b790ac45..45fbe56b4 100644 --- a/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go +++ b/backend/modules/evaluation/domain/service/evaluator_template_impl_test.go @@ -25,12 +25,12 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { t.Parallel() tests := []struct { - name string - req *entity.CreateEvaluatorTemplateRequest - mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) - expectedError bool + name string + req *entity.CreateEvaluatorTemplateRequest + mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) + expectedError bool expectedErrCode int32 - description string + description string }{ { name: "成功 - 创建Prompt类型模板", @@ -58,20 +58,20 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { }) }, expectedError: false, - description: "成功创建Prompt类型评估器模板", + description: "成功创建Prompt类型评估器模板", }, { name: "成功 - 创建Code类型模板", - req: &entity.CreateEvaluatorTemplateRequest{ + req: &entity.CreateEvaluatorTemplateRequest{ SpaceID: 100, Name: "Test Template", Description: "Test Description", EvaluatorType: entity.EvaluatorTypeCode, - CodeEvaluatorContent: &entity.CodeEvaluatorContent{ - Lang2CodeContent: map[entity.LanguageType]string{ - entity.LanguageTypePython: "def evaluate(): pass", - }, - }, + CodeEvaluatorContent: &entity.CodeEvaluatorContent{ + Lang2CodeContent: map[entity.LanguageType]string{ + entity.LanguageTypePython: "def evaluate(): pass", + }, + }, }, mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { mockRepo.EXPECT(). @@ -82,7 +82,7 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { }) }, expectedError: false, - description: "成功创建Code类型评估器模板", + description: "成功创建Code类型评估器模板", }, { name: "失败 - 无效的SpaceID", @@ -91,10 +91,10 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { Name: "Test Template", EvaluatorType: entity.EvaluatorTypePrompt, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "无效的空间ID应该返回错误", + description: "无效的空间ID应该返回错误", }, { name: "失败 - 空的模板名称", @@ -103,10 +103,10 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { Name: "", EvaluatorType: entity.EvaluatorTypePrompt, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "空的模板名称应该返回错误", + description: "空的模板名称应该返回错误", }, { name: "失败 - 模板名称过长", @@ -118,10 +118,10 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { MessageList: []*entity.Message{}, }, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "模板名称长度超过100应该返回错误", + description: "模板名称长度超过100应该返回错误", }, { name: "失败 - Prompt类型缺少PromptEvaluatorContent", @@ -130,10 +130,10 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { Name: "Test Template", EvaluatorType: entity.EvaluatorTypePrompt, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "Prompt类型评估器缺少PromptEvaluatorContent应该返回错误", + description: "Prompt类型评估器缺少PromptEvaluatorContent应该返回错误", }, { name: "失败 - Code类型缺少CodeEvaluatorContent", @@ -142,10 +142,10 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { Name: "Test Template", EvaluatorType: entity.EvaluatorTypeCode, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "Code类型评估器缺少CodeEvaluatorContent应该返回错误", + description: "Code类型评估器缺少CodeEvaluatorContent应该返回错误", }, { name: "失败 - 用户ID缺失", @@ -157,10 +157,10 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { MessageList: []*entity.Message{}, }, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "用户ID缺失应该返回错误", + description: "用户ID缺失应该返回错误", }, { name: "失败 - repo创建错误", @@ -177,9 +177,9 @@ func TestEvaluatorTemplateServiceImpl_CreateEvaluatorTemplate(t *testing.T) { CreateEvaluatorTemplate(gomock.Any(), gomock.Any()). Return(nil, errors.New("repo error")) }, - expectedError: true, + expectedError: true, expectedErrCode: errno.CommonInternalErrorCode, - description: "repo创建错误应该返回内部错误", + description: "repo创建错误应该返回内部错误", }, } @@ -226,12 +226,12 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { t.Parallel() tests := []struct { - name string - req *entity.UpdateEvaluatorTemplateRequest - mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) - expectedError bool + name string + req *entity.UpdateEvaluatorTemplateRequest + mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) + expectedError bool expectedErrCode int32 - description string + description string }{ { name: "成功 - 更新模板名称", @@ -241,9 +241,9 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { }, mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { existingTemplate := &entity.EvaluatorTemplate{ - ID: 1, - SpaceID: 100, - Name: "Original Template", + ID: 1, + SpaceID: 100, + Name: "Original Template", BaseInfo: &entity.BaseInfo{}, } mockRepo.EXPECT(). @@ -257,21 +257,21 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { }) }, expectedError: false, - description: "成功更新评估器模板名称", + description: "成功更新评估器模板名称", }, { name: "成功 - 更新多个字段", - req: &entity.UpdateEvaluatorTemplateRequest{ - ID: 1, - Name: gptr.Of("Updated Template"), - Description: gptr.Of("Updated Description"), - EvaluatorInfo: &entity.EvaluatorInfo{Benchmark: "benchmark1", Vendor: "vendor1"}, + req: &entity.UpdateEvaluatorTemplateRequest{ + ID: 1, + Name: gptr.Of("Updated Template"), + Description: gptr.Of("Updated Description"), + EvaluatorInfo: &entity.EvaluatorInfo{Benchmark: gptr.Of("benchmark1"), Vendor: gptr.Of("vendor1")}, }, mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { existingTemplate := &entity.EvaluatorTemplate{ - ID: 1, - SpaceID: 100, - Name: "Original Template", + ID: 1, + SpaceID: 100, + Name: "Original Template", BaseInfo: &entity.BaseInfo{}, } mockRepo.EXPECT(). @@ -285,17 +285,17 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { }) }, expectedError: false, - description: "成功更新多个字段", + description: "成功更新多个字段", }, { name: "失败 - 无效的模板ID", req: &entity.UpdateEvaluatorTemplateRequest{ ID: 0, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "无效的模板ID应该返回错误", + description: "无效的模板ID应该返回错误", }, { name: "失败 - 空的模板名称", @@ -303,10 +303,10 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { ID: 1, Name: gptr.Of(""), }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "空的模板名称应该返回错误", + description: "空的模板名称应该返回错误", }, { name: "失败 - 模板名称过长", @@ -314,10 +314,10 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { ID: 1, Name: gptr.Of(string(make([]byte, 101))), }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "模板名称长度超过100应该返回错误", + description: "模板名称长度超过100应该返回错误", }, { name: "失败 - 用户ID缺失", @@ -325,10 +325,10 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { ID: 1, Name: gptr.Of("Updated Template"), }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "用户ID缺失应该返回错误", + description: "用户ID缺失应该返回错误", }, { name: "失败 - 模板不存在", @@ -341,9 +341,9 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { GetEvaluatorTemplate(gomock.Any(), int64(1), false). Return(nil, nil) }, - expectedError: true, + expectedError: true, expectedErrCode: errno.ResourceNotFoundCode, - description: "模板不存在应该返回错误", + description: "模板不存在应该返回错误", }, { name: "失败 - 获取模板错误", @@ -356,9 +356,9 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { GetEvaluatorTemplate(gomock.Any(), int64(1), false). Return(nil, errors.New("repo error")) }, - expectedError: true, + expectedError: true, expectedErrCode: errno.CommonInternalErrorCode, - description: "获取模板错误应该返回内部错误", + description: "获取模板错误应该返回内部错误", }, { name: "失败 - 更新模板错误", @@ -368,9 +368,9 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { }, mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { existingTemplate := &entity.EvaluatorTemplate{ - ID: 1, - SpaceID: 100, - Name: "Original Template", + ID: 1, + SpaceID: 100, + Name: "Original Template", BaseInfo: &entity.BaseInfo{}, } mockRepo.EXPECT(). @@ -381,9 +381,9 @@ func TestEvaluatorTemplateServiceImpl_UpdateEvaluatorTemplate(t *testing.T) { UpdateEvaluatorTemplate(gomock.Any(), gomock.Any()). Return(nil, errors.New("repo error")) }, - expectedError: true, + expectedError: true, expectedErrCode: errno.CommonInternalErrorCode, - description: "更新模板错误应该返回内部错误", + description: "更新模板错误应该返回内部错误", }, } @@ -429,12 +429,12 @@ func TestEvaluatorTemplateServiceImpl_DeleteEvaluatorTemplate(t *testing.T) { t.Parallel() tests := []struct { - name string - req *entity.DeleteEvaluatorTemplateRequest - mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) - expectedError bool + name string + req *entity.DeleteEvaluatorTemplateRequest + mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) + expectedError bool expectedErrCode int32 - description string + description string }{ { name: "成功 - 删除模板", @@ -443,7 +443,7 @@ func TestEvaluatorTemplateServiceImpl_DeleteEvaluatorTemplate(t *testing.T) { }, mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { existingTemplate := &entity.EvaluatorTemplate{ - ID: 1, + ID: 1, SpaceID: 100, } mockRepo.EXPECT(). @@ -455,27 +455,27 @@ func TestEvaluatorTemplateServiceImpl_DeleteEvaluatorTemplate(t *testing.T) { Return(nil) }, expectedError: false, - description: "成功删除评估器模板", + description: "成功删除评估器模板", }, { name: "失败 - 无效的模板ID", req: &entity.DeleteEvaluatorTemplateRequest{ ID: 0, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "无效的模板ID应该返回错误", + description: "无效的模板ID应该返回错误", }, { name: "失败 - 用户ID缺失", req: &entity.DeleteEvaluatorTemplateRequest{ ID: 1, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "用户ID缺失应该返回错误", + description: "用户ID缺失应该返回错误", }, { name: "失败 - 模板不存在", @@ -487,9 +487,9 @@ func TestEvaluatorTemplateServiceImpl_DeleteEvaluatorTemplate(t *testing.T) { GetEvaluatorTemplate(gomock.Any(), int64(1), false). Return(nil, nil) }, - expectedError: true, + expectedError: true, expectedErrCode: errno.ResourceNotFoundCode, - description: "模板不存在应该返回错误", + description: "模板不存在应该返回错误", }, { name: "失败 - 获取模板错误", @@ -501,9 +501,9 @@ func TestEvaluatorTemplateServiceImpl_DeleteEvaluatorTemplate(t *testing.T) { GetEvaluatorTemplate(gomock.Any(), int64(1), false). Return(nil, errors.New("repo error")) }, - expectedError: true, + expectedError: true, expectedErrCode: errno.CommonInternalErrorCode, - description: "获取模板错误应该返回内部错误", + description: "获取模板错误应该返回内部错误", }, { name: "失败 - 删除模板错误", @@ -512,7 +512,7 @@ func TestEvaluatorTemplateServiceImpl_DeleteEvaluatorTemplate(t *testing.T) { }, mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { existingTemplate := &entity.EvaluatorTemplate{ - ID: 1, + ID: 1, SpaceID: 100, } mockRepo.EXPECT(). @@ -523,9 +523,9 @@ func TestEvaluatorTemplateServiceImpl_DeleteEvaluatorTemplate(t *testing.T) { DeleteEvaluatorTemplate(gomock.Any(), int64(1), "user123"). Return(errors.New("repo error")) }, - expectedError: true, + expectedError: true, expectedErrCode: errno.CommonInternalErrorCode, - description: "删除模板错误应该返回内部错误", + description: "删除模板错误应该返回内部错误", }, } @@ -568,12 +568,12 @@ func TestEvaluatorTemplateServiceImpl_GetEvaluatorTemplate(t *testing.T) { t.Parallel() tests := []struct { - name string - req *entity.GetEvaluatorTemplateRequest - mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) - expectedError bool + name string + req *entity.GetEvaluatorTemplateRequest + mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) + expectedError bool expectedErrCode int32 - description string + description string }{ { name: "成功 - 获取模板", @@ -591,12 +591,12 @@ func TestEvaluatorTemplateServiceImpl_GetEvaluatorTemplate(t *testing.T) { Return(mockTemplate, nil) }, expectedError: false, - description: "成功获取评估器模板", + description: "成功获取评估器模板", }, { name: "成功 - 包含已删除记录", req: &entity.GetEvaluatorTemplateRequest{ - ID: 1, + ID: 1, IncludeDeleted: true, }, mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { @@ -610,17 +610,17 @@ func TestEvaluatorTemplateServiceImpl_GetEvaluatorTemplate(t *testing.T) { Return(mockTemplate, nil) }, expectedError: false, - description: "成功获取已删除的模板", + description: "成功获取已删除的模板", }, { name: "失败 - 无效的模板ID", req: &entity.GetEvaluatorTemplateRequest{ ID: 0, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "无效的模板ID应该返回错误", + description: "无效的模板ID应该返回错误", }, { name: "失败 - 模板不存在", @@ -632,9 +632,9 @@ func TestEvaluatorTemplateServiceImpl_GetEvaluatorTemplate(t *testing.T) { GetEvaluatorTemplate(gomock.Any(), int64(1), false). Return(nil, nil) }, - expectedError: true, + expectedError: true, expectedErrCode: errno.ResourceNotFoundCode, - description: "模板不存在应该返回错误", + description: "模板不存在应该返回错误", }, { name: "失败 - 获取模板错误", @@ -646,9 +646,9 @@ func TestEvaluatorTemplateServiceImpl_GetEvaluatorTemplate(t *testing.T) { GetEvaluatorTemplate(gomock.Any(), int64(1), false). Return(nil, errors.New("repo error")) }, - expectedError: true, + expectedError: true, expectedErrCode: errno.CommonInternalErrorCode, - description: "获取模板错误应该返回内部错误", + description: "获取模板错误应该返回内部错误", }, } @@ -687,13 +687,13 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { t.Parallel() tests := []struct { - name string - req *entity.ListEvaluatorTemplateRequest - mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) - expectedError bool - expectedErrCode int32 + name string + req *entity.ListEvaluatorTemplateRequest + mockSetup func(mockRepo *repomocks.MockEvaluatorTemplateRepo) + expectedError bool + expectedErrCode int32 expectedTotalPages int32 - description string + description string }{ { name: "成功 - 正常查询", @@ -718,9 +718,9 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { }, }, nil) }, - expectedError: false, + expectedError: false, expectedTotalPages: 3, // (25 + 10 - 1) / 10 = 3 - description: "成功查询评估器模板列表", + description: "成功查询评估器模板列表", }, { name: "成功 - 包含筛选条件", @@ -746,16 +746,16 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { }, }, nil) }, - expectedError: false, + expectedError: false, expectedTotalPages: 1, // (5 + 10 - 1) / 10 = 1 - description: "成功查询带筛选条件的模板列表", + description: "成功查询带筛选条件的模板列表", }, { name: "成功 - 包含已删除记录", req: &entity.ListEvaluatorTemplateRequest{ - SpaceID: 100, - PageSize: 10, - PageNum: 1, + SpaceID: 100, + PageSize: 10, + PageNum: 1, IncludeDeleted: true, }, mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) { @@ -773,9 +773,9 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { }, }, nil) }, - expectedError: false, + expectedError: false, expectedTotalPages: 1, - description: "成功查询包含已删除记录的模板列表", + description: "成功查询包含已删除记录的模板列表", }, { name: "失败 - 无效的分页大小（为0）", @@ -784,10 +784,10 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { PageSize: 0, PageNum: 1, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "无效的分页大小应该返回错误", + description: "无效的分页大小应该返回错误", }, { name: "失败 - 分页大小超过100", @@ -796,10 +796,10 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { PageSize: 101, PageNum: 1, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "分页大小超过100应该返回错误", + description: "分页大小超过100应该返回错误", }, { name: "失败 - 无效的页码", @@ -808,10 +808,10 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { PageSize: 10, PageNum: 0, }, - mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, - expectedError: true, + mockSetup: func(mockRepo *repomocks.MockEvaluatorTemplateRepo) {}, + expectedError: true, expectedErrCode: errno.CommonInvalidParamCode, - description: "无效的页码应该返回错误", + description: "无效的页码应该返回错误", }, { name: "失败 - repo查询错误", @@ -825,9 +825,9 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { ListEvaluatorTemplate(gomock.Any(), gomock.Any()). Return(nil, errors.New("repo error")) }, - expectedError: true, + expectedError: true, expectedErrCode: errno.CommonInternalErrorCode, - description: "repo查询错误应该返回内部错误", + description: "repo查询错误应该返回内部错误", }, { name: "成功 - 计算总页数（整除）", @@ -846,9 +846,9 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { }, }, nil) }, - expectedError: false, + expectedError: false, expectedTotalPages: 2, // 20 / 10 = 2 - description: "正确计算总页数（整除）", + description: "正确计算总页数（整除）", }, { name: "成功 - 计算总页数（不整除）", @@ -867,9 +867,9 @@ func TestEvaluatorTemplateServiceImpl_ListEvaluatorTemplate(t *testing.T) { }, }, nil) }, - expectedError: false, + expectedError: false, expectedTotalPages: 3, // (21 + 10 - 1) / 10 = 3 - description: "正确计算总页数（不整除）", + description: "正确计算总页数（不整除）", }, } diff --git a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go index bd69017cb..697ac4dc0 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/evaluator_impl_test.go @@ -2142,13 +2142,13 @@ func TestEvaluatorRepoImpl_UpdateBuiltinEvaluatorMeta(t *testing.T) { } err := repo.UpdateEvaluatorMeta(context.Background(), &entity.UpdateEvaluatorMetaRequest{ - ID: tt.id, - SpaceID: 100, // 使用测试用的spaceID - Name: gptr.Of(""), - Description: gptr.Of(""), + ID: tt.id, + SpaceID: 100, // 使用测试用的spaceID + Name: gptr.Of(""), + Description: gptr.Of(""), EvaluatorInfo: &entity.EvaluatorInfo{ - Benchmark: tt.benchmark, - Vendor: tt.vendor, + Benchmark: gptr.Of(tt.benchmark), + Vendor: gptr.Of(tt.vendor), }, UpdatedBy: tt.userID, }) @@ -2586,13 +2586,13 @@ func TestEvaluatorRepoImpl_UpdateEvaluatorTags(t *testing.T) { t.Parallel() tests := []struct { - name string - evaluatorID int64 - tags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string - mockSetup func() + name string + evaluatorID int64 + tags map[entity.EvaluatorTagLangType]map[entity.EvaluatorTagKey][]string + mockSetup func() mockSetupWithMocks func(idgen *idgenmocks.MockIIDGenerator, evaluatorDAO *evaluatormocks.MockEvaluatorDAO, evaluatorVersionDAO *evaluatormocks.MockEvaluatorVersionDAO, tagDAO *evaluatormocks.MockEvaluatorTagDAO, dbProvider *dbmocks.MockProvider, lwt *platestwritemocks.MockILatestWriteTracker, templateDAO *evaluatormocks.MockEvaluatorTemplateDAO) - expectedError error - description string + expectedError error + description string }{ { name: "成功 - 新增标签", @@ -2960,4 +2960,3 @@ func TestEvaluatorRepoImpl_UpdateEvaluatorTags(t *testing.T) { }) } } - diff --git a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go index 5aa17f8a6..4175050aa 100644 --- a/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go +++ b/backend/modules/evaluation/infra/repo/evaluator/mysql/convertor/evaluator_template_test.go @@ -50,7 +50,7 @@ func TestConvertEvaluatorTemplateDO2PO(t *testing.T) { EvaluatorType: evaluatordo.EvaluatorTypePrompt, ReceiveChatHistory: gptr.Of(true), Popularity: 100, - EvaluatorInfo: &evaluatordo.EvaluatorInfo{Benchmark: "benchmark1", Vendor: "vendor1", VendorURL: "u1", UserManualURL: "m1"}, + EvaluatorInfo: &evaluatordo.EvaluatorInfo{Benchmark: gptr.Of("benchmark1"), Vendor: gptr.Of("vendor1"), VendorURL: gptr.Of("u1"), UserManualURL: gptr.Of("m1")}, BaseInfo: &evaluatordo.BaseInfo{ CreatedBy: &evaluatordo.UserInfo{ UserID: ptr.Of("user1"), @@ -77,10 +77,10 @@ func TestConvertEvaluatorTemplateDO2PO(t *testing.T) { if assert.NotNil(t, po.EvaluatorInfo) { var info evaluatordo.EvaluatorInfo _ = json.Unmarshal(*po.EvaluatorInfo, &info) - assert.Equal(t, "benchmark1", info.Benchmark) - assert.Equal(t, "vendor1", info.Vendor) - assert.Equal(t, "u1", info.VendorURL) - assert.Equal(t, "m1", info.UserManualURL) + assert.Equal(t, "benchmark1", gptr.Indirect(info.Benchmark)) + assert.Equal(t, "vendor1", gptr.Indirect(info.Vendor)) + assert.Equal(t, "u1", gptr.Indirect(info.VendorURL)) + assert.Equal(t, "m1", gptr.Indirect(info.UserManualURL)) } assert.Equal(t, "user1", po.CreatedBy) assert.Equal(t, "user1", po.UpdatedBy) @@ -250,10 +250,10 @@ func TestConvertEvaluatorTemplatePO2DO(t *testing.T) { assert.True(t, gptr.Indirect(do.ReceiveChatHistory)) assert.Equal(t, int64(100), do.Popularity) if assert.NotNil(t, do.EvaluatorInfo) { - assert.Equal(t, "benchmark1", do.EvaluatorInfo.Benchmark) - assert.Equal(t, "vendor1", do.EvaluatorInfo.Vendor) - assert.Equal(t, "u1", do.EvaluatorInfo.VendorURL) - assert.Equal(t, "m1", do.EvaluatorInfo.UserManualURL) + assert.Equal(t, "benchmark1", gptr.Indirect(do.EvaluatorInfo.Benchmark)) + assert.Equal(t, "vendor1", gptr.Indirect(do.EvaluatorInfo.Vendor)) + assert.Equal(t, "u1", gptr.Indirect(do.EvaluatorInfo.VendorURL)) + assert.Equal(t, "m1", gptr.Indirect(do.EvaluatorInfo.UserManualURL)) } assert.NotNil(t, do.Tags) },