README.md

@@ -71,7 +71,7 @@
    ```
    docker pull swr.cn-north-4.myhuaweicloud.com/openi/aiforge-postgres:v1
    
-   docker pull swr.cn-north-4.myhuaweicloud.com/openi/aiforge-dev:v1
+   docker pull swr.cn-north-4.myhuaweicloud.com/openi/aiforge-dev:v2
    ```
 
 2. 启动镜像：

models/resource_scene.go

@@ -27,6 +27,7 @@ type ResourceScene struct {
 	JobType         string
 	Cluster         string
 	ComputeResource string
+	IsExclusive     bool
 	IsSpecExclusive string
 	SceneType       string //共享或者独占场景
 	ExclusiveOrg    string
@@ -176,6 +177,7 @@ func InsertResourceScene(r ResourceSceneReq) error {
 	rs := ResourceScene{
 		SceneName:       r.SceneName,
 		JobType:         r.JobType,
+		IsExclusive:     r.IsSpecExclusive == "exclusive",
 		IsSpecExclusive: r.IsSpecExclusive,
 		SceneType:       r.SceneType,
 		Cluster:         r.Cluster,
@@ -273,11 +275,12 @@ func UpdateResourceScene(r ResourceSceneReq) error {
 	//update scene
 	rs := ResourceScene{
 		SceneName:       r.SceneName,
+		IsExclusive:     r.IsSpecExclusive == "exclusive",
 		IsSpecExclusive: r.IsSpecExclusive,
 		ExclusiveOrg:    r.ExclusiveOrg,
 		SceneType:       r.SceneType,
 	}
-	if _, err = sess.ID(r.ID).UseBool("is_spec_exclusive").Update(&rs); err != nil {
+	if _, err = sess.ID(r.ID).UseBool("is_spec_exclusive", "is_exclusive").Update(&rs); err != nil {
 		return err
 	}
 

models/user_business_analysis.go

@@ -579,18 +579,19 @@ func refreshUserStaticTable(wikiCountMap map[string]int, tableName string, pageS
 	var CommitCodeSizeMap map[string]*git.UserKPIStats
 	var err error
 	var existCommitCodeSize map[int64]int
-	if tableName == "user_business_analysis_all" || tableName == "user_business_analysis_current_year" {
-
+	if tableName == "user_business_analysis_all" {
 		oneDayStartTime := pageEndTime.AddDate(0, 0, -1)
+		oneDayStartTime = time.Date(oneDayStartTime.Year(), oneDayStartTime.Month(), oneDayStartTime.Day(), 0, 0, 0, 1, oneDayStartTime.Location())
 		if oneDayStartTime.Format("2006-01-02") == pageStartTime.Format("2006-01-02") {
 			existCommitCodeSize = make(map[int64]int, 0)
 		} else {
 			existCommitCodeSize = queryCommitCodeSizeFromDb("public." + tableName)
 		}
+		oneDayEndTime := time.Date(oneDayStartTime.Year(), oneDayStartTime.Month(), oneDayStartTime.Day(), 23, 59, 59, 1, oneDayStartTime.Location())
 		log.Info("GetAllUserKPIStats oneDayStartTime=" + oneDayStartTime.Format("2006-01-02 15:04:05"))
-		log.Info("GetAllUserKPIStats pageEndTime=" + pageEndTime.Format("2006-01-02 15:04:05"))
+		log.Info("GetAllUserKPIStats pageEndTime=" + oneDayEndTime.Format("2006-01-02 15:04:05"))
 		log.Info("existCommitCodeSize len=" + fmt.Sprint(len(existCommitCodeSize)))
-		CommitCodeSizeMap, err = GetAllUserKPIStats(oneDayStartTime, pageEndTime)
+		CommitCodeSizeMap, err = GetAllUserKPIStats(oneDayStartTime, oneDayEndTime)
 		if err != nil {
 			log.Info("query commit code errr.")
 		} else {
@@ -2286,7 +2287,7 @@ func queryUserModelConvert(start_unix int64, end_unix int64) map[int64]int {
 }
 
 func isBenchMark(JobType string) bool {
-	if JobType == "BENCHMARK" || JobType == "MODELSAFETY" || JobType == "SNN4IMAGENET" || JobType == "BRAINSCORE" || JobType == "SNN4ECOSET" {
+	if JobType == "BENCHMARK" || JobType == "MODELSAFETY" || JobType == "SNN4IMAGENET" || JobType == "BRAINSCORE" || JobType == "SNN4ECOSET" || JobType == "SIM2BRAIN_SNN" {
 		return true
 	}
 	return false
@@ -2322,12 +2323,9 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s
 			if _, ok := resourceItemMap[cloudTaskRecord.UserID]; !ok {
 				resourceItemMap[cloudTaskRecord.UserID] = make(map[string]int)
 			}
-
 			if cloudTaskRecord.Duration < 100000000 && cloudTaskRecord.Duration > 0 {
 				setMapKey("CloudBrainRunTime", cloudTaskRecord.UserID, int(cloudTaskRecord.Duration), resultItemMap)
 				resourceItemMap[cloudTaskRecord.UserID][cloudTaskRecord.ComputeResource] = resourceItemMap[cloudTaskRecord.UserID][cloudTaskRecord.ComputeResource] + int(cloudTaskRecord.Duration)
-			} else {
-				resourceItemMap[cloudTaskRecord.UserID][cloudTaskRecord.ComputeResource] = 0
 			}
 			if cloudTaskRecord.Type == 1 { //npu
 				setMapKey("CloudBrainTwo", cloudTaskRecord.UserID, 1, resultItemMap)
@@ -2359,7 +2357,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s
 					} else {
 						setMapKey("NpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap)
 					}
-				} else if cloudTaskRecord.ComputeResource == GPUResource {
+				} else {
 					if cloudTaskRecord.JobType == "TRAIN" {
 						setMapKey("GpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap)
 					} else if cloudTaskRecord.JobType == "ONLINEINFERENCE" {

models/user_year_summary.go

@@ -342,7 +342,7 @@ func queryUserYearModel(start_unix int64, end_unix int64) map[int64]map[string]i
 	var indexTotal int64
 	indexTotal = 0
 	for {
-		sess.Select("id,user_id,download_count,reference_count").Table("ai_model_manage").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
+		sess.Select("id,name,user_id,download_count,reference_count").Table("ai_model_manage").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal))
 		aiModelList := make([]*AiModelManage, 0)
 		sess.Find(&aiModelList)
 		log.Info("query user year AiModelManage size=" + fmt.Sprint(len(aiModelList)))

modules/base/tool.go

@@ -224,7 +224,7 @@ func SizedAvatarLinkWithDomain(email string, size int) string {
 
 // FileSize calculates the file size and generate user-friendly string.
 func FileSize(s int64) string {
-	return humanize.Bytes(uint64(s))
+	return humanize.IBytes(uint64(s))
 }
 
 // PrettyNumber produces a string form of the given number in base 10 with

routers/card_request/card_request.go

@@ -14,7 +14,6 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	cardrequestservice "code.gitea.io/gitea/services/card_request"
-	"golang.org/x/exp/slices"
 )
 
 func GetCreationInfo(ctx *context.Context) {
@@ -111,7 +110,7 @@ func GetAdminCardRequestList(ctx *context.Context) {
 }
 
 func CreateCardRequest(ctx *context.Context, cardReq api.CardReq) {
-	data, err := cardrequestservice.GetCreationInfo()
+	/**data, err := cardrequestservice.GetCreationInfo()
 	if err != nil {
 		log.Error("can not get creation info", err)
 		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
@@ -126,14 +125,14 @@ func CreateCardRequest(ctx *context.Context, cardReq api.CardReq) {
 			ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("repo.parameter_is_wrong")))
 			return
 		}
-	}
+	}*/
 
 	if cardReq.ResourceType != models.RESOURCE_TYPE_SHARE && cardReq.ResourceType != models.RESOURCE_TYPE_EXCLUSIVE {
 		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("repo.parameter_is_wrong")))
 		return
 	}
 
-	err = cardrequestservice.CreateCardRequest(cardReq, ctx.User.ID)
+	err := cardrequestservice.CreateCardRequest(cardReq, ctx.User.ID)
 	if err != nil {
 		log.Error("can not create card request", err)
 		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("card_request.create_fail")))
@@ -182,7 +181,7 @@ func UpdateCardRequest(ctx *context.Context, cardReq api.CardReq) {
 		return
 	}
 
-	data, err := cardrequestservice.GetCreationInfo()
+	/**data, err := cardrequestservice.GetCreationInfo()
 	if err != nil {
 		log.Error("can not get creation info", err)
 		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(err.Error()))
@@ -197,7 +196,7 @@ func UpdateCardRequest(ctx *context.Context, cardReq api.CardReq) {
 			ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("repo.parameter_is_wrong")))
 			return
 		}
-	}
+	}*/
 
 	if cardReq.ResourceType != models.RESOURCE_TYPE_SHARE && cardReq.ResourceType != models.RESOURCE_TYPE_EXCLUSIVE {
 		ctx.JSON(http.StatusOK, models.BaseErrorMessageApi(ctx.Tr("repo.parameter_is_wrong")))

routers/repo/user_data_analysis.go

@@ -724,12 +724,6 @@ func TimingCountDataByDateAndReCount(date string, isReCount bool) {
 	startYear := time.Date(USER_YEAR, 1, 1, 0, 0, 0, 1, t.Location())
 	endYear := startYear.AddDate(1, 0, 0)
 
-	if time.Now().Year() == 2024 {
-		log.Info("the day is 2024,so not update.")
-		return
-	}
-	models.RefreshUserYearTable(startYear, endYear)
-
 	//query wiki data
 	log.Info("start to time count data")
 	wikiMap, err := queryWikiCountMap(startTime, endTime)
@@ -740,6 +734,12 @@ func TimingCountDataByDateAndReCount(date string, isReCount bool) {
 		mailer.SendWarnNotifyMail(setting.Warn_Notify_Mails, warnEmailMessage)
 	}
 
+	if time.Now().Year() == 2024 {
+		log.Info("the day is 2024,so not update.")
+		return
+	}
+	models.RefreshUserYearTable(startYear, endYear)
+
 	log.Info("end to count all user info data")
 }
 

routers/repo/view.go

@@ -783,6 +783,7 @@ func renderCode(ctx *context.Context) {
 	}
 	ctx.Data["Title"] = title
 	ctx.Data["RequireHighlightJS"] = true
+	ctx.Data["IsMirror"] = ctx.Repo.Repository.IsMirror
 
 	branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL()
 	treeLink := branchLink

templates/repo/home.tmpl

@@ -245,7 +245,7 @@
 				<!-- Only show clone panel in repository home page -->
 				{{if eq $n 0}}
 				<div class="ui action tiny input" id="clone-panel">
-					<div class="ui basic floating button" style="margin-right:10px;padding:0 10px; font-size:13px;{{if eq .IsRepositoryOwner true }}  {{else if eq .IsRepositoryAdmin true}} {{else if eq .CanEditFile true}}{{else}} display:none;  {{end}}">
+					<div class="ui basic floating button" style="margin-right:10px;padding:0 10px; font-size:13px;{{if eq .IsMirror true}}display:none; {{else if eq .IsRepositoryOwner true }}  {{else if eq .IsRepositoryAdmin true}} {{else if eq .CanEditFile true}}{{else}} display:none;  {{end}}">
 						<a href="/ide/project?type=ide&owner={{.Owner.Name}}&project={{.Repository.Name}}&git={{.CloneLink.HTTPS}}&branch={{.VisitBranchName}}" target="_blank"><div class="text">WEB IDE</div></a>
 					</div>
 					{{if not $.DisableHTTP}}