你确认删除该任务么？此任务一旦删除不可恢复。
+![\"\"](\"/user/avatar/")
"
+ var name = "";
+ if(record.ActUser != null){
+ name = record.ActUser.Name;
+ }else{
+ console.log("act user is null.");
+ }
+ html += " "
html += " "
- html += " " + record.ActUser.Name + ""
+ html += " " + name + ""
return html;
}
@@ -246,7 +306,14 @@ var actionNameZH={
"15":"重新开启了合并请求",
"17":"从 {repoName} 删除分支 {deleteBranchName}",
"22":"建议变更",
- "23":"评论了合并请求"
+ "23":"评论了合并请求",
+ "24":"上传了数据集文件",
+ "25":"创建了CPU/GPU类型调试任务",
+ "26":"创建了NPU类型调试任务",
+ "27":"创建了训练任务",
+ "28":"创建了推理任务",
+ "29":"创建了评测任务",
+ "30":"导入了新模型"
};
var actionNameEN={
@@ -264,7 +331,14 @@ var actionNameEN={
"15":" reopened pull request",
"17":" deleted branch {deleteBranchName} from {repoName}",
"22":" proposed changes",
- "23":" commented on pull request"
+ "23":" commented on pull request",
+ "24":" upload dataset ",
+ "25":" created CPU/GPU type debugging task ",
+ "26":" created NPU type debugging task ",
+ "27":" created training task",
+ "28":" created reasoning task",
+ "29":" created profiling task",
+ "30":" created new model"
};
var repoAndOrgZH={
@@ -392,7 +466,7 @@ function displayOrg(json){
if (json != null && json.length > 0){
for(var i = 0; i < json.length;i++){
var record = json[i]
- html += "
";
+ html += "
";
html += " ";
html += "
";
html += "
{{template "base/footer" .}}
-
diff --git a/templates/repo/modelarts/inferencejob/new.tmpl b/templates/repo/modelarts/inferencejob/new.tmpl
index 504a85abf..d84b4a45e 100644
--- a/templates/repo/modelarts/inferencejob/new.tmpl
+++ b/templates/repo/modelarts/inferencejob/new.tmpl
@@ -27,7 +27,7 @@
}
-.nowrap {
+.nowrapx {
white-space: nowrap !important;
}
@@ -140,7 +140,7 @@
";
@@ -408,4 +482,5 @@ function displayOrg(json){
}
}
orgDiv.innerHTML = html;
+ swiperOrg.updateSlides();
}
diff --git a/public/img/qrcode_reload.png b/public/img/qrcode_reload.png
new file mode 100644
index 000000000..81ff160b1
Binary files /dev/null and b/public/img/qrcode_reload.png differ
diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go
new file mode 100644
index 000000000..d7a8f2220
--- /dev/null
+++ b/routers/admin/cloudbrains.go
@@ -0,0 +1,225 @@
+package admin
+
+import (
+ "net/http"
+ "net/url"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/360EntSecGroup-Skylar/excelize/v2"
+
+ "code.gitea.io/gitea/modules/modelarts"
+
+ "code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/base"
+ "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/setting"
+)
+
+const (
+ tplCloudBrains base.TplName = "admin/cloudbrain/list"
+ EXCEL_DATE_FORMAT = "20060102150405"
+ CREATE_TIME_FORMAT = "2006/01/02 15:04:05"
+)
+
+func CloudBrains(ctx *context.Context) {
+ ctx.Data["Title"] = ctx.Tr("admin.cloudBrains")
+ ctx.Data["PageIsAdmin"] = true
+ ctx.Data["PageIsAdminCloudBrains"] = true
+
+ listType := ctx.Query("listType")
+ jobType := ctx.Query("jobType")
+ jobStatus := ctx.Query("jobStatus")
+
+ ctx.Data["ListType"] = listType
+ ctx.Data["JobType"] = jobType
+ ctx.Data["JobStatus"] = jobStatus
+
+ page := ctx.QueryInt("page")
+ if page <= 0 {
+ page = 1
+ }
+ debugType := modelarts.DebugType
+ if listType == models.GPUResource {
+ debugType = models.TypeCloudBrainOne
+ } else if listType == models.NPUResource {
+ debugType = models.TypeCloudBrainTwo
+ }
+
+ var jobTypes []string
+ jobTypeNot := false
+ if jobType == string(models.JobTypeDebug) {
+ jobTypes = append(jobTypes, string(models.JobTypeSnn4imagenet), string(models.JobTypeBrainScore), string(models.JobTypeDebug))
+ } else if jobType != "all" && jobType != "" {
+ jobTypes = append(jobTypes, jobType)
+ }
+
+ var jobStatuses []string
+ jobStatusNot := false
+ if jobStatus == "other" {
+ jobStatusNot = true
+ jobStatuses = append(jobStatuses, string(models.ModelArtsTrainJobWaiting), string(models.ModelArtsTrainJobFailed), string(models.ModelArtsRunning), string(models.ModelArtsTrainJobCompleted),
+ string(models.ModelArtsStarting), string(models.ModelArtsRestarting), string(models.ModelArtsStartFailed),
+ string(models.ModelArtsStopping), string(models.ModelArtsStopped), string(models.JobSucceeded))
+ } else if jobStatus != "all" && jobStatus != "" {
+ jobStatuses = append(jobStatuses, jobStatus)
+ }
+
+ keyword := strings.Trim(ctx.Query("q"), " ")
+
+ ciTasks, count, err := models.Cloudbrains(&models.CloudbrainsOptions{
+ ListOptions: models.ListOptions{
+ Page: page,
+ PageSize: setting.UI.IssuePagingNum,
+ },
+ Keyword: keyword,
+ Type: debugType,
+ JobTypeNot: jobTypeNot,
+ JobStatusNot: jobStatusNot,
+ JobStatus: jobStatuses,
+ JobTypes: jobTypes,
+ NeedRepoInfo: true,
+ IsLatestVersion: modelarts.IsLatestVersion,
+ })
+ if err != nil {
+ ctx.ServerError("Get job failed:", err)
+ return
+ }
+
+ for i, task := range ciTasks {
+ ciTasks[i].CanDebug = true
+ ciTasks[i].CanDel = true
+ ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource
+ }
+
+ pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, getTotalPage(count, setting.UI.IssuePagingNum))
+ pager.SetDefaultParams(ctx)
+ pager.AddParam(ctx, "listType", "ListType")
+ ctx.Data["Page"] = pager
+ ctx.Data["PageIsCloudBrain"] = true
+ ctx.Data["Tasks"] = ciTasks
+ ctx.Data["CanCreate"] = true
+ ctx.Data["Keyword"] = keyword
+
+ ctx.HTML(200, tplCloudBrains)
+
+}
+
+func DownloadCloudBrains(ctx *context.Context) {
+
+ page := 1
+
+ pageSize := 300
+
+ var cloudBrain = ctx.Tr("repo.cloudbrain")
+ fileName := getFileName(cloudBrain)
+
+ _, total, err := models.Cloudbrains(&models.CloudbrainsOptions{
+ ListOptions: models.ListOptions{
+ Page: page,
+ PageSize: 1,
+ },
+ Type: modelarts.DebugType,
+ NeedRepoInfo: false,
+ IsLatestVersion: modelarts.IsLatestVersion,
+ })
+
+ if err != nil {
+ log.Warn("Can not get cloud brain info", err)
+ ctx.Error(http.StatusBadRequest, ctx.Tr("repo.cloudbrain_query_fail"))
+ return
+ }
+
+ totalPage := getTotalPage(total, pageSize)
+
+ f := excelize.NewFile()
+
+ index := f.NewSheet(cloudBrain)
+ f.DeleteSheet("Sheet1")
+
+ for k, v := range allHeader(ctx) {
+ f.SetCellValue(cloudBrain, k, v)
+ }
+
+ var row = 2
+ for i := 0; i < totalPage; i++ {
+
+ pageRecords, _, err := models.Cloudbrains(&models.CloudbrainsOptions{
+ ListOptions: models.ListOptions{
+ Page: page,
+ PageSize: pageSize,
+ },
+ Type: modelarts.DebugType,
+ NeedRepoInfo: true,
+ IsLatestVersion: modelarts.IsLatestVersion,
+ })
+ if err != nil {
+ log.Warn("Can not get cloud brain info", err)
+ continue
+ }
+ for _, record := range pageRecords {
+
+ for k, v := range allValues(row, record, ctx) {
+ f.SetCellValue(cloudBrain, k, v)
+ }
+ row++
+
+ }
+
+ page++
+ }
+ f.SetActiveSheet(index)
+
+ ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(fileName))
+ ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
+
+ f.WriteTo(ctx.Resp)
+}
+
+func allValues(row int, rs *models.CloudbrainInfo, ctx *context.Context) map[string]string {
+ return map[string]string{getCellName("A", row): rs.JobName, getCellName("B", row): rs.JobType, getCellName("C", row): rs.Status, getCellName("D", row): time.Unix(int64(rs.Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT), getCellName("E", row): getDurationTime(rs),
+ getCellName("F", row): rs.ComputeResource, getCellName("G", row): rs.Name, getCellName("H", row): getRepoPathName(rs), getCellName("I", row): rs.JobName,
+ }
+}
+
+func getRepoPathName(rs *models.CloudbrainInfo) string {
+ if rs.Repo != nil {
+ return rs.Repo.OwnerName + "/" + rs.Repo.Alias
+ }
+ return ""
+}
+
+func getDurationTime(rs *models.CloudbrainInfo) string {
+ if rs.JobType == "TRAIN" || rs.JobType == "INFERENCE" {
+ return rs.TrainJobDuration
+ } else {
+ return "-"
+ }
+}
+
+func getFileName(baseName string) string {
+ return baseName + "_" + time.Now().Format(EXCEL_DATE_FORMAT) + ".xlsx"
+
+}
+
+func getTotalPage(total int64, pageSize int) int {
+
+ another := 0
+ if int(total)%pageSize != 0 {
+ another = 1
+ }
+ return int(total)/pageSize + another
+
+}
+
+func allHeader(ctx *context.Context) map[string]string {
+
+ return map[string]string{"A1": ctx.Tr("repo.cloudbrain_task"), "B1": ctx.Tr("repo.cloudbrain_task_type"), "C1": ctx.Tr("repo.modelarts.status"), "D1": ctx.Tr("repo.modelarts.createtime"), "E1": ctx.Tr("repo.modelarts.train_job.dura_time"), "F1": ctx.Tr("repo.modelarts.computing_resources"), "G1": ctx.Tr("repo.cloudbrain_creator"), "H1": ctx.Tr("repo.repo_name"), "I1": ctx.Tr("repo.cloudbrain_task_name")}
+
+}
+
+func getCellName(col string, row int) string {
+ return col + strconv.Itoa(row)
+}
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 72a68a6d3..ef5ee6699 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -62,6 +62,8 @@ import (
"net/http"
"strings"
+ "code.gitea.io/gitea/routers/authentication"
+
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth"
"code.gitea.io/gitea/modules/context"
@@ -879,7 +881,7 @@ func RegisterRoutes(m *macaron.Macaron) {
}, reqAnyRepoReader())
m.Group("/cloudbrain", func() {
m.Get("/:jobid", repo.GetCloudbrainTask)
- m.Get("/:jobid/log", repo.CloudbrainGetLog)
+ m.Get("/:jobname/log", repo.CloudbrainGetLog)
}, reqRepoReader(models.UnitTypeCloudBrain))
m.Group("/modelarts", func() {
m.Group("/notebook", func() {
@@ -995,6 +997,12 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Group("/topics", func() {
m.Get("/search", repo.TopicSearch)
})
+ m.Group("/from_wechat", func() {
+ m.Get("/event", authentication.ValidEventSource)
+ m.Post("/event", authentication.AcceptWechatEvent)
+ m.Get("/prd/event", authentication.ValidEventSource)
+ m.Post("/prd/event", authentication.AcceptWechatEvent)
+ })
}, securityHeaders(), context.APIContexter(), sudo())
}
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index dd468783d..cea8d18f2 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -6,11 +6,12 @@
package repo
import (
- "code.gitea.io/gitea/modules/log"
"net/http"
"sort"
"time"
+ "code.gitea.io/gitea/modules/log"
+
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/cloudbrain"
"code.gitea.io/gitea/modules/context"
@@ -48,14 +49,15 @@ func GetCloudbrainTask(ctx *context.APIContext) {
err error
)
+ // jobName := ctx.Params(":jobname")
+ // job, err := models.GetCloudbrainByName(jobName)
jobID := ctx.Params(":jobid")
repoID := ctx.Repo.Repository.ID
job, err := models.GetRepoCloudBrainByJobID(repoID, jobID)
if err != nil {
- ctx.NotFound(err)
- return
+ ctx.Data["error"] = err.Error()
}
- jobResult, err := cloudbrain.GetJob(jobID)
+ jobResult, err := cloudbrain.GetJob(job.JobID)
if err != nil {
ctx.NotFound(err)
return
@@ -85,6 +87,7 @@ func GetCloudbrainTask(ctx *context.APIContext) {
ctx.JSON(http.StatusOK, map[string]interface{}{
"JobID": result.Config.JobID,
+ "JobName": result.Config.JobName,
"JobStatus": result.JobStatus.State,
"SubState": result.JobStatus.SubState,
"CreatedTime": time.Unix(result.JobStatus.CreatedTime/1000, 0).Format("2006-01-02 15:04:05"),
@@ -94,17 +97,17 @@ func GetCloudbrainTask(ctx *context.APIContext) {
}
func CloudbrainGetLog(ctx *context.Context) {
- jobID := ctx.Params(":jobid")
- _, err := models.GetCloudbrainByJobID(jobID)
+ jobName := ctx.Params(":jobname")
+ job, err := models.GetCloudbrainByName(jobName)
if err != nil {
- log.Error("GetCloudbrainByJobID failed: %v", err, ctx.Data["MsgID"])
+ log.Error("GetCloudbrainByJobName failed: %v", err, ctx.Data["MsgID"])
ctx.ServerError(err.Error(), err)
return
}
var hits []models.Hits
- result, err := cloudbrain.GetJobLog(jobID)
- if err != nil{
+ result, err := cloudbrain.GetJobLog(job.JobID)
+ if err != nil {
log.Error("GetJobLog failed: %v", err, ctx.Data["MsgID"])
ctx.ServerError(err.Error(), err)
return
@@ -115,7 +118,7 @@ func CloudbrainGetLog(ctx *context.Context) {
if len(result.Hits.Hits) >= cloudbrain.LogPageSize {
for {
resultNext, err := cloudbrain.GetJobAllLog(result.ScrollID)
- if err != nil{
+ if err != nil {
log.Error("GetJobAllLog failed: %v", err, ctx.Data["MsgID"])
} else {
for _, hit := range resultNext.Hits.Hits {
@@ -142,8 +145,8 @@ func CloudbrainGetLog(ctx *context.Context) {
}
ctx.JSON(http.StatusOK, map[string]interface{}{
- "JobID": jobID,
- "Content": content,
+ "JobName": jobName,
+ "Content": content,
})
return
diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index c9f8761c9..27df10e16 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -77,6 +77,7 @@ func GetModelArtsNotebook2(ctx *context.APIContext) {
ctx.JSON(http.StatusOK, map[string]interface{}{
"JobID": jobID,
+ "JobName": job.JobName,
"JobStatus": result.Status,
})
diff --git a/routers/api/v1/repo/repo_dashbord.go b/routers/api/v1/repo/repo_dashbord.go
index 46596330f..959fb4c9f 100644
--- a/routers/api/v1/repo/repo_dashbord.go
+++ b/routers/api/v1/repo/repo_dashbord.go
@@ -297,7 +297,7 @@ func allProjectsPeroidHeader(ctx *context.Context) map[string]string {
}
func allProjectsPeroidValues(row int, rs *models.RepoStatistic, ctx *context.Context) map[string]string {
- return map[string]string{getCellName("A", row): strconv.FormatInt(rs.RepoID, 10), getCellName("B", row): rs.Name, getCellName("C", row): rs.OwnerName, getCellName("D", row): getIsPrivateDisplay(rs.IsPrivate, ctx), getCellName("E", row): strconv.FormatFloat(rs.RadarTotal, 'f', 2, 64),
+ return map[string]string{getCellName("A", row): strconv.FormatInt(rs.RepoID, 10), getCellName("B", row): rs.DisplayName(), getCellName("C", row): rs.OwnerName, getCellName("D", row): getIsPrivateDisplay(rs.IsPrivate, ctx), getCellName("E", row): strconv.FormatFloat(rs.RadarTotal, 'f', 2, 64),
getCellName("F", row): strconv.FormatInt(rs.NumVisits, 10), getCellName("G", row): strconv.FormatInt(rs.NumDownloads, 10), getCellName("H", row): strconv.FormatInt(rs.NumPulls, 10), getCellName("I", row): strconv.FormatInt(rs.NumCommits, 10),
getCellName("J", row): strconv.FormatInt(rs.NumWatches, 10), getCellName("K", row): strconv.FormatInt(rs.NumStars, 10), getCellName("L", row): strconv.FormatInt(rs.NumForks, 10), getCellName("M", row): strconv.FormatInt(rs.NumIssues, 10),
getCellName("N", row): strconv.FormatInt(rs.NumClosedIssues, 10), getCellName("O", row): strconv.FormatInt(rs.NumContributor, 10),
@@ -317,7 +317,7 @@ func allProjectsOpenIHeader() map[string]string {
func allProjectsOpenIValues(row int, rs *models.RepoStatistic, ctx *context.Context) map[string]string {
- return map[string]string{getCellName("A", row): strconv.FormatInt(rs.RepoID, 10), getCellName("B", row): rs.Name, getCellName("C", row): rs.OwnerName, getCellName("D", row): getIsPrivateDisplay(rs.IsPrivate, ctx), getCellName("E", row): strconv.FormatFloat(rs.RadarTotal, 'f', 2, 64),
+ return map[string]string{getCellName("A", row): strconv.FormatInt(rs.RepoID, 10), getCellName("B", row): rs.DisplayName(), getCellName("C", row): rs.OwnerName, getCellName("D", row): getIsPrivateDisplay(rs.IsPrivate, ctx), getCellName("E", row): strconv.FormatFloat(rs.RadarTotal, 'f', 2, 64),
getCellName("F", row): strconv.FormatFloat(rs.Impact, 'f', 2, 64), getCellName("G", row): strconv.FormatFloat(rs.Completeness, 'f', 2, 64), getCellName("H", row): strconv.FormatFloat(rs.Liveness, 'f', 2, 64), getCellName("I", row): strconv.FormatFloat(rs.ProjectHealth, 'f', 2, 64), getCellName("J", row): strconv.FormatFloat(rs.TeamHealth, 'f', 2, 64), getCellName("K", row): strconv.FormatFloat(rs.Growth, 'f', 2, 64),
getCellName("L", row): strconv.FormatInt(rs.NumWatches, 10), getCellName("M", row): strconv.FormatInt(rs.NumStars, 10), getCellName("N", row): strconv.FormatInt(rs.NumForks, 10), getCellName("O", row): strconv.FormatInt(rs.NumDownloads, 10),
@@ -466,10 +466,10 @@ func generateCountSql(beginTime time.Time, endTime time.Time, latestDate string,
countSql := "SELECT count(*) FROM " +
"(SELECT repo_id FROM repo_statistic where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) +
" and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " group by repo_id) A," +
- "(SELECT repo_id,name,is_private,radar_total from public.repo_statistic where date='" + latestDate + "') B" +
+ "(SELECT repo_id,name,alias,is_private,radar_total from public.repo_statistic where date='" + latestDate + "') B" +
" where A.repo_id=B.repo_id"
if q != "" {
- countSql = countSql + " and LOWER(B.name) like '%" + strings.ToLower(q) + "%'"
+ countSql = countSql + " and LOWER(B.alias) like '%" + strings.ToLower(q) + "%'"
}
return countSql
}
@@ -482,22 +482,22 @@ func generateOpenICountSql(latestDate string) string {
}
func generateTypeAllSql(beginTime time.Time, endTime time.Time, latestDate string, q string, orderBy string, page int, pageSize int) string {
- sql := "SELECT A.repo_id,name,owner_name,is_private,radar_total,num_watches,num_visits,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor FROM " +
+ sql := "SELECT A.repo_id,name,alias,owner_name,is_private,radar_total,num_watches,num_visits,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor FROM " +
"(SELECT repo_id,sum(num_visits) as num_visits " +
" FROM repo_statistic where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) +
" and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " group by repo_id) A," +
- "(SELECT repo_id,name,owner_name,is_private,radar_total,num_watches,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor from public.repo_statistic where date='" + latestDate + "') B" +
+ "(SELECT repo_id,name,alias,owner_name,is_private,radar_total,num_watches,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor from public.repo_statistic where date='" + latestDate + "') B" +
" where A.repo_id=B.repo_id"
if q != "" {
- sql = sql + " and LOWER(name) like '%" + strings.ToLower(q) + "%'"
+ sql = sql + " and LOWER(alias) like '%" + strings.ToLower(q) + "%'"
}
sql = sql + " order by " + orderBy + " desc,repo_id" + " limit " + strconv.Itoa(pageSize) + " offset " + strconv.Itoa((page-1)*pageSize)
return sql
}
func generateTypeAllOpenISql(latestDate string, page int, pageSize int) string {
- sql := "SELECT id, repo_id, date, num_watches, num_stars, num_forks, num_downloads, num_comments, num_visits, num_closed_issues, num_versions, num_dev_months, repo_size, dataset_size, num_models, num_wiki_views, num_commits, num_issues, num_pulls, issue_fixed_rate, num_contributor, num_key_contributor, num_contributors_growth, num_commits_growth, num_commit_lines_growth, num_issues_growth, num_comments_growth, impact, completeness, liveness, project_health, team_health, growth, radar_total, name, is_private, owner_name FROM " +
+ sql := "SELECT id, repo_id, date, num_watches, num_stars, num_forks, num_downloads, num_comments, num_visits, num_closed_issues, num_versions, num_dev_months, repo_size, dataset_size, num_models, num_wiki_views, num_commits, num_issues, num_pulls, issue_fixed_rate, num_contributor, num_key_contributor, num_contributors_growth, num_commits_growth, num_commit_lines_growth, num_issues_growth, num_comments_growth, impact, completeness, liveness, project_health, team_health, growth, radar_total, name,alias, is_private, owner_name FROM " +
" public.repo_statistic where date='" + latestDate + "'"
sql = sql + " order by radar_total desc,repo_id" + " limit " + strconv.Itoa(pageSize) + " offset " + strconv.Itoa((page-1)*pageSize)
@@ -506,14 +506,14 @@ func generateTypeAllOpenISql(latestDate string, page int, pageSize int) string {
func generatePageSql(beginTime time.Time, endTime time.Time, latestDate string, q string, orderBy string, page int, pageSize int) string {
- sql := "SELECT A.repo_id,name,owner_name,is_private,radar_total,num_watches,num_visits,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor FROM " +
+ sql := "SELECT A.repo_id,name,alias,owner_name,is_private,radar_total,num_watches,num_visits,num_downloads,num_pulls,num_commits,num_stars,num_forks,num_issues,num_closed_issues,num_contributor FROM " +
"(SELECT repo_id,sum(num_watches_added) as num_watches,sum(num_visits) as num_visits, sum(num_downloads_added) as num_downloads,sum(num_pulls_added) as num_pulls,sum(num_commits_added) as num_commits,sum(num_stars_added) as num_stars,sum(num_forks_added) num_forks,sum(num_issues_added) as num_issues,sum(num_closed_issues_added) as num_closed_issues,sum(num_contributor_added) as num_contributor " +
" FROM repo_statistic where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) +
" and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + " group by repo_id) A," +
- "(SELECT repo_id,name,owner_name,is_private,radar_total from public.repo_statistic where date='" + latestDate + "') B" +
+ "(SELECT repo_id,name,alias,owner_name,is_private,radar_total from public.repo_statistic where date='" + latestDate + "') B" +
" where A.repo_id=B.repo_id"
if q != "" {
- sql = sql + " and LOWER(B.name) like '%" + strings.ToLower(q) + "%'"
+ sql = sql + " and LOWER(B.alias) like '%" + strings.ToLower(q) + "%'"
}
sql = sql + " order by " + orderBy + " desc,A.repo_id" + " limit " + strconv.Itoa(pageSize) + " offset " + strconv.Itoa((page-1)*pageSize)
return sql
diff --git a/routers/authentication/wechat.go b/routers/authentication/wechat.go
new file mode 100644
index 000000000..72871afb3
--- /dev/null
+++ b/routers/authentication/wechat.go
@@ -0,0 +1,126 @@
+package authentication
+
+import (
+ "code.gitea.io/gitea/modules/auth/wechat"
+ "code.gitea.io/gitea/modules/base"
+ "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/redis/redis_client"
+ "code.gitea.io/gitea/modules/redis/redis_key"
+ "code.gitea.io/gitea/modules/setting"
+ "encoding/json"
+ "errors"
+ gouuid "github.com/satori/go.uuid"
+ "time"
+)
+
+const tplBindPage base.TplName = "repo/wx_autorize"
+
+type QRCodeResponse struct {
+ Url string
+ Ticket string
+ SceneStr string
+ ExpireSeconds int
+}
+
+// GetQRCode4Bind get QR code for wechat binding
+func GetQRCode4Bind(ctx *context.Context) {
+ userId := ctx.User.ID
+
+ r, err := createQRCode4Bind(userId)
+ if err != nil {
+ ctx.JSON(200, map[string]interface{}{
+ "code": "9999",
+ "msg": "Get QR code failed",
+ })
+ return
+ }
+
+ ctx.JSON(200, map[string]interface{}{
+ "code": "00",
+ "msg": "success",
+ "data": r,
+ })
+}
+
+// GetBindStatus the web page will poll the service to get bind status
+func GetBindStatus(ctx *context.Context) {
+ sceneStr := ctx.Query("sceneStr")
+ val, _ := redis_client.Get(redis_key.WechatBindingUserIdKey(sceneStr))
+ if val == "" {
+ ctx.JSON(200, map[string]interface{}{
+ "code": "00",
+ "msg": "QR code expired",
+ "data": map[string]interface{}{
+ "status": wechat.BIND_STATUS_EXPIRED,
+ },
+ })
+ return
+ }
+ qrCache := new(wechat.QRCode4BindCache)
+ json.Unmarshal([]byte(val), qrCache)
+ ctx.JSON(200, map[string]interface{}{
+ "code": "00",
+ "msg": "success",
+ "data": map[string]interface{}{
+ "status": qrCache.Status,
+ },
+ })
+}
+
+// UnbindWechat
+func UnbindWechat(ctx *context.Context) {
+ if ctx.User.WechatOpenId != "" {
+ wechat.UnbindWechat(ctx.User.ID, ctx.User.WechatOpenId)
+ }
+
+ ctx.JSON(200, map[string]interface{}{
+ "code": "00",
+ "msg": "success",
+ })
+}
+
+// GetBindPage
+func GetBindPage(ctx *context.Context) {
+ userId := ctx.User.ID
+ r, _ := createQRCode4Bind(userId)
+ if r != nil {
+ ctx.Data["qrcode"] = r
+ }
+ redirectUrl := ctx.Query("redirect_to")
+ if redirectUrl != "" {
+ ctx.SetCookie("redirect_to", setting.AppSubURL+redirectUrl, 0, setting.AppSubURL)
+ }
+ ctx.HTML(200, tplBindPage)
+}
+
+func createQRCode4Bind(userId int64) (*QRCodeResponse, error) {
+ log.Info("start to create qr-code for binding.userId=%d", userId)
+ sceneStr := gouuid.NewV4().String()
+ r := wechat.GetWechatQRCode4Bind(sceneStr)
+ if r == nil {
+ return nil, errors.New("createQRCode4Bind failed")
+ }
+
+ jsonStr, _ := json.Marshal(&wechat.QRCode4BindCache{
+ UserId: userId,
+ Status: wechat.BIND_STATUS_UNBIND,
+ })
+ isOk, err := redis_client.Setex(redis_key.WechatBindingUserIdKey(sceneStr), string(jsonStr), time.Duration(setting.WechatQRCodeExpireSeconds)*time.Second)
+ if err != nil {
+ log.Error("createQRCode4Bind failed.e=%+v", err)
+ return nil, err
+ }
+ if !isOk {
+ log.Error("createQRCode4Bind failed.redis reply is not ok")
+ return nil, errors.New("reply is not ok when set WechatBindingUserIdKey")
+ }
+
+ result := &QRCodeResponse{
+ Url: r.Url,
+ Ticket: r.Ticket,
+ SceneStr: sceneStr,
+ ExpireSeconds: setting.WechatQRCodeExpireSeconds,
+ }
+ return result, nil
+}
diff --git a/routers/authentication/wechat_event.go b/routers/authentication/wechat_event.go
new file mode 100644
index 000000000..9b1cebec6
--- /dev/null
+++ b/routers/authentication/wechat_event.go
@@ -0,0 +1,47 @@
+package authentication
+
+import (
+ "code.gitea.io/gitea/modules/auth/wechat"
+ "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/log"
+ "encoding/xml"
+ "io/ioutil"
+ "time"
+)
+
+// AcceptWechatEvent
+// https://developers.weixin.qq.com/doc/offiaccount/Message_Management/Receiving_event_pushes.html
+// https://developers.weixin.qq.com/doc/offiaccount/Message_Management/Passive_user_reply_message.html
+func AcceptWechatEvent(ctx *context.Context) {
+ b, _ := ioutil.ReadAll(ctx.Req.Request.Body)
+ we := wechat.WechatEvent{}
+ xml.Unmarshal(b, &we)
+
+ log.Info("accept wechat event= %+v", we)
+ var replyStr string
+ switch we.Event {
+ case wechat.WECHAT_EVENT_SUBSCRIBE, wechat.WECHAT_EVENT_SCAN:
+ replyStr = wechat.HandleSubscribeEvent(we)
+ break
+ }
+
+ if replyStr == "" {
+ log.Info("reply str is empty")
+ return
+ }
+ reply := &wechat.EventReply{
+ ToUserName: we.FromUserName,
+ FromUserName: we.ToUserName,
+ CreateTime: time.Now().Unix(),
+ MsgType: wechat.WECHAT_MSG_TYPE_TEXT,
+ Content: replyStr,
+ }
+ ctx.XML(200, reply)
+}
+
+// ValidEventSource
+func ValidEventSource(ctx *context.Context) {
+ echostr := ctx.Query("echostr")
+ ctx.Write([]byte(echostr))
+ return
+}
diff --git a/routers/home.go b/routers/home.go
index 397e1990d..2db8d2112 100755
--- a/routers/home.go
+++ b/routers/home.go
@@ -38,6 +38,7 @@ const (
tplExploreCode base.TplName = "explore/code"
tplExploreImages base.TplName = "explore/images"
tplExploreExploreDataAnalysis base.TplName = "explore/data_analysis"
+ tplHomeTerm base.TplName = "terms"
)
// Home render home page
@@ -596,3 +597,7 @@ func RecommendRepoFromPromote(ctx *context.Context) {
ctx.JSON(200, result)
}
}
+
+func HomeTerm(ctx *context.Context) {
+ ctx.HTML(200, tplHomeTerm)
+}
diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go
index fe4d9794c..e2040e0d2 100644
--- a/routers/repo/ai_model_manage.go
+++ b/routers/repo/ai_model_manage.go
@@ -12,6 +12,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/storage"
uuid "github.com/satori/go.uuid"
@@ -113,7 +114,7 @@ func saveModelByParameters(jobId string, versionName string, name string, versio
models.UpdateRepositoryUnits(ctx.Repo.Repository, units, deleteUnitTypes)
log.Info("save model end.")
-
+ notification.NotifyOtherTask(ctx.User, ctx.Repo.Repository, id, name, models.ActionCreateNewModelTask)
return nil
}
diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go
index c2d096416..bc843c555 100755
--- a/routers/repo/attachment.go
+++ b/routers/repo/attachment.go
@@ -20,11 +20,11 @@ import (
"code.gitea.io/gitea/modules/labelmsg"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/minio_ext"
+ "code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/storage"
"code.gitea.io/gitea/modules/upload"
"code.gitea.io/gitea/modules/worker"
-
gouuid "github.com/satori/go.uuid"
)
@@ -845,6 +845,9 @@ func CompleteMultipart(ctx *context.Context) {
ctx.Error(500, fmt.Sprintf("InsertAttachment: %v", err))
return
}
+ dataset, _ := models.GetDatasetByID(attachment.DatasetID)
+ repository, _ := models.GetRepositoryByID(dataset.RepoID)
+ notification.NotifyOtherTask(ctx.User, repository, fmt.Sprint(attachment.Type), attachment.Name, models.ActionUploadAttachment)
if attachment.DatasetID != 0 {
if isCanDecompress(attachment.Name) {
@@ -865,7 +868,6 @@ func CompleteMultipart(ctx *context.Context) {
labelmsg.SendDecompressAttachToLabelOBS(string(attachjson))
}
} else {
- dataset, _ := models.GetDatasetByID(attachment.DatasetID)
var labelMap map[string]string
labelMap = make(map[string]string)
labelMap["UUID"] = uuid
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 0599fb03f..4cde5d40d 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -350,18 +350,16 @@ func CloudBrainShow(ctx *context.Context) {
func cloudBrainShow(ctx *context.Context, tpName base.TplName) {
ctx.Data["PageIsCloudBrain"] = true
-
- var jobID = ctx.Params(":jobid")
- task, err := models.GetCloudbrainByJobID(jobID)
+ var jobName = ctx.Params(":jobname")
+ debugListType := ctx.Query("debugListType")
+ task, err := models.GetCloudbrainByName(jobName)
if err != nil {
ctx.Data["error"] = err.Error()
}
-
- result, err := cloudbrain.GetJob(jobID)
+ result, err := cloudbrain.GetJob(task.JobID)
if err != nil {
ctx.Data["error"] = err.Error()
}
-
if result != nil {
jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB")
@@ -369,6 +367,7 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) {
ctx.Data["resource_spec"] = spec
taskRoles := jobRes.TaskRoles
if jobRes.JobStatus.State != string(models.JobFailed) {
+
taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
ctx.Data["taskRes"] = taskRes
task.Status = taskRes.TaskStatuses[0].State
@@ -422,11 +421,12 @@ func cloudBrainShow(ctx *context.Context, tpName base.TplName) {
ctx.Data["duration"] = util.AddZero(duration/3600000) + ":" + util.AddZero(duration%3600000/60000) + ":" + util.AddZero(duration%60000/1000)
ctx.Data["task"] = task
- ctx.Data["jobID"] = jobID
+ // ctx.Data["jobID"] = task.JobID
ctx.Data["jobName"] = task.JobName
version_list_task := make([]*models.Cloudbrain, 0)
version_list_task = append(version_list_task, task)
ctx.Data["version_list_task"] = version_list_task
+ ctx.Data["debugListType"] = debugListType
ctx.HTML(200, tpName)
}
@@ -582,12 +582,19 @@ func logErrorAndUpdateJobStatus(err error, taskInfo *models.Cloudbrain) {
}
func CloudBrainDel(ctx *context.Context) {
+ var listType = ctx.Query("debugListType")
if err := deleteCloudbrainJob(ctx); err != nil {
log.Error("deleteCloudbrainJob failed: %v", err, ctx.Data["msgID"])
ctx.ServerError(err.Error(), err)
return
}
- ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all")
+
+ var isAdminPage = ctx.Query("isadminpage")
+ if ctx.IsUserSiteAdmin() && isAdminPage == "true" {
+ ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains")
+ } else {
+ ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=" + listType)
+ }
}
func deleteCloudbrainJob(ctx *context.Context) error {
@@ -1098,6 +1105,9 @@ func GetChildTypes(ctx *context.Context) {
}
func CloudBrainBenchmarkNew(ctx *context.Context) {
+ ctx.Data["description"] = ""
+ ctx.Data["benchmarkTypeID"] = -1
+ ctx.Data["benchmark_child_types_id_hidden"] = -1
err := cloudBrainNewDataPrepare(ctx)
if err != nil {
ctx.ServerError("get new cloudbrain info failed", err)
@@ -1200,6 +1210,9 @@ func CloudBrainBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainF
benchmarkTypeID := form.BenchmarkTypeID
benchmarkChildTypeID := form.BenchmarkChildTypeID
+ ctx.Data["description"] = form.Description
+ ctx.Data["benchmarkTypeID"] = benchmarkTypeID
+ ctx.Data["benchmark_child_types_id_hidden"] = benchmarkChildTypeID
if !jobNamePattern.MatchString(jobName) {
cloudBrainNewDataPrepare(ctx)
ctx.RenderWithErr(ctx.Tr("repo.cloudbrain_jobname_err"), tplCloudBrainBenchmarkNew, &form)
@@ -1343,5 +1356,11 @@ func BenchmarkDel(ctx *context.Context) {
ctx.ServerError(err.Error(), err)
return
}
- ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
+
+ var isAdminPage = ctx.Query("isadminpage")
+ if ctx.IsUserSiteAdmin() && isAdminPage == "true" {
+ ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains")
+ } else {
+ ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/cloudbrain/benchmark")
+ }
}
diff --git a/routers/repo/download.go b/routers/repo/download.go
index 5b8982102..f1b6e09b7 100755
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -28,7 +28,8 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error {
buf = buf[:n]
}
- ctx.Resp.Header().Set("Cache-Control", "public,max-age=86400")
+ //ctx.Resp.Header().Set("Cache-Control", "public,max-age=86400")
+ ctx.Resp.Header().Set("Cache-Control", "max-age=0")
name = path.Base(name)
// Google Chrome dislike commas in filenames, so let's change it to a space
diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 7e9ae3c09..fad449fec 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -91,6 +91,7 @@ func DebugJobIndex(ctx *context.Context) {
ctx.Data["Tasks"] = ciTasks
ctx.Data["CanCreate"] = cloudbrain.CanCreateOrDebugJob(ctx)
ctx.Data["RepoIsEmpty"] = repo.IsEmpty
+ ctx.Data["debugListType"] = debugListType
ctx.HTML(200, tplDebugJobIndex)
}
@@ -103,8 +104,13 @@ func MustEnableModelArts(ctx *context.Context) {
}
func NotebookNew(ctx *context.Context) {
- ctx.Data["PageIsCloudBrain"] = true
+ notebookNewDataPrepare(ctx)
+
+ ctx.HTML(200, tplModelArtsNotebookNew)
+}
+func notebookNewDataPrepare(ctx *context.Context) error {
+ ctx.Data["PageIsCloudBrain"] = true
t := time.Now()
var jobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
ctx.Data["job_name"] = jobName
@@ -112,26 +118,14 @@ func NotebookNew(ctx *context.Context) {
attachs, err := models.GetModelArtsUserAttachments(ctx.User.ID)
if err != nil {
ctx.ServerError("GetAllUserAttachments failed:", err)
- return
+ return err
}
-
ctx.Data["attachments"] = attachs
- ctx.Data["dataset_path"] = modelarts.DataSetMountPath
- ctx.Data["env"] = modelarts.NotebookEnv
- ctx.Data["notebook_type"] = modelarts.NotebookType
- if modelarts.FlavorInfos == nil {
- json.Unmarshal([]byte(setting.FlavorInfos), &modelarts.FlavorInfos)
- }
- ctx.Data["flavors"] = modelarts.FlavorInfos.FlavorInfo
-
- ctx.HTML(200, tplModelArtsNotebookNew)
-}
-func notebookNewDataPrepare(ctx *context.Context) error {
- ctx.Data["PageIsCloudBrain"] = true
- t := time.Now()
- var jobName = jobNamePrefixValid(cutString(ctx.User.Name, 5)) + t.Format("2006010215") + strconv.Itoa(int(t.Unix()))[5:]
- ctx.Data["job_name"] = jobName
+ if modelarts.ImageInfos == nil {
+ json.Unmarshal([]byte(setting.ImageInfos), &modelarts.ImageInfos)
+ }
+ ctx.Data["images"] = modelarts.ImageInfos.ImageInfo
if modelarts.FlavorInfos == nil {
json.Unmarshal([]byte(setting.FlavorInfos), &modelarts.FlavorInfos)
@@ -191,8 +185,7 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm
uuid := form.Attachment
description := form.Description
flavor := form.Flavor
-
- flavor = "modelarts.bm.910.arm.public.1"
+ imageId := form.ImageId
count, err := models.GetCloudbrainNotebookCountByUserID(ctx.User.ID)
if err != nil {
@@ -223,7 +216,7 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm
}
}
- err = modelarts.GenerateNotebook2(ctx, jobName, uuid, description, flavor)
+ err = modelarts.GenerateNotebook2(ctx, jobName, uuid, description, flavor, imageId)
if err != nil {
log.Error("GenerateNotebook2 failed, %v", err, ctx.Data["MsgID"])
notebookNewDataPrepare(ctx)
@@ -235,6 +228,7 @@ func Notebook2Create(ctx *context.Context, form auth.CreateModelArtsNotebookForm
func NotebookShow(ctx *context.Context) {
ctx.Data["PageIsCloudBrain"] = true
+ debugListType := ctx.Query("debugListType")
var jobID = ctx.Params(":jobid")
task, err := models.GetCloudbrainByJobID(jobID)
@@ -262,13 +256,24 @@ func NotebookShow(ctx *context.Context) {
result.CreateTime = time.Unix(int64(result.CreateAt/1000), 0).Format("2006-01-02 15:04:05")
result.LatestUpdateTime = time.Unix(int64(result.UpdateAt/1000), 0).Format("2006-01-02 15:04:05")
- //result.QueuingInfo.BeginTime = time.Unix(int64(result.QueuingInfo.BeginTimestamp/1000), 0).Format("2006-01-02 15:04:05")
- //result.QueuingInfo.EndTime = time.Unix(int64(result.QueuingInfo.EndTimestamp/1000), 0).Format("2006-01-02 15:04:05")
}
+ datasetDownloadLink := "-"
+ if ctx.IsSigned {
+ if task.Uuid != "" && task.UserID == ctx.User.ID {
+ attachment, err := models.GetAttachmentByUUID(task.Uuid)
+ if err == nil {
+ datasetDownloadLink = attachment.S3DownloadURL()
+ }
+ }
+ }
+
+ ctx.Data["datasetDownloadLink"] = datasetDownloadLink
ctx.Data["task"] = task
ctx.Data["jobID"] = jobID
+ ctx.Data["jobName"] = task.JobName
ctx.Data["result"] = result
+ ctx.Data["debugListType"] = debugListType
ctx.HTML(200, tplModelArtsNotebookShow)
}
@@ -307,7 +312,7 @@ func NotebookDebug2(ctx *context.Context) {
ctx.RenderWithErr(err.Error(), tplModelArtsNotebookIndex, nil)
return
}
-
+
ctx.Redirect(result.Url)
}
@@ -342,6 +347,10 @@ func NotebookManage(ctx *context.Context) {
break
}
} else if action == models.ActionRestart {
+ ctx.CheckWechatBind()
+ if ctx.Written() {
+ return
+ }
if task.Status != string(models.ModelArtsStopped) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsCreateFailed) {
log.Error("the job(%s) is not stopped", task.JobName, ctx.Data["MsgID"])
resultCode = "-1"
@@ -387,7 +396,7 @@ func NotebookManage(ctx *context.Context) {
log.Error("ManageNotebook2(%s) failed:%v", task.JobName, err.Error(), ctx.Data["MsgID"])
resultCode = "-1"
errorMsg = err.Error()
- if strings.Contains(err.Error(), "ModelArts.6404") {
+ if strings.Contains(err.Error(), modelarts.NotebookNotFound) {
errorMsg = "the job's version is too old and can not be restarted"
}
break
@@ -417,6 +426,7 @@ func NotebookManage(ctx *context.Context) {
func NotebookDel(ctx *context.Context) {
var jobID = ctx.Params(":jobid")
+ var listType = ctx.Query("debugListType")
task := ctx.Cloudbrain
if task.Status != string(models.ModelArtsCreateFailed) && task.Status != string(models.ModelArtsStartFailed) && task.Status != string(models.ModelArtsStopped) {
@@ -428,8 +438,12 @@ func NotebookDel(ctx *context.Context) {
_, err := modelarts.DelNotebook2(jobID)
if err != nil {
log.Error("DelNotebook2(%s) failed:%v", task.JobName, err.Error())
- ctx.ServerError("DelNotebook2 failed", err)
- return
+ if strings.Contains(err.Error(), modelarts.NotebookNotFound) || strings.Contains(err.Error(), modelarts.NotebookNoPermission) {
+ log.Info("old notebook version")
+ } else {
+ ctx.ServerError("DelNotebook2 failed", err)
+ return
+ }
}
err = models.DeleteJob(task)
@@ -438,7 +452,12 @@ func NotebookDel(ctx *context.Context) {
return
}
- ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=all")
+ var isAdminPage = ctx.Query("isadminpage")
+ if ctx.IsUserSiteAdmin() && isAdminPage == "true" {
+ ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains")
+ } else {
+ ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=" + listType)
+ }
}
func TrainJobIndex(ctx *context.Context) {
@@ -1447,6 +1466,7 @@ func TrainJobShow(ctx *context.Context) {
ctx.Data["jobName"] = VersionListTasks[0].JobName
ctx.Data["version_list_task"] = VersionListTasks
ctx.Data["version_list_count"] = VersionListCount
+ ctx.Data["canDownload"] = cloudbrain.CanDeleteJob(ctx, &VersionListTasks[0].Cloudbrain)
ctx.HTML(http.StatusOK, tplModelArtsTrainJobShow)
}
@@ -1543,7 +1563,12 @@ func TrainJobDel(ctx *context.Context) {
DeleteJobStorage(VersionListTasks[0].JobName)
}
- ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job")
+ var isAdminPage = ctx.Query("isadminpage")
+ if ctx.IsUserSiteAdmin() && isAdminPage == "true" {
+ ctx.Redirect(setting.AppSubURL + "/admin" + "/cloudbrains")
+ } else {
+ ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/modelarts/train-job")
+ }
}
func TrainJobStop(ctx *context.Context) {
@@ -2046,6 +2071,7 @@ func InferenceJobShow(ctx *context.Context) {
ctx.Data["jobID"] = jobID
ctx.Data["jobName"] = task.JobName
ctx.Data["task"] = task
+ ctx.Data["canDownload"] = cloudbrain.CanDeleteJob(ctx, task)
tempUids := []int64{}
tempUids = append(tempUids, task.UserID)
diff --git a/routers/repo/repo_statistic.go b/routers/repo/repo_statistic.go
index dce183f49..06f45e608 100755
--- a/routers/repo/repo_statistic.go
+++ b/routers/repo/repo_statistic.go
@@ -107,6 +107,7 @@ func RepoStatisticDaily(date string) {
RepoID: repo.ID,
Date: date,
Name: repo.Name,
+ Alias: repo.Alias,
IsPrivate: repo.IsPrivate,
IsMirror: repo.IsMirror,
OwnerName: repo.OwnerName,
@@ -282,7 +283,7 @@ func RepoStatisticDaily(date string) {
}
func getDistinctProjectName(repo *models.Repository) string {
- return repo.OwnerName + "/" + repo.Name
+ return repo.OwnerName + "/" + repo.Alias
}
func getDatasetSize(repo *models.Repository) (int64, error) {
diff --git a/routers/repo/user_data_analysis.go b/routers/repo/user_data_analysis.go
index e71e8cb3a..b4adfc347 100755
--- a/routers/repo/user_data_analysis.go
+++ b/routers/repo/user_data_analysis.go
@@ -63,11 +63,13 @@ func queryUserDataPage(ctx *context.Context, tableName string, queryObj interfac
_, count := models.QueryUserStaticDataByTableName(1, 1, tableName, queryObj, userName)
var indexTotal int64
indexTotal = 0
+ row := 1
for {
re, _ := models.QueryUserStaticDataByTableName(int(indexTotal), PAGE_SIZE, tableName, queryObj, "")
log.Info("return count=" + fmt.Sprint(count))
- for i, userRecord := range re {
- rows := fmt.Sprint(i + 2)
+ for _, userRecord := range re {
+ row++
+ rows := fmt.Sprint(row)
xlsx.SetCellValue(sheetName, "A"+rows, userRecord.ID)
xlsx.SetCellValue(sheetName, "B"+rows, userRecord.Name)
xlsx.SetCellValue(sheetName, "C"+rows, userRecord.CodeMergeCount)
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index aa85b8f2b..7fa06fa3b 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -6,6 +6,7 @@ package routes
import (
"bytes"
+ "code.gitea.io/gitea/routers/authentication"
"encoding/gob"
"net/http"
"path"
@@ -274,6 +275,8 @@ func RegisterRoutes(m *macaron.Macaron) {
ignSignInAndCsrf := context.Toggle(&context.ToggleOptions{DisableCSRF: true})
reqSignOut := context.Toggle(&context.ToggleOptions{SignOutRequired: true})
reqBasicAuth := context.Toggle(&context.ToggleOptions{BasicAuthRequired: true, DisableCSRF: true})
+ reqWechatBind := context.Toggle(&context.ToggleOptions{WechatAuthRequired: true})
+ reqWechatBindForApi := context.Toggle(&context.ToggleOptions{WechatAuthRequiredForAPI: true})
bindIgnErr := binding.BindIgnErr
validation.AddBindingRules()
@@ -319,6 +322,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("/action/notification", routers.ActionNotification)
m.Get("/recommend/org", routers.RecommendOrgFromPromote)
m.Get("/recommend/repo", routers.RecommendRepoFromPromote)
+ m.Get("/home/term", routers.HomeTerm)
m.Group("/explore", func() {
m.Get("", func(ctx *context.Context) {
ctx.Redirect(setting.AppSubURL + "/explore/repos")
@@ -391,6 +395,13 @@ func RegisterRoutes(m *macaron.Macaron) {
}, ignSignInAndCsrf, reqSignIn)
m.Post("/login/oauth/access_token", bindIgnErr(auth.AccessTokenForm{}), ignSignInAndCsrf, user.AccessTokenOAuth)
+ m.Group("/authentication/wechat", func() {
+ m.Get("/qrCode4Bind", authentication.GetQRCode4Bind)
+ m.Get("/bindStatus", authentication.GetBindStatus)
+ m.Post("/unbind", authentication.UnbindWechat)
+ m.Get("/bind", authentication.GetBindPage)
+ }, reqSignIn)
+
m.Group("/user/settings", func() {
m.Get("", userSetting.Profile)
m.Post("", bindIgnErr(auth.UpdateProfileForm{}), userSetting.ProfilePost)
@@ -507,6 +518,10 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("", admin.Datasets)
// m.Post("/delete", admin.DeleteDataset)
})
+ m.Group("/cloudbrains", func() {
+ m.Get("", admin.CloudBrains)
+ m.Get("/download", admin.DownloadCloudBrains)
+ })
m.Group("/^:configType(hooks|system-hooks)$", func() {
m.Get("", admin.DefaultOrSystemWebhooks)
@@ -974,30 +989,34 @@ func RegisterRoutes(m *macaron.Macaron) {
}, context.RepoRef())
m.Group("/cloudbrain", func() {
- m.Group("/:jobid", func() {
+ m.Group("/:jobname", func() {
m.Get("", reqRepoCloudBrainReader, repo.CloudBrainShow)
+ })
+ m.Group("/:jobid", func() {
m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainDebug)
m.Post("/commit_image", cloudbrain.AdminOrJobCreaterRight, bindIgnErr(auth.CommitImageCloudBrainForm{}), repo.CloudBrainCommitImage)
m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainStop)
m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainDel)
- m.Post("/restart", cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainRestart)
+ m.Post("/restart", reqWechatBindForApi, cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainRestart)
m.Get("/rate", reqRepoCloudBrainReader, repo.GetRate)
m.Get("/models", reqRepoCloudBrainReader, repo.CloudBrainShowModels)
m.Get("/download_model", cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainDownloadModel)
})
- m.Get("/create", reqRepoCloudBrainWriter, repo.CloudBrainNew)
- m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainCreate)
+ m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.CloudBrainNew)
+ m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainCreate)
m.Group("/benchmark", func() {
m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchmarkIndex)
- m.Group("/:jobid", func() {
+ m.Group("/:jobname", func() {
m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchMarkShow)
+ })
+ m.Group("/:jobid", func() {
m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainStop)
m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.BenchmarkDel)
m.Get("/rate", reqRepoCloudBrainReader, repo.GetRate)
})
- m.Get("/create", reqRepoCloudBrainWriter, repo.CloudBrainBenchmarkNew)
- m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainBenchmarkCreate)
+ m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.CloudBrainBenchmarkNew)
+ m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateCloudBrainForm{}), repo.CloudBrainBenchmarkCreate)
m.Get("/get_child_types", repo.GetChildTypes)
})
}, context.RepoRef())
@@ -1045,8 +1064,8 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Post("/:action", reqRepoCloudBrainWriter, repo.NotebookManage)
m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.NotebookDel)
})
- m.Get("/create", reqRepoCloudBrainWriter, repo.NotebookNew)
- m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsNotebookForm{}), repo.Notebook2Create)
+ m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.NotebookNew)
+ m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsNotebookForm{}), repo.Notebook2Create)
})
m.Group("/train-job", func() {
@@ -1056,11 +1075,11 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.TrainJobStop)
m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.TrainJobDel)
m.Get("/model_download", cloudbrain.AdminOrJobCreaterRight, repo.ModelDownload)
- m.Get("/create_version", cloudbrain.AdminOrJobCreaterRight, repo.TrainJobNewVersion)
- m.Post("/create_version", cloudbrain.AdminOrJobCreaterRight, bindIgnErr(auth.CreateModelArtsTrainJobForm{}), repo.TrainJobCreateVersion)
+ m.Get("/create_version", reqWechatBind, cloudbrain.AdminOrJobCreaterRight, repo.TrainJobNewVersion)
+ m.Post("/create_version", reqWechatBind, cloudbrain.AdminOrJobCreaterRight, bindIgnErr(auth.CreateModelArtsTrainJobForm{}), repo.TrainJobCreateVersion)
})
- m.Get("/create", reqRepoCloudBrainWriter, repo.TrainJobNew)
- m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsTrainJobForm{}), repo.TrainJobCreate)
+ m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.TrainJobNew)
+ m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsTrainJobForm{}), repo.TrainJobCreate)
m.Get("/para-config-list", reqRepoCloudBrainReader, repo.TrainJobGetConfigList)
})
@@ -1072,8 +1091,8 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("/result_download", cloudbrain.AdminOrJobCreaterRight, repo.ResultDownload)
m.Get("/downloadall", repo.DownloadMultiResultFile)
})
- m.Get("/create", reqRepoCloudBrainWriter, repo.InferenceJobNew)
- m.Post("/create", reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsInferenceJobForm{}), repo.InferenceJobCreate)
+ m.Get("/create", reqWechatBind, reqRepoCloudBrainWriter, repo.InferenceJobNew)
+ m.Post("/create", reqWechatBind, reqRepoCloudBrainWriter, bindIgnErr(auth.CreateModelArtsInferenceJobForm{}), repo.InferenceJobCreate)
})
}, context.RepoRef())
diff --git a/routers/user/notification.go b/routers/user/notification.go
index 9724c8108..0fd6df007 100644
--- a/routers/user/notification.go
+++ b/routers/user/notification.go
@@ -132,7 +132,7 @@ func getNotifications(c *context.Context) {
}
c.Data["Title"] = c.Tr("notifications")
- c.Data["Keyword"] = keyword
+ //c.Data["Keyword"] = keyword
c.Data["Status"] = status
c.Data["Notifications"] = notifications
diff --git a/services/socketwrap/clientManager.go b/services/socketwrap/clientManager.go
index 53de73673..98b0e0aa9 100644
--- a/services/socketwrap/clientManager.go
+++ b/services/socketwrap/clientManager.go
@@ -10,7 +10,7 @@ import (
"github.com/elliotchance/orderedmap"
)
-var opTypes = []int{1, 2, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 22, 23}
+var opTypes = []int{1, 2, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 17, 22, 23, 25, 26, 27, 28, 29, 30}
type ClientsManager struct {
Clients *orderedmap.OrderedMap
diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl
new file mode 100644
index 000000000..521377838
--- /dev/null
+++ b/templates/admin/cloudbrain/list.tmpl
@@ -0,0 +1,316 @@
+{{template "base/head" .}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{template "admin/navbar" .}}
+
+{{template "base/footer" .}}
+
diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl
new file mode 100644
index 000000000..3c24a52e1
--- /dev/null
+++ b/templates/admin/cloudbrain/search.tmpl
@@ -0,0 +1,51 @@
+
+ {{template "base/alert" .}}
+
+
+
+
+
+ {{template "admin/cloudbrain/search" .}}
+
+
+
+
+
+
+
+
+
+
+
+ {{range .Tasks}}
+ {{if .Repo}}
+
+
+
+ {{$.i18n.Tr "repo.cloudbrain_task"}}
+
+
+ {{$.i18n.Tr "repo.cloudbrain_task_type"}}
+
+
+ {{$.i18n.Tr "repo.modelarts.status"}}
+
+
+ {{$.i18n.Tr "repo.modelarts.createtime"}}
+
+
+ {{$.i18n.Tr "repo.cloudbrain_status_runtime"}}
+
+
+ {{$.i18n.Tr "repo.modelarts.computing_resources"}}
+
+
+ {{$.i18n.Tr "repo.cloudbrain_creator"}}
+
+
+ {{$.i18n.Tr "repository"}}
+
+
+ {{.i18n.Tr "admin.cloudbrain.cloudbrain_name"}}
+
+
+ {{$.i18n.Tr "repo.cloudbrain_operate"}}
+
+
+
+ {{else}}
+
+
+
+
+ {{if or (eq .JobType "DEBUG") (eq .JobType "SNN4IMAGENET") (eq .JobType "BRAINSCORE")}}
+
+ {{.JobName}}
+
+ {{else if eq .JobType "INFERENCE"}}
+
+ {{.JobName}}
+
+ {{else if eq .JobType "TRAIN"}}
+
+ {{.JobName}}
+
+ {{else if eq .JobType "BENCHMARK"}}
+
+ {{.JobName}}
+
+ {{end}}
+
+
+
+ {{.JobType}}
+
+
+
+
+ {{.Status}}
+
+
+
+
+ {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}
+
+
+
+ {{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}
+
+
+
+ {{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}
+
+
+
+ {{if .User.Name}}
+ 
+ {{else}}
+ 
+ {{end}}
+
+
+
+
+
+
+ {{end}}
+
+ {{if eq .JobType "DEBUG" "SNN4IMAGENET" "BRAINSCORE"}}
+
+ {{end}}
+
+
+
+
+
+
+
+
+ {{end}}
+ {{end}}
+
+
+
+
+ {{if eq .JobType "DEBUG"}}
+
+ {{.JobName}}
+
+ {{else if eq .JobType "INFERENCE"}}
+
+ {{.JobName}}
+
+ {{else if eq .JobType "TRAIN"}}
+
+ {{.JobName}}
+
+ {{else if eq .JobType "BENCHMARK"}}
+
+ {{.JobName}}
+
+ {{end}}
+
+
+
+ {{.JobType}}
+
+
+
+
+ {{.Status}}
+
+
+
+
+ {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}
+
+
+
+ {{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}
+
+
+
+ {{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}
+
+
+
+ {{if .User.Name}}
+
+ {{else}}
+
+ {{end}}
+
+
+
+ {{end}}
+
+ --
+
+
+
+
+ {{if eq .JobType "DEBUG"}}
+
+ {{end}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除任务
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl
index 2b9f8b7c4..47a9ee811 100644
--- a/templates/admin/navbar.tmpl
+++ b/templates/admin/navbar.tmpl
@@ -14,6 +14,9 @@
{{.i18n.Tr "admin.datasets"}}
+
+ 云脑任务
+
{{.i18n.Tr "admin.hooks"}}
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index 42084b871..bcf46f9f0 100755
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -8,6 +8,8 @@
{{.i18n.Tr "custom.foot.council"}}
{{.i18n.Tr "custom.foot.technical_committee"}}
{{.i18n.Tr "custom.foot.join"}}
+ {{.i18n.Tr "custom.foot.agreement"}}
+
+
+ {{.i18n.Tr "admin.cloudbrain.all_task_types"}}
+
+
+
+
+ {{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}
+
+
+
+
+{{.i18n.Tr "admin.cloudbrain.all_status"}}
+
+
+ {{.i18n.Tr "custom.foot.news"}}
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 10015a61b..2cecee52b 100755
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -226,10 +226,12 @@ var _hmt = _hmt || [];
}
let isShowNoticeTag = false;
let notices= {{.notices.Notices}}
- for (i =0;i* {{.page_only_dynamic}}
-
-
+
{{template "base/footer" .}}
-
-
{{if .PageIsComparePull}}
{{end}}
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 6e38a6f75..06f838322 100755
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -448,8 +448,8 @@
-
- -->
\ No newline at end of file
diff --git a/templates/repo/modelarts/inferencejob/index.tmpl b/templates/repo/modelarts/inferencejob/index.tmpl
index 83637c5a7..4a071e7dd 100644
--- a/templates/repo/modelarts/inferencejob/index.tmpl
+++ b/templates/repo/modelarts/inferencejob/index.tmpl
@@ -113,11 +113,11 @@
@@ -42,7 +42,11 @@
{{.page_recommend_org_more}}
-
-
+
@@ -78,7 +82,7 @@
+
+
+
+
{{.page_dev_env}}
{{.page_dev_env_desc}}
+
@@ -158,4 +162,4 @@
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index e03c28a9e..865a780a8 100755
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -67,8 +67,20 @@
-
-
+
@@ -487,15 +477,15 @@
@@ -158,4 +162,4 @@
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index e03c28a9e..865a780a8 100755
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -67,8 +67,20 @@
{{.Name}}
{{end}}
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index dd287c87f..03ca8c41e 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -221,8 +221,20 @@
- {{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · - {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}} + {{.NumMembers}} + {{if le .NumMembers 1}} + {{$.i18n.Tr "org.lower_member"}} + {{else}} + {{$.i18n.Tr "org.lower_members"}} + {{end}} + · + {{.NumRepos}} + {{if le .NumRepos 1}} + {{$.i18n.Tr "org.lower_repository"}} + {{else}} + {{$.i18n.Tr "org.lower_repositories"}} + {{end}} +
{{.Name}}
{{end}}
diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl
index 83018739f..5ae6bec89 100644
--- a/templates/org/member/course_members.tmpl
+++ b/templates/org/member/course_members.tmpl
@@ -120,7 +120,6 @@
\ No newline at end of file
diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl
index 081e44e48..3ea2641d8 100755
--- a/templates/repo/cloudbrain/benchmark/new.tmpl
+++ b/templates/repo/cloudbrain/benchmark/new.tmpl
@@ -49,6 +49,9 @@
text-align: center;
color: #C2C7CC;
}
+.nowrapx {
+ white-space: nowrap !important;
+}
- {{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · - {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}} + {{.NumMembers}} + {{if le .NumMembers 1}} + {{$.i18n.Tr "org.lower_member"}} + {{else}} + {{$.i18n.Tr "org.lower_members"}} + {{end}} + · + {{.NumRepos}} + {{if le .NumRepos 1}} + {{$.i18n.Tr "org.lower_repository"}} + {{else}} + {{$.i18n.Tr "org.lower_repositories"}} + {{end}} +
-
+
{{.Status}}
@@ -324,11 +324,11 @@
{{$.CsrfTokenHtml}}
{{if .CanDebug}}
{{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}}
-
+
{{$.i18n.Tr "repo.debug"}}
{{else}}
-
+
{{$.i18n.Tr "repo.debug_again"}}
{{end}}
@@ -349,15 +349,9 @@
-
-
+
{{.Status}}
@@ -147,11 +147,11 @@
-
{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl
index 4818f870c..93c35cca4 100755
--- a/templates/repo/modelarts/notebook/show.tmpl
+++ b/templates/repo/modelarts/notebook/show.tmpl
@@ -11,7 +11,7 @@
{{.i18n.Tr "repo.cloudbrain"}}
/
-
+
{{$.i18n.Tr "repo.modelarts.notebook"}}
/
@@ -27,7 +27,7 @@
{{end}}
-
@@ -35,6 +35,18 @@
任务结果:
+任务详情:
{{with .result}}| 状态 | {{.Status}} | +||||||
| 描述 | +{{$.task.Description}} | +||||||
| 镜像名称 | +{{$.task.Image}} | +||||||
| 数据集下载地址 | +{{$.datasetDownloadLink}} | +||||||
| 开始时间 | {{.CreateTime}} | diff --git a/templates/repo/modelarts/trainjob/index.tmpl b/templates/repo/modelarts/trainjob/index.tmpl index 3818df67a..c376e0e8a 100755 --- a/templates/repo/modelarts/trainjob/index.tmpl +++ b/templates/repo/modelarts/trainjob/index.tmpl @@ -113,7 +113,7 @@
| + {{$.i18n.Tr "settings.bind_account_information"}} + | ++ {{$.i18n.Tr "settings.bind_time"}} + | ++ {{$.i18n.Tr "repo.cloudbrain_operate"}} + | + + ++ {{$.i18n.Tr "settings.wechat"}} + | ++ {{TimeSinceUnix1 .SignedUser.WechatBindUnix}} + | + + | + +
|---|
+
{{$.i18n.Tr "settings.unbind_wechat"}}
+
+
+ {{$.i18n.Tr "settings.unbind_computing"}}
+
+
+
+
+