From f7f060c42371c64c600b10b2964b8758e9112e19 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 14 Oct 2022 10:08:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=94=99=E8=BF=94=E5=9B=9E=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/aisafety.go | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/routers/repo/aisafety.go b/routers/repo/aisafety.go index dde89dfab..1320ad0db 100644 --- a/routers/repo/aisafety.go +++ b/routers/repo/aisafety.go @@ -977,6 +977,7 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error { ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.GPUBaseDataSetUUID ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.GPUCombatDataSetName ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.GPUCombatDataSetUUID + prepareCloudbrainOneSpecs(ctx) } else { ctx.Data["engine_id"] = ctx.QueryInt("engine_id") ctx.Data["pool_id"] = ctx.Query("pool_id") @@ -988,11 +989,20 @@ func modelSafetyNewDataPrepare(ctx *context.Context) error { ctx.Data["BaseDataSetUUID"] = setting.ModelSafetyTest.NPUBaseDataSetUUID ctx.Data["CombatDataSetName"] = setting.ModelSafetyTest.NPUCombatDataSetName ctx.Data["CombatDataSetUUID"] = setting.ModelSafetyTest.NPUCombatDataSetUUID - } - prepareCloudbrainOneSpecs(ctx) + var engines modelarts.Engine + if err := json.Unmarshal([]byte(setting.Engines), &engines); err != nil { + ctx.ServerError("json.Unmarshal failed:", err) + } + ctx.Data["engines"] = engines.Info - prepareCloudbrainTwoInferenceSpecs(ctx) + var versionInfos modelarts.VersionInfo + if err := json.Unmarshal([]byte(setting.EngineVersions), &versionInfos); err != nil { + ctx.ServerError("json.Unmarshal failed:", err) + } + ctx.Data["engine_versions"] = versionInfos.Version + prepareCloudbrainTwoInferenceSpecs(ctx) + } return nil }