#4134 fix-3914 fix-4090

Merged
zouap merged 3 commits from fix-3812 into V20230517 1 year ago
  1. +20
    -1
      routers/repo/grampus.go
  2. +16
    -0
      templates/repo/grampus/notebook/show.tmpl
  3. +2
    -2
      web_src/js/features/cloudbrainShow.js
  4. +11873
    -11873
      yarn.lock

+ 20
- 1
routers/repo/grampus.go View File

@@ -1752,15 +1752,34 @@ func GrampusDebugJobEvents(ctx *context.Context) {
return
}

var grampusJobEvent models.GrampusJobEvents
getJobResult, err := grampus.GetJob(job.JobID)
if err != nil {
log.Error("GetJob(%s) failed:%v", job.JobName, err)
}
if getJobResult != nil {
grampusJobEvent.Reason = getJobResult.ExitDiagnostics
}
jobExitEvent := models.GetGrampusDebugJobEventsResponse{
NotebookEvents: []models.GrampusJobEvents{
grampusJobEvent,
},
}

result, err := grampus.GetDebugJobEvents(job.JobID)
if err != nil {
log.Error("GetDebugJobEvents failed: %v", err, ctx.Data["MsgID"])
ctx.JSON(http.StatusOK, map[string]interface{}{
"JobID": ID,
"JobEvents": jobExitEvent,
})
return
}
result.NotebookEvents = append(result.NotebookEvents, grampusJobEvent)
ctx.JSON(http.StatusOK, map[string]interface{}{
"JobID": ID,
"JobEvents": result.NotebookEvents,
})

return
}



+ 16
- 0
templates/repo/grampus/notebook/show.tmpl View File

@@ -52,6 +52,7 @@
<div class="content-pad">
<div class="ui pointing secondary menu" style="border-bottom: 1px solid rgba(34,36,38,.15);">
<a class="active item" data-tab="first">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
<a class="item run_info" data-tab="five" data-version="{{.VersionName}}">{{$.i18n.Tr "repo.cloudbrain.runinfo"}}</a>
</div>
<div class="ui tab active" data-tab="first">
<div style="padding-top: 10px;">
@@ -390,7 +391,21 @@
</div>
</div>
</div>
<div class="ui tab" data-tab="five">
<div style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
<div class="ui attached info" id="info{{.VersionName}}"
style="height: 300px !important; overflow: auto;">
<div class="ui inverted active dimmer">
<div class="ui loader"></div>
</div>
<span class="info_text">
</span>
</div>

</div>

</div>

</div>
</div>
@@ -424,6 +439,7 @@
{{template "base/footer" .}}
<script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
<script>
$('.menu .item').tab()
;(function() {
var SPEC = {{ .Spec }};
var showPoint = false;


+ 2
- 2
web_src/js/features/cloudbrainShow.js View File

@@ -375,9 +375,9 @@ export default async function initCloudrainSow() {
if (jsonObj != null){
let podEventArray = jsonObj['JobEvents'];
if(podEventArray != null){
for(var i=0; i < podEventArray.length;i++){
for(let i=0; i < podEventArray.length;i++){
if (podEventArray[i]["reason"] != "") {
let time = new Date(podEventArray[i]["timestamp"])
let time = podEventArray[i]["timestamp"]&&new Date(podEventArray[i]["timestamp"])
html += `<p><b>[${podEventArray[i]["reason"]}]</b> <span>${time.toLocaleString()}</span></p>`
html += `<p>${podEventArray[i]["message"]}</p>`;
}


+ 11873
- 11873
yarn.lock
File diff suppressed because it is too large
View File


Loading…
Cancel
Save