你确认删除该任务么？此任务一旦删除不可恢复。
+";
+ html += "
";
html += " ";
html += "
";
html += "
";
@@ -408,4 +474,5 @@ function displayOrg(json){
}
}
orgDiv.innerHTML = html;
+ swiperOrg.updateSlides();
}
diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go
new file mode 100644
index 000000000..cdcc724fe
--- /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.00"
+)
+
+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))
+ } 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.Status, getCellName("C", row): rs.JobType, 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.modelarts.status"), "C1": ctx.Tr("repo.cloudbrain_task_type"), "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 b7f53c783..766a99af0 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -881,6 +881,8 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Group("/cloudbrain", func() {
m.Get("/:jobid", repo.GetCloudbrainTask)
m.Get("/:jobid/log", repo.CloudbrainGetLog)
+ // m.Get("/:jobname", repo.GetCloudbrainTask)
+ // m.Get("/:jobname/log", repo.CloudbrainGetLog)
}, reqRepoReader(models.UnitTypeCloudBrain))
m.Group("/modelarts", func() {
m.Group("/notebook", func() {
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index dd468783d..a23e3853a 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,8 +97,11 @@ func GetCloudbrainTask(ctx *context.APIContext) {
}
func CloudbrainGetLog(ctx *context.Context) {
+ // jobName := ctx.Params(":jobname")
+ // job, err := models.GetCloudbrainByName(jobName)
jobID := ctx.Params(":jobid")
- _, err := models.GetCloudbrainByJobID(jobID)
+ repoID := ctx.Repo.Repository.ID
+ job, err := models.GetRepoCloudBrainByJobID(repoID, jobID)
if err != nil {
log.Error("GetCloudbrainByJobID failed: %v", err, ctx.Data["MsgID"])
ctx.ServerError(err.Error(), err)
@@ -103,8 +109,8 @@ func CloudbrainGetLog(ctx *context.Context) {
}
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 +121,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 +148,8 @@ func CloudbrainGetLog(ctx *context.Context) {
}
ctx.JSON(http.StatusOK, map[string]interface{}{
- "JobID": jobID,
- "Content": content,
+ "JobID": jobID,
+ "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/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..880d28dcf 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -350,18 +350,15 @@ 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")
+ 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 +366,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,7 +420,7 @@ 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)
@@ -582,12 +580,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 +1103,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 +1208,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 +1354,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/modelarts.go b/routers/repo/modelarts.go
index 9dea34c82..60e58ab52 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -103,8 +103,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 +117,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 +184,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 +215,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)
@@ -262,12 +254,22 @@ 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.HTML(200, tplModelArtsNotebookShow)
}
@@ -417,6 +419,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) {
@@ -442,7 +445,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) {
@@ -1451,6 +1459,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)
}
@@ -1547,7 +1556,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) {
@@ -2050,6 +2064,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 227a22b9e..21c5e2e79 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -322,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")
@@ -517,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)
@@ -984,9 +989,11 @@ 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.Get("/debug", reqWechatBind, cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainDebug)
+ })
+ m.Group("/:jobid", func() {
+ m.Get("/debug", reqWechatBind,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)
@@ -1000,8 +1007,10 @@ func RegisterRoutes(m *macaron.Macaron) {
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)
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..3ba35f8ff 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, 24, 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..d1fe64f1b
--- /dev/null
+++ b/templates/admin/cloudbrain/list.tmpl
@@ -0,0 +1,220 @@
+{{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..0414e45c5
--- /dev/null
+++ b/templates/admin/cloudbrain/search.tmpl
@@ -0,0 +1,47 @@
+
+ {{template "base/alert" .}}
+
+
+
+
+
+ {{template "admin/cloudbrain/search" .}}
+
+
+
+
+
+
+
+
+
+
+
+ {{range .Tasks}}
+
+
+
+ {{$.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"}}
+
+
+
+ {{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" .}}
-
\ No newline at end of file
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index d42ed4058..fa5e0c9b7 100755
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -141,6 +141,7 @@
{{if eq .TabName "activity"}}
{{if .EnableHeatmap}}
+
@@ -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 @@
{{template "base/footer" .}}
-
\ No newline at end of file
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index 1c0ee84fc..4038ce5b0 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -117,6 +117,3 @@
@@ -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..5904ec094 100755
--- a/templates/repo/cloudbrain/benchmark/new.tmpl
+++ b/templates/repo/cloudbrain/benchmark/new.tmpl
@@ -83,7 +83,7 @@
- {{.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}} +
-
+
@@ -102,11 +102,16 @@
+
@@ -182,12 +187,16 @@
function setChildType(){
let type_id = $('#benchmark_types_id').val();
+ let child_selected_id = $('#benchmark_child_types_id_hidden').val();
$.get(`${repolink}/cloudbrain/benchmark/get_child_types?benchmark_type_id=${type_id}`, (data) => {
- console.log(JSON.stringify(data))
const n_length = data['child_types'].length
let html=''
for (let i=0;i${data['child_types'][i].value}`;
+ if(child_selected_id == data['child_types'][i].id){
+ html += ``;
+ }else{
+ html += ``;
+ }
}
document.getElementById("benchmark_child_types_id").innerHTML=html;
})
diff --git a/templates/repo/cloudbrain/benchmark/show.tmpl b/templates/repo/cloudbrain/benchmark/show.tmpl
index 99fd35de2..cf18c4b8c 100755
--- a/templates/repo/cloudbrain/benchmark/show.tmpl
+++ b/templates/repo/cloudbrain/benchmark/show.tmpl
@@ -188,6 +188,7 @@ td, th {
{{range $k ,$v := .version_list_task}}
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index 85d1fb65c..eb0d76e5b 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -208,6 +208,3 @@
+
{{template "base/footer" .}}
\ No newline at end of file
+
\ No newline at end of file
diff --git a/templates/terms.tmpl b/templates/terms.tmpl
new file mode 100644
index 000000000..3c02a119c
--- /dev/null
+++ b/templates/terms.tmpl
@@ -0,0 +1,70 @@
+{{template "base/head_home" .}}
+
@@ -432,19 +433,18 @@ td, th {
let userName
let repoPath
- let jobID
+ let jobName
$(document).ready(function(){
let url = window.location.href;
let urlArr = url.split('/')
userName = urlArr.slice(-5)[0]
repoPath = urlArr.slice(-4)[0]
- jobID = urlArr.slice(-1)[0]
+ jobName = urlArr.slice(-1)[0]
})
-
function loadLog(version_name){
document.getElementById("mask").style.display = "block"
- $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobID}/log?version_name=${version_name}&lines=50&order=asc`, (data) => {
+ $.get(`/api/v1/repos/${userName}/${repoPath}/cloudbrain/${jobName}/log?version_name=${version_name}&lines=50&order=asc`, (data) => {
$('input[name=end_line]').val(data.EndLine)
$('input[name=start_line]').val(data.StartLine)
$(`#log_file${version_name}`).text(data.Content)
diff --git a/templates/repo/courseHome.tmpl b/templates/repo/courseHome.tmpl
index 2c1cedbb7..3f0a2ac9a 100644
--- a/templates/repo/courseHome.tmpl
+++ b/templates/repo/courseHome.tmpl
@@ -121,8 +121,8 @@
- {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{end}}
- {{.i18n.Tr "repo.issues.new.add_labels_title"}}
+ {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}{{.i18n.Tr "repo.issues.new.add_labels_title"}}{{end}}
+
+
+
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index f3794989c..519dcda8f 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -69,7 +69,21 @@
{{$.i18n.Tr "action.reject_pull_request" .GetRepoLink $index .ShortRepoFullDisplayName | Str2html}}
{{else if eq .GetOpType 23}}
{{ $index := index .GetIssueInfos 0}}
- {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoFullDisplayName | Str2html}}
+ {{$.i18n.Tr "action.comment_pull" .GetRepoLink $index .ShortRepoPath | Str2html}}
+ {{else if eq .GetOpType 24}}
+ {{$.i18n.Tr "action.upload_dataset" .GetRepoLink .Content .RefName | Str2html}}
+ {{else if eq .GetOpType 25}}
+ {{$.i18n.Tr "action.task_gpudebugjob" .GetRepoLink .RefName .RefName | Str2html}}
+ {{else if eq .GetOpType 26}}
+ {{$.i18n.Tr "action.task_npudebugjob" .GetRepoLink .Content .RefName | Str2html}}
+ {{else if eq .GetOpType 27}}
+ {{$.i18n.Tr "action.task_trainjob" .GetRepoLink .Content .RefName | Str2html}}
+ {{else if eq .GetOpType 28}}
+ {{$.i18n.Tr "action.task_inferencejob" .GetRepoLink .Content .RefName | Str2html}}
+ {{else if eq .GetOpType 29}}
+ {{$.i18n.Tr "action.task_benchmark" .GetRepoLink .RefName .RefName | Str2html}}
+ {{else if eq .GetOpType 30}}
+ {{$.i18n.Tr "action.task_createmodel" .GetRepoLink .RefName .RefName | Str2html}}
{{end}}
{{if or (eq .GetOpType 5) (eq .GetOpType 18)}}
@@ -101,7 +115,23 @@
OpenI启智社区AI协作平台使用协议
+ ++ OpenI启智社区AI协作平台作为新一代人工智能领域开源开放开发协作平台，不仅为用户提供代码托管与数据集管理等服务，同时提供开发者所需的计算算力资源，一个良好的开发环境对用户、组织和项目都尤为重要。 +
++ 为了保障用户权益，维护平台正常秩序，实现平台规范化运营，给开发者提供一个良好的开发环境，您不得在本平台进行恶意攻击、挖矿等任何违法或扰乱平台秩序的行为。一经发现，平台有权变更、暂停或终止您对平台服务的使用而无须事先声明，包括但不限于限制您使用平台服务的次数与资源、账号永久封闭等。 +
++ AI协作平台使用协议及违规处罚 +
++ 1. 您需保证对平台服务的使用不违反国家各项法律法规的规定，且不侵害任何第三方权益，如因此造成任何后果及损失，由您自行承担全部责任。 +
++ 2. 禁止行为 +
+
+ 您充分理解并同意，您在使用平台服务时，应当遵守所有中华人民共和国的法律、法规、规章制度、规范、政策、行政命令、强制标准及行业标准等（统称为“法律法规”）。除非法律法规允许且启智社区事先书面许可，您不得从事以下活动，也不得同意、授权或指示任何第三人从事包括但不限于以下内容的活动:
+
+ (1) 对平台服务进行挖矿、逆向工程、反编辑等恶意行为损坏平台服务相关内容与数据，或不正当手段获取原始数据和其他数据等；
+ (2) 对平台服务或者平台服务运行过程中释放出的任何数据或其他数据及平台服务运行过程中的交互数据进行复制、更改、修改等操作，包括但不限于使用插件、外挂或非经授权的第三方工具或服务接入平台服务和相关系统；
+
+ (3) 宣扬或提供关于非法行为的说明信息、宣扬针对任何团体或个人的人身伤害或传播任何病毒、蠕虫、缺陷、特洛伊木马或其他具有破坏性的内容等；
+ (4) 删除本平台服务中包含的任何版权声明、商标声明或其他所有权声明；包括但不限于任何有损本平台一切相关知识产权的行为；
+ (5) 创造任何网站或应用程序以重现或复制平台服务或本平台。
+
+ 3. 遵守法律规范 +
++ 您不得利用平台服务上传、上载、发布、发表、传播任何违法内容，包括但不限于您制作、复制、发布、传播下列信息： +
+
+ （1）煽动抗拒、破坏宪法和法律、行政法规实施
+ （2）煽动颠覆国家政权，推翻社会主义制度
+ （3）煽动分裂国家、破坏国家统一
+ （4）煽动民族仇恨、民族歧视、破坏民族团结
+ （5）捏造或者歪曲事实、散布谣言，扰乱社会秩序
+ （6）宣扬封建迷信、淫秽、色情、赌博、暴力、教唆犯罪
+ （7）公然侮辱他人或者捏造事实诽谤他人
+ （8）损害国家机关信誉或有损国家领导人荣誉
+ （9）其他违反宪法和法律、行政法规
+ （10）含有虚假、有害、胁迫、侵害他人隐私、骚扰、侵害、中伤、粗俗、猥亵或其他道德上令人反感的内容
+ （11）含有中国法律、法规、规章、条例以及任何具有法律效力之规范所限制或禁止的其他内容
+
+ 一经发现，平台将按照国家有关规定，及时删除网站中含有上述内容的地址、目录，并保留原始记录，在二十四小时之内向公安机关报告。 +
++ 4. 保障网络信息安全 +
+
+ 您不得利用平台服务从事以下危害计算机网络信息安全的活动：
+ (1) 未经允许，进入计算机信息网络或者使用计算机信息网络资源的；
+ (2) 未经允许，对计算机信息网络功能进行删除、修改或者增加的；
+ (3) 未经允许，对进入计算机信息网络中存储、处理或者传输的数据和应用程序进行删除、修改或者增加的；
+ (4) 故意制作、传播计算机病毒等破坏性程序的；
+ (5) 其他危害计算机信息网络安全的行为。
+
+ 5. 您充分理解并同意，您对自己使用平台服务的一切行为及由此产生的一切结果负责，包括但不限于您所发表的任何内容、提供的任何服务以及由此产生的任何后果。您应对平台服务的内容应自行判断并决定是否使用，并承担因使用平台服务及其相关内容而引起的所有风险，包括因对平台服务及其内容的真实性、完整性、准确性、及时性及实用性的依赖而产生的风险。平台不对此提供任何担保和保证，不对因前述风险而导致的任何后果或损失对您承担责任。 +
++ 如果您违反了法律法规或本协议，OpenI启智社区有权依据合理判断对违反法律法规或本协议的行为作出处理，并保留对该违反行为采取法律所能提供的所有补救手段的权利。OpenI启智社区有权对违反法律法规及本协议的任何用户调查并采取适当的法律行动，包括但不限于民事诉讼等。OpenI启智社区有权根据违法违规行为的严重程度，将上述违法违规行为的线索和您的个人信息报告司法机关或其他执法机关，并配合司法机关或其他执法机关进行的调查、听证、起诉等。您应当自行承担由此产生的任何法律责任。 +
+
- {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}}
+ {{if eq .GetOpType 24}}
+
+ {{else if eq .GetOpType 25}}
+
+ {{else if eq .GetOpType 26}}
+
+ {{else if eq .GetOpType 27}}
+
+ {{else if eq .GetOpType 28}}
+
+ {{else if eq .GetOpType 29}}
+
+ {{else if eq .GetOpType 30}}
+
+ {{else}}
+ {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}}
+ {{end}}
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 000000000..e69de29bb
diff --git a/web_src/js/components/EditAboutInfo.vue b/web_src/js/components/EditAboutInfo.vue
index 425cf4bcc..78cdb70a6 100644
--- a/web_src/js/components/EditAboutInfo.vue
+++ b/web_src/js/components/EditAboutInfo.vue
@@ -1,7 +1,7 @@
+
- {{scope.row.name}}
+ {{scope.row.alias}}