Merge branch 'V20220616' of git.openi.org.cn:OpenI/aiforge into grampus

models/dataset.go

@@ -107,6 +107,7 @@ type SearchDatasetOptions struct {
 	Category      string
 	Task          string
 	License       string
+	DatasetIDs    []int64
 	ListOptions
 	SearchOrderBy
 	IsOwner bool
@@ -177,6 +178,12 @@ func SearchDatasetCondition(opts *SearchDatasetOptions) builder.Cond {
 		}
 	}
 
+	if len(opts.DatasetIDs) > 0 {
+		subCon := builder.NewCond()
+		subCon = subCon.And(builder.In("dataset.id", opts.DatasetIDs))
+		cond = cond.Or(subCon)
+	}
+
 	return cond
 }
 
@@ -447,3 +454,11 @@ func IncreaseDownloadCount(datasetID int64) error {
 
 	return nil
 }
+
+func GetCollaboratorDatasetIdsByUserID(userID int64) []int64 {
+	var datasets []int64
+	_ = x.Table("dataset").Join("INNER", "collaboration", "dataset.repo_id = collaboration.repo_id and collaboration.mode>0 and collaboration.user_id=?", userID).
+		Cols("dataset.id").Find(&datasets)
+	return datasets
+
+}

options/locale/locale_en-US.ini

@@ -1092,6 +1092,7 @@ modelarts.train_job.fast_parameter_setting_config_link=fast_parameter_setting_co
 modelarts.train_job.frames=frames
 modelarts.train_job.algorithm_origin=Algorithm Origin
 modelarts.train_job.AI_driver=AI Engine
+modelarts.train_job.AI_Engine=AI Engine
 modelarts.train_job.start_file=Start File
 modelarts.train_job.boot_file_helper=The startup file is the entry file that your program executes, and it must be a file ending in .py
 modelarts.train_job.dataset=Dataset

options/locale/locale_zh-CN.ini

@@ -1102,6 +1102,7 @@ modelarts.train_job.fast_parameter_setting_config_link=这里
 modelarts.train_job.frames=常用框架
 modelarts.train_job.algorithm_origin=算法来源
 modelarts.train_job.AI_driver=AI引擎
+modelarts.train_job.AI_Engine=模型框架
 modelarts.train_job.start_file=启动文件
 modelarts.train_job.boot_file_helper=启动文件是您程序执行的入口文件，必须是以.py结尾的文件。比如train.py、main.py、example/train.py、case/main.py。
 modelarts.train_job.boot_file_place=填写启动文件路径，默认为train.py

routers/home.go

