";
+ html += "
";
html += " ";
html += "
";
html += "
";
@@ -408,4 +474,5 @@ function displayOrg(json){
}
}
orgDiv.innerHTML = html;
+ swiperOrg.updateSlides();
}
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 72a68a6d3..36f220cef 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -878,8 +878,9 @@ func RegisterRoutes(m *macaron.Macaron) {
}, reqAdmin())
}, reqAnyRepoReader())
m.Group("/cloudbrain", func() {
- m.Get("/:jobid", repo.GetCloudbrainTask)
- m.Get("/:jobid/log", repo.CloudbrainGetLog)
+ // m.Get("/:jobid", repo.GetCloudbrainTask)
+ 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..6a2538048 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,12 @@ func GetCloudbrainTask(ctx *context.APIContext) {
err error
)
- jobID := ctx.Params(":jobid")
- repoID := ctx.Repo.Repository.ID
- job, err := models.GetRepoCloudBrainByJobID(repoID, jobID)
+ jobName := ctx.Params(":jobname")
+ job, err := models.GetCloudbrainByName(jobName)
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
@@ -84,7 +83,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 +93,8 @@ 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"])
ctx.ServerError(err.Error(), err)
@@ -103,8 +102,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 +114,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 +141,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/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 ba5fc8a05..344115977 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,6 +580,7 @@ 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)
@@ -1104,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)
@@ -1206,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)
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 7fb8a3c35..b4c17bb3a 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,20 @@ 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")
}
+ var datasetDownloadLink string
+ 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)
}
@@ -387,7 +387,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 +417,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 +429,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) {
+ log.Info("old notebook version")
+ } else {
+ ctx.ServerError("DelNotebook2 failed", err)
+ return
+ }
}
err = models.DeleteJob(task)
@@ -1452,6 +1457,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)
}
@@ -2056,6 +2062,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 31ab2a50d..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")
@@ -978,8 +979,10 @@ 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)
@@ -994,8 +997,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/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 "custom.foot.news"}}
diff --git a/templates/home.tmpl b/templates/home.tmpl
index f43639a14..d21197602 100755
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -20,7 +20,7 @@
* {{.page_only_dynamic}}
-
+
@@ -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 @@
@@ -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/select_pro.tmpl b/templates/org/select_pro.tmpl
index 70b2a9bb3..5105fa40e 100755
--- a/templates/org/select_pro.tmpl
+++ b/templates/org/select_pro.tmpl
@@ -70,11 +70,11 @@
- {{.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}} +
{{if .tags}}
- 精选项目
+ {{.i18n.Tr "org.selected_project"}}
{{if .IsOrganizationOwner}}
- {{svg "octicon-gear" 16}}自定义
+ {{svg "octicon-gear" 16}}{{.i18n.Tr "org.customize"}}
{{end}}
{{end}}
@@ -137,10 +137,10 @@
{{end}}
diff --git a/templates/repo/cloudbrain/benchmark/index.tmpl b/templates/repo/cloudbrain/benchmark/index.tmpl
index dd6dc7af3..e0eb0a6f3 100644
--- a/templates/repo/cloudbrain/benchmark/index.tmpl
+++ b/templates/repo/cloudbrain/benchmark/index.tmpl
@@ -99,8 +99,7 @@
diff --git a/templates/repo/cloudbrain/benchmark/new.tmpl b/templates/repo/cloudbrain/benchmark/new.tmpl
index 69c9d5048..5904ec094 100755
--- a/templates/repo/cloudbrain/benchmark/new.tmpl
+++ b/templates/repo/cloudbrain/benchmark/new.tmpl
@@ -83,7 +83,7 @@
-
自定义精选项目
+{{.i18n.Tr "org.custom_select_projects"}}
-
{{end}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index e7081b58f..bc7f5febd 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -36,7 +36,19 @@
{{end}}
最多可选9个公开项目
+{{.i18n.Tr "org.max_selectedPro"}}
@@ -223,12 +223,12 @@
function saveSeletedPro(typeTag){
var saveData=[];
$('input[name="select_pro_name"]:checked').each(function(){
- console.log('值',this.dataset.repoid)
+ // console.log('值',this.dataset.repoid)
saveData.push(parseInt(this.dataset.repoid));
})
if(saveData.length>9){
- alert("最多可选9个，保存失败")
+ alert("{{.i18n.Tr "org.save_fail_tips"}}")
return
}
// saveData = getSelecteDataID();
@@ -242,7 +242,7 @@
data:JSON.stringify({'repoList':saveData
}),
success:function(res){
- console.log('保存成功');
+ // console.log('保存成功');
location.reload()
}
@@ -270,15 +270,15 @@
filterData.push(data[i])
}
}
- console.log("选中的值:",selectedData)
- console.log("筛选包括选中的值:",filterData)
+ // console.log("选中的值:",selectedData)
+ // console.log("筛选包括选中的值:",filterData)
var showData=[];
for(i=0;i{
return item.RepoID!=selectedData[i].RepoID
});
}
- console.log("筛选后不包括选中的值:",filterData)
+ // console.log("筛选后不包括选中的值:",filterData)
$("#org_list").empty()
if(searchValue!=""){
if (filterData.length!=0){
@@ -307,7 +307,7 @@
num++
if(num>9){
document.getElementById(id).checked=false
- alert("选择超过9个，请重新选择！")
+ alert("{{.i18n.Tr "org.select_again"}}")
return
}
}
@@ -315,7 +315,8 @@
}
var show_num = 9-num;
- document.getElementById("recommend").innerHTML="还能推荐"+show_num+"个"
+ let rec = "{{.i18n.Tr "org.recommend_remain_pro"}}"
+ document.getElementById("recommend").innerHTML=rec +" : "+ show_num
}
diff --git a/templates/org/team/courseTeams.tmpl b/templates/org/team/courseTeams.tmpl
index d4c5acd62..84788f8a5 100644
--- a/templates/org/team/courseTeams.tmpl
+++ b/templates/org/team/courseTeams.tmpl
@@ -44,7 +44,19 @@
{{end}}
-
+
-
+
-
+
@@ -102,11 +102,16 @@
+
@@ -182,11 +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) => {
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}}
+
@@ -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}}
+