";
@@ -276,7 +298,14 @@ var actionNameZH={
"15":"重新开启了合并请求",
"17":"从 {repoName} 删除分支 {deleteBranchName}",
"22":"建议变更",
- "23":"评论了合并请求"
+ "23":"评论了合并请求",
+ "24":"上传了数据集文件",
+ "25":"创建了CPU/GPU类型调试任务",
+ "26":"创建了NPU类型调试任务",
+ "27":"创建了训练任务",
+ "28":"创建了推理任务",
+ "29":"创建了评测任务",
+ "30":"导入了新模型"
};
var actionNameEN={
@@ -294,7 +323,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={
diff --git a/routers/admin/cloudbrains.go b/routers/admin/cloudbrains.go
new file mode 100644
index 000000000..1cf5ca256
--- /dev/null
+++ b/routers/admin/cloudbrains.go
@@ -0,0 +1,217 @@
+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,
+ })
+ 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): rs.Repo.OwnerName + "/" + rs.Repo.Alias, getCellName("I", row): rs.JobName,
+ }
+}
+
+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/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 d26b8f08c..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 jobName = ctx.Params(":jobname")
task, err := models.GetCloudbrainByName(jobName)
if err != nil {
ctx.Data["error"] = err.Error()
}
-
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
@@ -588,7 +586,13 @@ func CloudBrainDel(ctx *context.Context) {
ctx.ServerError(err.Error(), err)
return
}
- ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=" + listType)
+
+ 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 {
@@ -1099,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)
@@ -1201,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)
@@ -1344,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 b983a4e17..64c8fab46 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -120,8 +120,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
@@ -129,26 +134,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)
@@ -208,8 +201,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 {
@@ -240,7 +232,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)
@@ -279,10 +271,19 @@ 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
@@ -461,7 +462,12 @@ func NotebookDel(ctx *context.Context) {
return
}
- ctx.Redirect(setting.AppSubURL + ctx.Repo.RepoLink + "/debugjob?debugListType=" + listType)
+ 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) {
@@ -1473,6 +1479,7 @@ func TrainJobShow(ctx *context.Context) {
ctx.Data["displayJobName"] = VersionListTasks[0].DisplayJobName
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)
}
@@ -1569,7 +1576,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) {
@@ -2072,6 +2084,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/routes/routes.go b/routers/routes/routes.go
index 55b24e97a..e9c7d3fd1 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -319,6 +319,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")
@@ -507,6 +508,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)
@@ -996,7 +1001,6 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchMarkShow)
})
m.Group("/:jobid", func() {
- // m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchMarkShow)
m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainStop)
m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.BenchmarkDel)
m.Get("/rate", reqRepoCloudBrainReader, repo.GetRate)
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..0a09230eb
--- /dev/null
+++ b/templates/admin/cloudbrain/list.tmpl
@@ -0,0 +1,219 @@
+{{template "base/head" .}}
+
+
+
+
+
+ {{template "admin/navbar" .}}
+
+ {{template "base/alert" .}}
+
+
+ {{template "admin/cloudbrain/search" .}}
+
+
+
+
+
+
+
+
+ {{$.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"}}
+
+
+
+ {{range .Tasks}}
+
+
+
+
+
+
+ {{.JobType}}
+
+
+
+
+ {{.Status}}
+
+
+
+
+ {{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}
+
+
+
+ {{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}
+
+
+
+ {{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}
+
+
+
+ {{if .User.Name}}
+
+ {{else}}
+
+ {{end}}
+
+
+
+
+
+ {{.JobName}}
+
+
+ {{if eq .JobType "DEBUG"}}
+
+ {{end}}
+
+
+
+
+
+
+
+ {{end}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
你确认删除该任务么？此任务一旦删除不可恢复。
+
+
+
+
+
+{{template "base/footer" .}}
+
diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl
new file mode 100644
index 000000000..bbd45e550
--- /dev/null
+++ b/templates/admin/cloudbrain/search.tmpl
@@ -0,0 +1,46 @@
+
+
+
+
{{.i18n.Tr "admin.cloudbrain.all_task_types"}}
+
+
+
+
+
{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}
+
+
+
+
+
{{.i18n.Tr "admin.cloudbrain.all_status"}}
+
+
+
+
\ 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"}}
+
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index aa0704434..865a780a8 100755
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -78,7 +78,7 @@
{{if le .NumRepos 1}}
{{$.i18n.Tr "org.lower_repository"}}
{{else}}
- {{$.i18n.Tr "org.lower_repository"}}
+ {{$.i18n.Tr "org.lower_repositories"}}
{{end}}
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index c411a014b..03ca8c41e 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -232,7 +232,7 @@
{{if le .NumRepos 1}}
{{$.i18n.Tr "org.lower_repository"}}
{{else}}
- {{$.i18n.Tr "org.lower_repository"}}
+ {{$.i18n.Tr "org.lower_repositories"}}
{{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 @@
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 000000000..e69de29bb
diff --git a/web_src/js/components/Images.vue b/web_src/js/components/Images.vue
index 6fe26d532..a56d81e4c 100644
--- a/web_src/js/components/Images.vue
+++ b/web_src/js/components/Images.vue
@@ -310,7 +310,6 @@ export default {
},
handleCurrentChange(val){
- console.log(val)
this.params.page = val
this.getImageList()
@@ -350,7 +349,6 @@ export default {
})
},
copyUrl(url){
- console.log(url)
const cInput = document.createElement('input')
cInput.value = url
document.body.appendChild(cInput)
@@ -380,16 +378,13 @@ export default {
clearP(value){
- console.log("sorce value",value)
if(!value) return ''
const reg = /\<\/?p\>/g;
value = value.replace(reg,'')
- console.log("repalace:",value)
return value
},
transformTimestamp(timestamp){
- console.log("timestamp",timestamp)
let a = new Date(timestamp).getTime();
const date = new Date(a);
const Y = date.getFullYear() + '-';
diff --git a/web_src/js/components/UserAnalysis.vue b/web_src/js/components/UserAnalysis.vue
index 5650e164f..682dbc78c 100755
--- a/web_src/js/components/UserAnalysis.vue
+++ b/web_src/js/components/UserAnalysis.vue
@@ -200,7 +200,6 @@
var saveFileName=''
var Date=(this.params.startDate).split('-')
var startDate=Date[0]+''+Date[1]+''+Date[2]
- console.log(startDate)
Date=(this.params.endDate).split('-')
var endDate=Date[0]+Date[1]+Date[2]
saveFileName = '用户分析_'+this.search+''+startDate+'_'+endDate
@@ -258,7 +257,6 @@
getUserList(type_val,index){
this.type_val = type_val
this.dynamic = index;
- console.log("dj:"+type_val)
var now = new Date(); // 当前日期
var nowDayOfWeek = now.getDay(); // 今天本周的第几天
var nowDay = now.getDate(); // 当前日
@@ -324,7 +322,6 @@
// console.log("res.data:"+res.data.data)
this.totalNum = res.data.count
- console.log("res.count:"+res.data.count)
})
@@ -354,9 +351,7 @@
},
filters:{
-
transformTimestamp(timestamp){
- console.log("timestamp",timestamp)
let a = new Date(timestamp*1000);
const date = new Date(a);
const Y = date.getFullYear() + '/';
@@ -366,7 +361,6 @@
const m = (date.getMinutes() <10 ? '0'+date.getMinutes() : date.getMinutes());// + ':' ;
// const s = (date.getSeconds() <10 ? '0'+date.getSeconds() : date.getSeconds()) ; // 秒
const dateString = Y + M + D + h + m ;//+ s;
- console.log('dateString', dateString); // > dateString 2021-07-06 14:23
return dateString;
},
},
diff --git a/web_src/js/excel/Export2Excel.js b/web_src/js/excel/Export2Excel.js
index 3c6d022af..85921f7ad 100755
--- a/web_src/js/excel/Export2Excel.js
+++ b/web_src/js/excel/Export2Excel.js
@@ -100,7 +100,6 @@ export function export_table_to_excel(id) {
/* original data */
var data = oo[0];
var ws_name = "SheetJS";
- console.log(data);
var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
@@ -118,7 +117,7 @@ export function export_table_to_excel(id) {
}
function formatJson(jsonData) {
- console.log(jsonData)
+
}
export function export_json_to_excel(th, jsonData, defaultTitle) {
diff --git a/web_src/js/excel/util.js b/web_src/js/excel/util.js
index b600e5e37..809b5b51b 100755
--- a/web_src/js/excel/util.js
+++ b/web_src/js/excel/util.js
@@ -3,7 +3,6 @@ export function export2Excel(columns,list,filename){
const { export_json_to_excel } = require('./Export2Excel');
let tHeader = []
let filterVal = []
- console.log(columns)
if(!columns){
return;
}
diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js
new file mode 100644
index 000000000..5fcaf56c8
--- /dev/null
+++ b/web_src/js/features/cloudrbanin.js
@@ -0,0 +1,236 @@
+export default async function initCloudrain() {
+ let timeid = window.setInterval(loadJobStatus, 15000);
+ $(document).ready(loadJobStatus);
+ function loadJobStatus() {
+ $(".job-status").each((index, job) => {
+ const jobID = job.dataset.jobid;
+ const repoPath = job.dataset.repopath;
+ // const computeResource = job.dataset.resource
+ const versionname = job.dataset.version
+ const status_text = $(`#${jobID}-text`).text()
+ console.log(versionname)
+ const finalState = ['STOPPED','CREATE_FAILED','UNAVAILABLE','DELETED','RESIZE_FAILED','SUCCEEDED','IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED','SUBMIT_MODEL_FAILED','DEPLOY_SERVICE_FAILED','CHECK_FAILED']
+ if (finalState.includes(status_text)) {
+ return
+ }
+ // const diffResource = computeResource == "NPU" ? 'modelarts/notebook' : 'cloudbrain'
+ $.get(`/api/v1/repos/${repoPath}/${jobID}?version_name=${versionname}`, (data) => {
+ const jobID = data.JobID
+ const status = data.JobStatus
+ const duration = data.JobDuration
+ $('#duration-'+jobID).text(duration)
+ if (status != status_text) {
+ $('#' + jobID+'-icon').removeClass().addClass(status)
+ $('#' + jobID+ '-text').text(status)
+ finalState.includes(status) && $('#' + jobID + '-stop').removeClass('blue').addClass('disabled')
+ }
+ if(status==="RUNNING"){
+ $('#ai-debug-'+jobID).removeClass('disabled').addClass('blue').text('调试').css("margin","0 1rem")
+ $('#model-image-'+jobID).removeClass('disabled').addClass('blue')
+ }
+ if(status!=="RUNNING"){
+ // $('#model-debug-'+jobID).removeClass('blue')
+ // $('#model-debug-'+jobID).addClass('disabled')
+ $('#model-image-'+jobID).removeClass('blue').addClass('disabled')
+ }
+ if(["CREATING","STOPPING","WAITING","STARTING"].includes(status)){
+ $('#ai-debug-'+jobID).removeClass('blue').addClass('disabled')
+ }
+ if(['STOPPED','FAILED','START_FAILED','CREATE_FAILED','SUCCEEDED'].includes(status)){
+ $('#ai-debug-'+jobID).removeClass('disabled').addClass('blue').text('再次调试').css("margin","0")
+ }
+ if(["RUNNING","WAITING"].includes(status)){
+ $('#ai-stop-'+jobID).removeClass('disabled').addClass('blue')
+ }
+ if(["CREATING","STOPPING","STARTING","STOPPED","FAILED","START_FAILED","SUCCEEDED"].includes(status)){
+ $('#ai-stop-'+jobID).removeClass('blue').addClass('disabled')
+ }
+
+ if(["STOPPED","FAILED","START_FAILED","KILLED","COMPLETED","SUCCEEDED"].includes(status)){
+ $('#ai-delete-'+jobID).removeClass('disabled').addClass('blue')
+ }else{
+ $('#ai-delete-'+jobID).removeClass('blue').addClass('disabled')
+ }
+ }).fail(function(err) {
+ console.log(err);
+ });
+ });
+ };
+ function assertDelete(obj,versionName,repoPath) {
+ if (obj.style.color == "rgb(204, 204, 204)") {
+ return
+ } else {
+ const delId = obj.parentNode.id
+ let flag = 1;
+ $('.ui.basic.modal')
+ .modal({
+ onDeny: function() {
+ flag = false
+ },
+ onApprove: function() {
+ if(!versionName){
+ document.getElementById(delId).submit()
+ }
+ else{
+ deleteVersion(versionName,repoPath)
+ }
+ flag = true
+ },
+ onHidden: function() {
+ if (flag == false) {
+ $('.alert').html('您已取消操作').removeClass('alert-success').addClass('alert-danger').show().delay(1500).fadeOut();
+ }
+ }
+ })
+ .modal('show')
+ }
+ }
+ function deleteVersion(versionName,repoPath){
+ const url = `/api/v1/repos/${repoPath}`
+ $.post(url,{version_name:versionName},(data)=>{
+ if(data.StatusOK===0){
+ location.reload()
+ }
+ }).fail(function(err) {
+ console.log(err);
+ });
+ }
+ $('.ui.basic.ai_delete').click(function() {
+ const repoPath = this.dataset.repopath
+ const versionName = this.dataset.version
+ if(repoPath && versionName){
+ assertDelete(this,versionName,repoPath)
+ }
+ else{
+ assertDelete(this)
+ }
+ })
+ function stopDebug(JobID,stopUrl){
+ $.ajax({
+ type:"POST",
+ url:stopUrl,
+ data:$('#stopForm-'+JobID).serialize(),
+ success:function(res){
+ if(res.result_code==="0"){
+ $('#' + JobID+'-icon').removeClass().addClass(res.status)
+ $('#' + JobID+ '-text').text(res.status)
+ if(res.status==="STOPPED"){
+ $('#ai-debug-'+JobID).removeClass('disabled').addClass('blue').text("再次调试").css("margin","0")
+ $('#ai-image-'+JobID).removeClass('blue').addClass('disabled')
+ $('#ai-model-debug-'+JobID).removeClass('blue').addClass('disabled')
+ $('#ai-delete-'+JobID).removeClass('disabled').addClass('blue')
+ $('#ai-stop-'+JobID).removeClass('blue').addClass('disabled')
+ }
+ else{
+ $('#ai-debug-'+JobID).removeClass('blue').addClass('disabled')
+ $('#ai-stop-'+JobID).removeClass('blue').addClass('disabled')
+ }
+
+ }else{
+ $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
+ }
+ },
+ error :function(res){
+ console.log(res)
+
+ }
+ })
+ }
+ $('.ui.basic.ai_stop').click(function() {
+ const jobID = this.dataset.jobid
+ const repoPath = this.dataset.repopath
+ stopDebug(jobID,repoPath)
+ })
+
+ function stopVersion(version_name,jobID,repoPath){
+ const url = `/api/v1/repos/${repoPath}/${jobID}/stop_version`
+ $.post(url,{version_name:version_name},(data)=>{
+ if(data.StatusOK===0){
+ $('#ai-stop-'+jobID).removeClass('blue')
+ $('#ai-stop-'+jobID).addClass('disabled')
+ refreshStatus(version_name,jobID,repoPath)
+ }
+ }).fail(function(err) {
+ console.log(err);
+ });
+ }
+ function refreshStatus(version_name,jobID,repoPath){
+
+ const url = `/api/v1/repos/${repoPath}/${jobID}/?version_name${version_name}`
+ $.get(url,(data)=>{
+ $(`#${jobID}-icon`).attr("class",data.JobStatus)
+ // detail status and duration
+ $(`#${jobID}-text`).text(data.JobStatus)
+ }).fail(function(err) {
+ console.log(err);
+ });
+ }
+ $('.ui.basic.ai_stop_version').click(function() {
+ const jobID = this.dataset.jobid
+ const repoPath = this.dataset.repopath
+ const versionName = this.dataset.version
+ stopVersion(versionName,jobID,repoPath)
+ })
+ function getModelInfo(repoPath,modelName,versionName,jobName){
+ console.log("getModelInfo")
+ $.get(`${repoPath}/modelmanage/show_model_info_api?name=${modelName}`,(data)=>{
+ if(data.length===0){
+ $(`#${jobName}`).popup('toggle')
+ }else{
+ let versionData = data.filter((item)=>{
+ return item.Version === versionName
+ })
+ if(versionData.length==0){
+ $(`#${jobName}`).popup('toggle')
+ }
+ else{
+ location.href = `${repoPath}/modelmanage/show_model_info?name=${modelName}`
+ }
+ }
+ })
+ }
+ $('.goto_modelmanage').click(function() {
+ const repoPath = this.dataset.repopath
+ const modelName = this.dataset.modelname
+ const versionName = this.dataset.version
+ const jobName = this.dataset.jobname
+ getModelInfo(repoPath,modelName,versionName,jobName)
+ })
+ function debugAgain(JobID,debugUrl){
+ if($('#' + JobID+ '-text').text()==="RUNNING"){
+ window.open(debugUrl+'debug')
+ }else{
+ $.ajax({
+ type:"POST",
+ url:debugUrl+'restart',
+ data:$('#debugAgainForm-'+JobID).serialize(),
+ success:function(res){
+ if(res.result_code==="0"){
+ if(res.job_id!==JobID){
+ location.reload()
+ }else{
+ $('#' + JobID+'-icon').removeClass().addClass(res.status)
+ $('#' + JobID+ '-text').text(res.status)
+ $('#ai-debug-'+JobID).removeClass('blue').addClass('disabled')
+ $('#ai-delete-'+JobID).removeClass('blue').addClass('disabled')
+ $('#ai-debug-'+JobID).text("调试").css("margin","0 1rem")
+ }
+ }else{
+ $('.alert').html(res.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(2000).fadeOut();
+ }
+ },
+ error :function(res){
+ console.log(res)
+
+ }
+ })
+ }
+ }
+ $('.ui.basic.ai_debug').click(function() {
+ const jobID = this.dataset.jobid
+ const repoPath = this.dataset.repopath
+ debugAgain(jobID,repoPath)
+ })
+}
+
+
\ No newline at end of file
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 6bc0d2b88..cec6823a6 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -40,6 +40,8 @@ import EditTopics from './components/EditTopics.vue';
import DataAnalysis from './components/DataAnalysis.vue'
import Contributors from './components/Contributors.vue'
import Model from './components/Model.vue';
+import initCloudrain from './features/cloudrbanin.js'
+
Vue.use(ElementUI);
Vue.prototype.$axios = axios;
@@ -2936,6 +2938,7 @@ $(document).ready(async () => {
initNotificationCount();
initTribute();
initDropDown();
+ initCloudrain();
// Repo clone url.
if ($('#repo-clone-url').length > 0) {
@@ -3584,14 +3587,16 @@ function initVueApp() {
}
initVueComponents();
-
+
new Vue({
delimiters: ['${', '}'],
el,
data: {
+ page:parseInt(new URLSearchParams(window.location.search).get('page')),
searchLimit: Number(
(document.querySelector('meta[name=_search_limit]') || {}).content
),
+ page:1,
suburl: AppSubUrl,
uid: Number(
(document.querySelector('meta[name=_context_uid]') || {}).content
@@ -3600,6 +3605,15 @@ function initVueApp() {
},
components: {
ActivityTopAuthors
+ },
+ mounted(){
+ this.page = parseInt(new URLSearchParams(window.location.search).get('page'))
+ },
+ methods:{
+ handleCurrentChange:function (val) {
+ window.location.href='/admin/cloudbrains?page='+val
+ this.page = val
+ }
}
});
}
@@ -3688,8 +3702,6 @@ function initVueModel() {
}
function initVueDataAnalysis() {
const el = document.getElementById('data_analysis');
- console.log("el",el)
-
if (!el) {
return;
}
@@ -3756,7 +3768,6 @@ function initFilterBranchTagDropdown(selector) {
});
});
$data.remove();
- console.log("-this",this)
new Vue({
delimiters: ['${', '}'],
el: this,
diff --git a/web_src/less/openi.less b/web_src/less/openi.less
index 1d165dda8..c9e6a546f 100644
--- a/web_src/less/openi.less
+++ b/web_src/less/openi.less
@@ -720,4 +720,13 @@ display: block;
.markdown:not(code).file-view{
padding: 2em 0!important;
}
-}
\ No newline at end of file
+}
+//elemet-ui
+
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+ background-color: #5bb973 !important;
+ color: #FFF !important;
+ }
+ .el-pagination.is-background .el-pager li:hover {
+ color: #5bb973 !important;
+ }
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index a08810ebc..cd3635427 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -115,6 +115,15 @@ module.exports = {
},
],
},
+ {
+ test: /\.ts$/,
+ use: [
+ {
+ loader: "ts-loader",
+ }
+ ],
+ exclude: /node_modules/
+ },
{
test: /\.js$/,
exclude: /node_modules/,
@@ -252,6 +261,7 @@ module.exports = {
alias: {
vue$: 'vue/dist/vue.esm.js', // needed because vue's default export is the runtime only
},
+ extensions: ['.tsx', '.ts', '.js']
},
watchOptions: {
ignored: [