#5199 cyf-merge

Merged
chenyifan01 merged 13 commits from cyf-merge into V20240116 3 months ago
  1. +8
    -0
      models/cloudbrain.go
  2. +16
    -1
      models/reward_operate_record.go
  3. +9
    -2
      services/ai_task_service/cluster/cloudbrain_two.go
  4. +1
    -1
      services/ai_task_service/task/task_service.go
  5. +6
    -0
      templates/reward/point/rule.tmpl
  6. +1
    -1
      web_src/vuepages/pages/computingpower/domestic/index.vue

+ 8
- 0
models/cloudbrain.go View File

@@ -396,6 +396,14 @@ func (task *Cloudbrain) ToShow() *CloudbrainShow {
return c
}

func (task *Cloudbrain) IsRestartTask() bool {
n, _ := x.Where("display_job_name = ?", task.DisplayJobName).Unscoped().Count(&Cloudbrain{})
if n > 1 {
return true
}
return false
}

func (task *Cloudbrain) HasUseModel(modelId string) bool {
modelIDArray := task.GetModelIdArray()
if modelIDArray == nil || len(modelIDArray) == 0 {


+ 16
- 1
models/reward_operate_record.go View File

@@ -524,7 +524,14 @@ func GetRewardRecordShowList(opts *RewardRecordListOpts) (RewardRecordShowList,
return nil, 0, err
}
RewardRecordShowList(r).loadAttribute(false)
return r, count, nil
newShowList := make([]*RewardOperateRecordShow, 0)
for i := 0; i < len(r); i++ {
if r[i].SourceType == SourceTypeAccomplishTask.Name() && r[i].Action == nil {
continue
}
newShowList = append(newShowList, r[i])
}
return newShowList, count, nil
}

func GetAdminRewardRecordShowList(opts *RewardRecordListOpts) (RewardRecordShowList, int64, error) {
@@ -559,6 +566,14 @@ func GetAdminRewardRecordShowList(opts *RewardRecordListOpts) (RewardRecordShowL
return nil, 0, err
}
RewardRecordShowList(r).loadAttribute(true)
newShowList := make([]*RewardOperateRecordShow, 0)
for i := 0; i < len(r); i++ {
if r[i].SourceType == SourceTypeAccomplishTask.Name() && r[i].Action == nil {
continue
}
newShowList = append(newShowList, r[i])
}
return newShowList, count, nil
return r, count, nil
}



+ 9
- 2
services/ai_task_service/cluster/cloudbrain_two.go View File

@@ -254,14 +254,21 @@ func (c CloudbrainTwoClusterAdapter) QueryNoteBook(opts entity.JobIdAndVersionId
log.Error("GetNotebook(%s) from cloudbrain 2 failed:result is empty", task.DisplayJobName)
return nil, errors.New("result is empty")
}
return convertCloudbrainTwo2QueryRes(result), nil
return convertCloudbrainTwo2QueryRes(result, task), nil
}

func convertCloudbrainTwo2QueryRes(res *models.GetNotebook2Result) *entity.QueryTaskResponse {
func convertCloudbrainTwo2QueryRes(res *models.GetNotebook2Result, task *models.Cloudbrain) *entity.QueryTaskResponse {
startedAt := timeutil.TimeStamp(0)

if task.IsRestartTask() {
if res.Lease.UpdateTime > 0 {
startedAt = timeutil.TimeStamp(res.Lease.UpdateTime / 1000)
}
} else {
if res.Lease.CreateTime > 0 {
startedAt = timeutil.TimeStamp(res.Lease.CreateTime / 1000)
}
}
completedAt := timeutil.TimeStamp(0)
if models.IsCloudbrainTerminalStatus(res.Status) {
completedAt = timeutil.TimeStampNow()


+ 1
- 1
services/ai_task_service/task/task_service.go View File

@@ -287,7 +287,7 @@ func UpdateByQueryResponse(res *entity.QueryTaskResponse, task *models.Cloudbrai
if res.DetailedStatus == "" || res.DetailedStatus == res.Status {
task.DetailedStatus = DEFAULT_DETAILED_STATUS
}
if res.StartedAt > 0 {
if res.StartedAt > 0 && task.StartTime == 0 {
task.StartTime = res.StartedAt
}
if res.StartedAt > 0 && res.CompletedAt > 0 {


+ 6
- 0
templates/reward/point/rule.tmpl View File

@@ -111,6 +111,12 @@
<td class="t-center"><span class="typ">累计</span>积分获取上限<span class="limit"> - </span></td>
<td>邀请好友获得积分。</td>
</tr>
<tr key="TaskInviteFriendRegister">
<td class="t-center">邀请好友</td>
<td class="t-center point">-</td>
<td class="t-center"><span class="typ">累计</span>积分获取上限<span class="limit"> - </span></td>
<td>邀请好友获得积分。</td>
</tr>
</table>
</div>



+ 1
- 1
web_src/vuepages/pages/computingpower/domestic/index.vue View File

@@ -204,7 +204,7 @@ export default {
useExample: {
title: '在启智AI协作平台使用案例:',
list: [
'https://openi.pcl.ac.cn/Enflame/GCU_Pytorch1.10.0_Example',
'https://openi.pcl.ac.cn/Enflame/GCU_Pytorch',
'https://openi.pcl.ac.cn/Enflame/GCU_PaddlePaddle_Example'
]
},


Loading…
Cancel
Save