Merge branch 'develop-2.0.0' of https://github.com/FederatedAI/FATE-B…

…oard into develop-2.0.0

src/main/java/org/fedai/fate/board/pojo/PagedJobQO.java

@@ -38,7 +38,7 @@ public class PagedJobQO implements Serializable {
     private List<String> status;
     private String orderField;
     private String orderRule;
-    @JsonProperty(value = "fDescription")
+    @JsonProperty(value = "note")
     private String fDescription;
     private String partner;
 

src/main/java/org/fedai/fate/board/services/JobManagerService.java

@@ -176,7 +176,7 @@ public PageBean<Map<String, Object>> queryPagedJobs(PagedJobQO pagedJobQO) {
 
         String fDescription = pagedJobQO.getFDescription();
         if (fDescription != null && 0 != fDescription.trim().length()) {
-            Preconditions.checkArgument(LogFileService.checkParameters("^[0-9a-zA-Z\\-_\\u4e00-\\u9fa5\\s]+$", fDescription));
+            Preconditions.checkArgument(LogFileService.checkParameters("^[0-9a-zA-Z,.。\\-_\\u4e00-\\u9fa5\\s]+$", fDescription));
             reqMap.put(Dict.DESCRIPTION, pagedJobQO.getFDescription());
         }
 

static/sshe_linr.yaml

@@ -0,0 +1,303 @@
+component:
+  name: sshe_linr
+  description: ''
+  provider: fate
+  version: 2.0.0-beta
+  labels: [ ]
+  roles:
+    - guest
+    - host
+  parameters:
+    epochs:
+      type: ConstrainedNumberMeta
+      default: 20
+      optional: true
+      description: max iteration num
+      type_meta:
+        title: ConstrainedNumberMeta
+        exclusiveMinimum: 0
+        type: integer
+    batch_size:
+      type: ConstrainedNumberMeta
+      default:
+      optional: true
+      description: batch size, None means full batch, otherwise should be no less
+        than 10, default None
+      type_meta:
+        title: ConstrainedNumberMeta
+        minimum: 10
+        type: integer
+    tol:
+      type: ConstrainedNumberMeta
+      default: 0.0001
+      optional: true
+      description: ''
+      type_meta:
+        title: ConstrainedNumberMeta
+        minimum: 0
+        type: number
+    early_stop:
+      type: type
+      default: diff
+      optional: true
+      description: early stopping criterion, choose from {weight_diff, diff, abs}
+      type_meta:
+        title: type
+        type: string
+    learning_rate:
+      type: ConstrainedNumberMeta
+      default: 0.05
+      optional: true
+      description: learning rate
+      type_meta:
+        title: ConstrainedNumberMeta
+        minimum: 0
+        type: number
+    reveal_every_epoch:
+      type: bool
+      default: false
+      optional: true
+      description: whether reveal encrypted result every epoch, if False, only reveal
+        at the end of training
+      type_meta:
+        title: bool
+        type: boolean
+        default: true
+        description: whether output prediction result per cv fold
+    init_param:
+      type: InitParam
+      default:
+        method: random_uniform
+        fill_val: 0.0
+        fit_intercept: true
+        random_state:
+      optional: true
+      description: Model param init setting.
+      type_meta:
+        title: InitParam
+        $ref: '#/definitions/abc__InitParam'
+        definitions:
+          abc__InitParam:
+            title: InitParam
+            type: object
+            properties:
+              method:
+                title: Method
+                default: zeros
+                type: string
+              fill_val:
+                title: Fill Val
+                default: 0.0
+                anyOf:
+                  - type: integer
+                  - type: number
+              fit_intercept:
+                title: Fit Intercept
+                default: true
+                type: boolean
+              random_state:
+                title: Random State
+                type: integer
+        default:
+          method: random_uniform
+          fill_val: 0.0
+          fit_intercept: true
+          random_state:
+        description: Model param init setting.
+    threshold:
+      type: ConstrainedNumberMeta
+      default: 0.5
+      optional: true
+      description: predict threshold for binary data
+      type_meta:
+        title: ConstrainedNumberMeta
+        minimum: 0.0
+        maximum: 1.0
+        type: number
+    reveal_loss_freq:
+      type: ConstrainedNumberMeta
+      default: 1
+      optional: true
+      description: rounds to reveal training loss, only effective if `early_stop`
+        is 'loss'
+      type_meta:
+        title: ConstrainedNumberMeta
+        minimum: 1
+        type: integer
+    cv_param:
+      type: CVParam
+      default:
+        n_splits: 5
+        shuffle: false
+        random_state:
+      optional: true
+      description: cross validation param
+      type_meta:
+        title: CVParam
+        $ref: '#/definitions/abc__CVParam'
+        definitions:
+          abc__CVParam:
+            title: CVParam
+            type: object
+            properties:
+              n_splits:
+                title: N Splits
+                exclusiveMinimum: 1
+                type: integer
+              shuffle:
+                title: Shuffle
+                default: false
+                type: boolean
+              random_state:
+                title: Random State
+                type: integer
+            required:
+              - n_splits
+        default:
+          n_splits: 5
+          shuffle: false
+          random_state:
+        description: cross validation param
+    metrics:
+      type: type
+      default:
+        - auc
+      optional: true
+      description: ''
+      type_meta:
+        title: type
+        type: string
+    output_cv_data:
+      type: bool
+      default: true
+      optional: true
+      description: whether output prediction result per cv fold
+      type_meta:
+        title: bool
+        type: boolean
+        default: true
+        description: whether output prediction result per cv fold
+  input_artifacts:
+    data:
+      train_data:
+        types:
+          - dataframe
+        optional: false
+        stages:
+          - train
+        roles:
+          - guest
+          - host
+        description: ''
+        is_multi: false
+      validate_data:
+        types:
+          - dataframe
+        optional: true
+        stages:
+          - train
+        roles:
+          - guest
+          - host
+        description: ''
+        is_multi: false
+      test_data:
+        types:
+          - dataframe
+        optional: false
+        stages:
+          - predict
+        roles:
+          - guest
+          - host
+        description: ''
+        is_multi: false
+      cv_data:
+        types:
+          - dataframe
+        optional: false
+        stages:
+          - cross_validation
+        roles:
+          - guest
+          - host
+        description: ''
+        is_multi: false
+    model:
+      warm_start_model:
+        types:
+          - json_model
+        optional: true
+        stages:
+          - train
+        roles:
+          - guest
+          - host
+        description: ''
+        is_multi: false
+      input_model:
+        types:
+          - json_model
+        optional: false
+        stages:
+          - predict
+        roles:
+          - guest
+          - host
+        description: ''
+        is_multi: false
+  output_artifacts:
+    data:
+      train_output_data:
+        types:
+          - dataframe
+        optional: false
+        stages:
+          - train
+        roles:
+          - guest
+        description: ''
+        is_multi: false
+      test_output_data:
+        types:
+          - dataframe
+        optional: false
+        stages:
+          - predict
+        roles:
+          - guest
+        description: ''
+        is_multi: false
+      cv_output_datas:
+        types:
+          - dataframe
+        optional: true
+        stages:
+          - cross_validation
+        roles:
+          - guest
+          - host
+        description: ''
+        is_multi: true
+    model:
+      output_model:
+        types:
+          - json_model
+        optional: false
+        stages:
+          - train
+        roles:
+          - guest
+          - host
+        description: ''
+        is_multi: false
+    metric:
+      metric:
+        types:
+          - json_metric
+        optional: false
+        stages: [ ]
+        roles: [ ]
+        description: metric, invisible for user
+        is_multi: false
+schema_version: v1