diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 036c25264..dea53e619 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -315,7 +315,7 @@ type Location struct { } type NotebookResult struct { - ErrorCode string `json:"error_code"` + ErrorCode int `json:"error_code"` ErrorMsg string `json:"error_msg"` } diff --git a/modules/modelarts/resty.go b/modules/modelarts/resty.go index 95ad94d31..8f83990e0 100755 --- a/modules/modelarts/resty.go +++ b/modules/modelarts/resty.go @@ -106,12 +106,6 @@ sendjob: return nil, fmt.Errorf("resty create job: %s", err) } - if res.StatusCode() == http.StatusUnauthorized && retry < 1 { - retry++ - _ = getToken() - goto sendjob - } - var response models.NotebookResult err = json.Unmarshal(res.Body(), &response) if err != nil { @@ -119,7 +113,13 @@ sendjob: return &result, fmt.Errorf("son.Unmarshal failed: %s", err.Error()) } - if len(response.ErrorCode) != 0 { + if response.ErrorCode == http.StatusUnauthorized && retry < 1 { + retry++ + _ = getToken() + goto sendjob + } + + if response.ErrorCode != 0 { log.Error("CreateJob failed(%s): %s", response.ErrorCode, response.ErrorMsg) return &result, fmt.Errorf("CreateJob failed(%s): %s", response.ErrorCode, response.ErrorMsg) } @@ -145,14 +145,6 @@ sendjob: return nil, fmt.Errorf("resty GetJob: %v", err) } - if res.StatusCode() == http.StatusUnauthorized && retry < 1 { - retry++ - _ = getToken() - goto sendjob - } - - log.Info(string(res.Body())) - var response models.NotebookResult err = json.Unmarshal(res.Body(), &response) if err != nil { @@ -160,7 +152,13 @@ sendjob: return &result, fmt.Errorf("son.Unmarshal failed: %s", err.Error()) } - if len(response.ErrorCode) != 0 { + if response.ErrorCode == http.StatusUnauthorized && retry < 1 { + retry++ + _ = getToken() + goto sendjob + } + + if response.ErrorCode != 0 { log.Error("GetJob failed(%s): %s", response.ErrorCode, response.ErrorMsg) return &result, fmt.Errorf("GetJob failed(%s): %s", response.ErrorCode, response.ErrorMsg) } @@ -187,12 +185,6 @@ sendjob: return &result, fmt.Errorf("resty StopJob: %v", err) } - if res.StatusCode() == http.StatusUnauthorized && retry < 1 { - retry++ - _ = getToken() - goto sendjob - } - var response models.NotebookResult err = json.Unmarshal(res.Body(), &response) if err != nil { @@ -200,7 +192,13 @@ sendjob: return &result, fmt.Errorf("son.Unmarshal failed: %s", err.Error()) } - if len(response.ErrorCode) != 0 { + if response.ErrorCode == http.StatusUnauthorized && retry < 1 { + retry++ + _ = getToken() + goto sendjob + } + + if response.ErrorCode != 0 { log.Error("StopJob failed(%s): %s", response.ErrorCode, response.ErrorMsg) return &result, fmt.Errorf("StopJob failed(%s): %s", response.ErrorCode, response.ErrorMsg) } @@ -226,12 +224,6 @@ sendjob: return &result, fmt.Errorf("resty DelJob: %v", err) } - if res.StatusCode() == http.StatusUnauthorized && retry < 1 { - retry++ - _ = getToken() - goto sendjob - } - var response models.NotebookResult err = json.Unmarshal(res.Body(), &response) if err != nil { @@ -239,7 +231,13 @@ sendjob: return &result, fmt.Errorf("son.Unmarshal failed: %s", err.Error()) } - if len(response.ErrorCode) != 0 { + if response.ErrorCode == http.StatusUnauthorized && retry < 1 { + retry++ + _ = getToken() + goto sendjob + } + + if response.ErrorCode != 0 { log.Error("DelJob failed(%s): %s", response.ErrorCode, response.ErrorMsg) return &result, fmt.Errorf("DelJob failed(%s): %s", response.ErrorCode, response.ErrorMsg) } @@ -265,12 +263,6 @@ sendjob: return &result, fmt.Errorf("resty GetJobToken: %v", err) } - if res.StatusCode() == http.StatusUnauthorized && retry < 1 { - retry++ - _ = getToken() - goto sendjob - } - var response models.NotebookResult err = json.Unmarshal(res.Body(), &response) if err != nil { @@ -278,7 +270,13 @@ sendjob: return &result, fmt.Errorf("son.Unmarshal failed: %s", err.Error()) } - if len(response.ErrorCode) != 0 { + if response.ErrorCode == http.StatusUnauthorized && retry < 1 { + retry++ + _ = getToken() + goto sendjob + } + + if response.ErrorCode != 0 { log.Error("GetJobToken failed(%s): %s", response.ErrorCode, response.ErrorMsg) return &result, fmt.Errorf("GetJobToken failed(%s): %s", response.ErrorCode, response.ErrorMsg) } diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index d23ef3c05..a893bf21b 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -165,11 +165,6 @@ func ModelArtsDebug(ctx *context.Context) { } urlPrefix := result.Spec.Annotations.TargetDomain + "/modelarts/internal/hub/notebook/user/" + task.JobID - - //https://console.ai.pcl.cn/modelarts/internal/hub/notebook/user/DE-afcdf674-6489-11eb-bfe7-0255ac100057/lab - //debugUrl := setting.DebugServerHost + "jpylab_" + task.JobID + "_" + task.SubTaskName - //debugUrl := setting.ModelArtsHost + "/modelarts/internal/hub/notebook/user/" + task.JobID + "/lab" - //debugUrl := "https://console.ai.pcl.cn/modelarts/internal/hub/notebook/user/" + task.JobID + "/lab" debugUrl := urlPrefix + "?token=" + res.Token ctx.Redirect(debugUrl) }