From 5df155e1e23d21bf4e672311135ebbc3b48f2ecc Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 12 Jul 2022 16:19:32 +0800 Subject: [PATCH] fix issue --- templates/repo/cloudbrain/inference/new.tmpl | 61 +++++++++++++++++++++++-- templates/repo/modelarts/inferencejob/new.tmpl | 63 ++++++++++++++++++++++++-- 2 files changed, 116 insertions(+), 8 deletions(-) diff --git a/templates/repo/cloudbrain/inference/new.tmpl b/templates/repo/cloudbrain/inference/new.tmpl index cf22b7a80..879f733ec 100644 --- a/templates/repo/cloudbrain/inference/new.tmpl +++ b/templates/repo/cloudbrain/inference/new.tmpl @@ -281,6 +281,8 @@ let nameMap,nameList // 获取模型列表和模型名称对应的模型版本 $.get(`${RepoLink}/modelmanage/query_model_for_predict?type=0`, (data) => { + modelVersion() + modelCkpt() nameMap = data.nameMap nameList = data.nameList let html = '' @@ -298,7 +300,7 @@ $('#select_model').removeClass("loading") }) // 根据选中的模型名称获取相应的模型版本 - $(function(){ + function modelVersion(){ $('#select_model').dropdown({ onChange: function(value, text, $selectedItem) { $("#select_model_version").addClass("loading") @@ -317,9 +319,29 @@ $("#select_model_version").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child')) } }) - }) + } + // $(function(){ + // $('#select_model').dropdown({ + // onChange: function(value, text, $selectedItem) { + // $("#select_model_version").addClass("loading") + // $('#model_name_version').empty() + // let html = '' + // nameMap[value].forEach(element => { + // let {TrainTaskInfo} = element + // TrainTaskInfo = JSON.parse(TrainTaskInfo) + // html += `
${element.Version}
` + // }); + // $('#model_name_version').append(html) + // $("#select_model_version").removeClass("loading") + // const initVersionText = $('#model_name_version div.item:first-child').text() + // const initVersionValue = $('#model_name_version div.item:first-child').data('value') + // $("#select_model_version").dropdown('set text',initVersionText) + // $("#select_model_version").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child')) + // } + // }) + // }) // 根据选中的模型版本获取相应的模型权重文件 - $(function(){ + function modelCkpt(){ $('#select_model_version').dropdown({ onChange: function(value, text, $selectedItem) { const dataID = $selectedItem[0].getAttribute("data-id") @@ -349,7 +371,38 @@ $("input#ai_model_label").val(label) } }) - }) + } + // $(function(){ + // $('#select_model_version').dropdown({ + // onChange: function(value, text, $selectedItem) { + // const dataID = $selectedItem[0].getAttribute("data-id") + // const label = $selectedItem[0].getAttribute("data-label") + // $("#select_model_checkpoint").addClass("loading") + // $("#model_checkpoint").empty() + // let html = '' + // loadCheckpointList(dataID).then((res)=>{ + // res.forEach(element => { + // const ckptSuffix = element.FileName.split(".") + // const loadCheckpointFile = ['ckpt','pb','h5','json','pkl','pth','t7'] + // if(!element.IsDir && loadCheckpointFile.includes(ckptSuffix[ckptSuffix.length-1])){ + // html += `
${element.FileName}
` + // } + + // }) + // $('#model_checkpoint').append(html) + // $("#select_model_checkpoint").removeClass("loading") + // const initVersionText = $('#model_checkpoint div.item:first-child').text() + // const initVersionValue = $('#model_checkpoint div.item:first-child').data('value') + // $("#select_model_checkpoint").dropdown('set text',initVersionText) + // $("#select_model_checkpoint").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child')) + // }) + + + // $("input#ai_model_version").val(text) + // $("input#ai_model_label").val(label) + // } + // }) + // }) function loadCheckpointList(value){ return new Promise((resolve,reject)=>{ $.get(`${RepoLink}/modelmanage/query_modelfile_for_predict`,{ID:value}, (data) => { diff --git a/templates/repo/modelarts/inferencejob/new.tmpl b/templates/repo/modelarts/inferencejob/new.tmpl index 8d897186d..f9e82afd9 100644 --- a/templates/repo/modelarts/inferencejob/new.tmpl +++ b/templates/repo/modelarts/inferencejob/new.tmpl @@ -287,6 +287,8 @@ $(".ui.button").attr('href',url_href) // 获取模型列表和模型名称对应的模型版本 $.get(`${RepoLink}/modelmanage/query_model_for_predict?type=1`, (data) => { + modelVersion() + modelCkpt() nameMap = data.nameMap nameList = data.nameList let html = '' @@ -304,9 +306,10 @@ $('#select_model').removeClass("loading") }) // 根据选中的模型名称获取相应的模型版本 - $(function(){ + function modelVersion(){ $('#select_model').dropdown({ onChange: function(value, text, $selectedItem) { + console.log("-----------------") $("#select_model_version").addClass("loading") $('#model_name_version').empty() let html = '' @@ -323,9 +326,30 @@ $("#select_model_version").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child')) } }) - }) + } + // $(function(){ + // $('#select_model').dropdown({ + // onChange: function(value, text, $selectedItem) { + // console.log("-----------------") + // $("#select_model_version").addClass("loading") + // $('#model_name_version').empty() + // let html = '' + // nameMap[value].forEach(element => { + // let {TrainTaskInfo} = element + // TrainTaskInfo = JSON.parse(TrainTaskInfo) + // html += `
${element.Version}
` + // }); + // $('#model_name_version').append(html) + // $("#select_model_version").removeClass("loading") + // const initVersionText = $('#model_name_version div.item:first-child').text() + // const initVersionValue = $('#model_name_version div.item:first-child').data('value') + // $("#select_model_version").dropdown('set text',initVersionText) + // $("#select_model_version").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child')) + // } + // }) + // }) // 根据选中的模型版本获取相应的模型权重文件 - $(function(){ + function modelCkpt(){ $('#select_model_version').dropdown({ onChange: function(value, text, $selectedItem) { const dataID = $selectedItem[0].getAttribute("data-id") @@ -355,7 +379,38 @@ $("input#ai_model_label").val(label) } }) - }) + } + // $(function(){ + // $('#select_model_version').dropdown({ + // onChange: function(value, text, $selectedItem) { + // const dataID = $selectedItem[0].getAttribute("data-id") + // const label = $selectedItem[0].getAttribute("data-label") + // $("#select_model_checkpoint").addClass("loading") + // $("#model_checkpoint").empty() + // let html = '' + // loadCheckpointList(dataID).then((res)=>{ + // res.forEach(element => { + // const ckptSuffix = element.FileName.split(".") + // const loadCheckpointFile = ['ckpt','pb','h5','json','pkl','pth','t7'] + // if(!element.IsDir && loadCheckpointFile.includes(ckptSuffix[ckptSuffix.length-1])){ + // html += `
${element.FileName}
` + // } + + // }) + // $('#model_checkpoint').append(html) + // $("#select_model_checkpoint").removeClass("loading") + // const initVersionText = $('#model_checkpoint div.item:first-child').text() + // const initVersionValue = $('#model_checkpoint div.item:first-child').data('value') + // $("#select_model_checkpoint").dropdown('set text',initVersionText) + // $("#select_model_checkpoint").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child')) + // }) + + + // $("input#ai_model_version").val(text) + // $("input#ai_model_label").val(label) + // } + // }) + // }) function loadCheckpointList(value){ return new Promise((resolve,reject)=>{ $.get(`${RepoLink}/modelmanage/query_modelfile_for_predict`,{ID:value}, (data) => {