@@ -343,6 +343,12 @@ func ExploreDatasets(ctx *context.Context) {
 	if ctx.User != nil && !ctx.User.IsAdmin {
 		ownerID = ctx.User.ID
 	}
+	var datasetsIds []int64
+	if ownerID > 0 {
+
+		datasetsIds = models.GetCollaboratorDatasetIdsByUserID(ownerID)
+	}
+
 	opts := &models.SearchDatasetOptions{
 		Keyword:       keyword,
 		IncludePublic: true,
@@ -351,6 +357,7 @@ func ExploreDatasets(ctx *context.Context) {
 		Task:          task,
 		License:       license,
 		OwnerID:       ownerID,
+		DatasetIDs:    datasetsIds,
 		RecommendOnly: ctx.QueryBool("recommend"),
 		ListOptions: models.ListOptions{
 			Page:     page,

templates/explore/datasets.tmpl

@@ -199,7 +199,7 @@
 										</span>
 										{{else}}
 										<span
-											style="display: flex;align-items: center;justify-content: flex-end;cursor: pointer;font-size: 12px;font-weight: normal;flex: 1;">
+											style="display: flex;align-items: center;justify-content: flex-end;cursor: pointer;font-size: 12px;font-weight: normal;flex: 1;margin-left: 1.5rem;">
 
 											<div style="line-height: 1;margin-right: 4px;margin-bottom: -2px;">
 												<svg width="1.4em" height="1.4em" viewBox="0 0 32 32"

templates/repo/modelmanage/index.tmpl

@@ -1,5 +1,10 @@
 <!-- 头部导航栏 -->
 {{template "base/head" .}}
+<style>
+.defaulttext{
+    color: rgba(0,0,0,.87)
+}
+</style>
 <!-- 弹窗 -->
 <div id="mask">
     <div id="loadingPage">
@@ -135,7 +140,7 @@
                     <label>模型框架</label>
                     <div class="ui dropdown selection search width70" id="choice_Engine">
                             <input type="hidden" id="Engine" name="Engine" required>
-                            <div class="default text">选择模型框架</div>
+                            <div class="default defaulttext">选择模型框架</div>
                             <i class="dropdown icon"></i>
                             <div class="menu" id="job-Engine">
                                 
@@ -316,7 +321,7 @@
             }
             itemHtml += "<option class=\"item\" data-value=\"3\">Other</option>"
             
-            $('#choice_Engine .default.text').text(selectedText)
+            $('#choice_Engine .default.defaulttext').text(selectedText)
             $('#choice_Engine input[name="Engine"]').val(selectedValue)
             $("#job-Engine").append(itemHtml);
             $("#choice_Engine").addClass('disabled')
@@ -325,7 +330,7 @@
             itemHtml += "<option class=\"item\" data-value=\"1\">TensorFlow</option>"
             itemHtml += "<option class=\"item\" data-value=\"2\">MindSpore</option>"
             itemHtml += "<option class=\"item\" data-value=\"3\">Other</option>"
-            $('#choice_Engine .default.text').text("Pytorch");
+            $('#choice_Engine .default.defaulttext').text("Pytorch");
             $('#choice_Engine input[name="Engine"]').val(0)
             $("#job-Engine").append(itemHtml);
             $("#choice_Engine").removeClass('disabled');

templates/repo/modelmanage/showinfo.tmpl

@@ -141,7 +141,7 @@
                                 <td class="ti-text-form-content word-elipsis"><span id="Parameters" title=""></span></td>
                             </tr>
                             <tr>
-                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}}</td>
+                                <td class="ti-text-form-label text-width80">{{$.i18n.Tr "repo.modelarts.train_job.AI_Engine"}}</td>
                                 <td class="ti-text-form-content word-elipsis"><span id="EngineName" title=""></span></td>
                             </tr>
                             <tr>
@@ -232,13 +232,25 @@ function loadInfo(){
         renderInfo(initObj,initModelAcc,id)
         loadModelFile(data[0].ID,data[0].Version,'','','init')
     })
+}
+ function getEngineName(model){
+        if(model.Engine == 0){
+            return "Pytorch";
+        }else  if(model.Engine == 1 || model.Engine == 121){
+            return "TensorFlow";
+        }else  if(model.Engine == 2 || model.Engine == 122){
+            return "MindSpore";
+        }else{
+            return "Other"
+        }
 }
 function transObj(data){
     let {ID,Name,Version,Label,Size,Description,CreatedUnix,Accuracy,CodeBranch,CodeCommitID,TrainTaskInfo} = data[0]
     let modelAcc = JSON.parse(Accuracy)
     TrainTaskInfo = JSON.parse(TrainTaskInfo)
     // Parameters = JSON.parse(Parameters)
-    let {Parameters,EngineName} = TrainTaskInfo
+    let {Parameters} = TrainTaskInfo
+    let EngineName = getEngineName(data[0])
     Parameters = JSON.parse(Parameters)
     Parameters = Parameters.parameter.length === 0 ? '--':Parameters.parameter
     let size = tranSize(Size) 

web_src/js/components/Model.vue

@@ -60,7 +60,7 @@
                         </el-table-column>
                         <el-table-column
                             prop="EngineName"
-                            label="AI引擎"
+                            label="模型框架"
                             align="center"
                             min-width="8.5%"
                             >