This is an automated email from the ASF dual-hosted git repository.
pingsutw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 81cd83e SUBMARINE-961. Experiment Tag at Predefined Experiment
81cd83e is described below
commit 81cd83e2636602612b5902e3f2f1d090a64b749b
Author: noidname01 <[email protected]>
AuthorDate: Wed Aug 18 14:07:36 2021 +0800
SUBMARINE-961. Experiment Tag at Predefined Experiment
### What is this PR for?
This is the frontend implementation of SUBMARINE-943
Users can add multiple tags to mark experiments with their own category.
It's a little bit different from creating customized experiment,
SUBMARINE-958
The tags are defined in template, so you can't edit it when creating the
experiment.
But users can edit tags after creating the experiment.
### What type of PR is it?
[Feature]
### Todos
None
### What is the Jira issue?
https://issues.apache.org/jira/projects/SUBMARINE/issues/SUBMARINE-961
### How should this be tested?
Create a template with tags, and create an experiment with that template.
### Screenshots (if appropriate)
Create template with tags
Completed template
Create experiment with template
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: noidname01 <[email protected]>
Signed-off-by: Kevin <[email protected]>
Closes #701 from noidname01/SUBMARINE-961 and squashes the following
commits:
6c11aec8 [noidname01] delete comment
b3c34160 [noidname01] fix
44d60bc1 [noidname01] delete namespace
f586f878 [noidname01] display tags in predefine
c20d429f [noidname01] add tags as template spec
---
.../experiment-customized-form.component.ts | 2 +-
.../experiment-predefined-form.component.html | 3 +++
.../experiment-predefined-form.component.ts | 2 ++
.../template-form/template-form.component.html | 13 +++++++++++++
.../template-form/template-form.component.ts | 15 +++++++++++++--
.../template/template-info/template-info.component.html | 3 +++
.../template/template-info/template-info.component.ts | 2 +-
7 files changed, 36 insertions(+), 4 deletions(-)
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.ts
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.ts
index b0659ed..317ab40 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.ts
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-customized-form/experiment-customized-form.component.ts
@@ -328,7 +328,7 @@ export class ExperimentCustomizedFormComponent implements
OnInit, OnDestroy {
tags: this.tags.value,
framework: this.framework === 'Standalone' ? 'Tensorflow' :
this.framework,
cmd: this.cmd.value,
- envVars: {}
+ envVars: {},
};
for (const env of this.envs.controls) {
if (env.get('key').value) {
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.html
index c40b10f..5b9fe0e 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.html
@@ -65,6 +65,9 @@
<nz-descriptions-item nzTitle="Environment Variables" [nzSpan]="2">
{{ templates[currentOption].experimentVars }}
</nz-descriptions-item>
+ <nz-descriptions-item nzTitle="Tags">
+ <nz-tag *ngFor="let tag of
templates[currentOption].experimentTags">{{tag}}</nz-tag>
+ </nz-descriptions-item>
</nz-descriptions>
</nz-form-item>
</form>
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.ts
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.ts
index 549e5c8..cd10e56 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.ts
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-form/experiment-predefined-form/experiment-predefined-form.component.ts
@@ -37,6 +37,7 @@ interface ParsedTemplate {
experimentCommand: string;
experimentImage: string;
experimentVars: string;
+ experimentTags: string[];
}
interface TemplateTable {
@@ -132,6 +133,7 @@ export class ExperimentPredefinedFormComponent implements
OnInit, OnDestroy {
experimentCommand: item.experimentTemplateSpec.experimentSpec.meta.cmd,
experimentImage:
item.experimentTemplateSpec.experimentSpec.environment.image,
experimentVars:
JSON.stringify(item.experimentTemplateSpec.experimentSpec.meta.envVars),
+ experimentTags: item.experimentTemplateSpec.experimentSpec.meta.tags,
};
templates[item.experimentTemplateSpec.name] = template;
}
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-home/template-form/template-form.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-home/template-form/template-form.component.html
index c954dfd..e9a42f6 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-home/template-form/template-form.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-home/template-form/template-form.component.html
@@ -175,6 +175,19 @@
></textarea>
</nz-form-control>
</nz-form-item>
+ <nz-form-item>
+ <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired
nzFor="tags">Tags</nz-form-label>
+ <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="Please input
tags for this template!">
+ <nz-select
+ formControlName="tags"
+ nzMode="tags"
+ [nzTokenSeparators]="[',']"
+ nzPlaceHolder="AutoEncoder"
+ >
+ <nz-option *ngFor="let option of listOfOption"
[nzLabel]="option.label" [nzValue]="option.value"></nz-option>
+ </nz-select>
+ </nz-form-control>
+ </nz-form-item>
<div formArrayName="envVars">
<ng-container *ngFor="let env of envVars.controls; index as i">
<nz-form-item>
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-home/template-form/template-form.component.ts
b/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-home/template-form/template-form.component.ts
index c813c16..4b4820e 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-home/template-form/template-form.component.ts
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-home/template-form/template-form.component.ts
@@ -47,6 +47,8 @@ export class TemplateFormComponent implements OnInit {
currentSpecPage = 1;
PAGESIZE = 5;
+ listOfOption: Array<{ label: string; value: string }> = [];
+
// Constants
TF_SPECNAMES = ['Master', 'Worker', 'Ps'];
PYTORCH_SPECNAMES = ['Master', 'Worker'];
@@ -63,6 +65,9 @@ export class TemplateFormComponent implements OnInit {
) {}
ngOnInit() {
+ //TODO: get tags from server
+ this.listOfOption = [];
+
this.templateForm = this.fb.group({
templateName: [null, Validators.required],
description: [null, Validators.required],
@@ -70,6 +75,7 @@ export class TemplateFormComponent implements OnInit {
code: [null],
specs: this.fb.array([],
[this.experimentValidatorService.nameValidatorFactory('name')]),
cmd: [null, Validators.required],
+ tags: [[], Validators.required],
envVars: this.fb.array([],
[this.experimentValidatorService.nameValidatorFactory('key')]),
image: [null, Validators.required],
});
@@ -99,6 +105,10 @@ export class TemplateFormComponent implements OnInit {
return this.templateForm.get('cmd');
}
+ get tags() {
+ return this.templateForm.get('tags');
+ }
+
get envVars() {
return this.templateForm.get('envVars') as FormArray;
}
@@ -118,6 +128,7 @@ export class TemplateFormComponent implements OnInit {
this.parameters.clear();
this.specs.clear();
this.cmd.reset();
+ this.tags.reset();
this.envVars.clear();
this.image.reset();
}
@@ -127,7 +138,7 @@ export class TemplateFormComponent implements OnInit {
}
checkExperimentInfo() {
- return this.image.invalid || this.cmd.invalid || this.envVars.invalid;
+ return this.image.invalid || this.cmd.invalid || this.tags.invalid ||
this.envVars.invalid;
}
checkResourceSpec() {
@@ -253,7 +264,7 @@ export class TemplateFormComponent implements OnInit {
name: this.defaultExperimentName,
envVars: envVars,
framework: this.framework,
- tags: [],
+ tags: this.templateForm.get('tags').value,
},
spec: specs,
environment: {
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-info/template-info.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-info/template-info.component.html
index 6ecfb50..557b627 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-info/template-info.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-info/template-info.component.html
@@ -68,6 +68,9 @@
<nz-descriptions-item nzTitle="Environment Varibles">
{{ templateVars }}
</nz-descriptions-item>
+ <nz-descriptions-item nzTitle="Tags">
+ <nz-tag *ngFor="let tag of
templateInfo.experimentTemplateSpec.experimentSpec.meta.tags">{{tag}}</nz-tag>
+ </nz-descriptions-item>
</nz-descriptions>
</nz-tab>
<nz-tab nzTitle="Parameters">
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-info/template-info.component.ts
b/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-info/template-info.component.ts
index b4da987..276c344 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-info/template-info.component.ts
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/template/template-info/template-info.component.ts
@@ -22,7 +22,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { ExperimentTemplate } from '@submarine/interfaces/experiment-template';
import { ExperimentService } from '@submarine/services/experiment.service';
import { NzMessageService } from 'ng-zorro-antd';
-
+import { NzTagModule } from 'ng-zorro-antd/tag';
@Component({
selector: 'submarine-template-info',
templateUrl: './template-info.component.html',
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
