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

…oard into develop-2.1.0
FederatedAI · Feb 29, 2024 · 8ec6e78 · 8ec6e78
2 parents 259e1ba + 6a1685d
commit 8ec6e78
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 22 deletions.
diff --git a/bin/service.sh b/bin/service.sh
@@ -80,10 +80,12 @@ eval action=\$$#
 
 main_class=org.fedai.fate.board.bootstrap.Bootstrap
 module=fateboard
-version=2.0.0
+version=2.1.0
+start_type=background
 
 if [ $action = starting ];then
 	action=start
+	start_type=front
 elif [ $action = restarting ];then
 	action=restart
 fi
@@ -252,7 +254,7 @@ start() {
 		cmd="$JAVA_HOME/bin/java -Dspring.config.location=$configpath/application.properties -Dssh_config_file=$basepath/ssh/ -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -cp $libpath/*:$basepath/${module}-${version}.jar ${main_class}"
 		print_info "The command is: $cmd"
 
-		if [[ $1 == "front" ]]; then
+		if [[ ${start_type} == "front" ]]; then
 		  exec $cmd >> ${BOARD_HOME}/logs/bootstrap.${module}.out 2>>${BOARD_HOME}/logs/bootstrap.${module}.err
     else
       exec $cmd >> ${BOARD_HOME}/logs/bootstrap.${module}.out 2>>${BOARD_HOME}/logs/bootstrap.${module}.err &

diff --git a/src/main/java/org/fedai/fate/board/services/JobManagerService.java b/src/main/java/org/fedai/fate/board/services/JobManagerService.java
@@ -20,6 +20,8 @@
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import org.fedai.fate.board.exceptions.LogicException;
@@ -39,6 +41,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.springframework.util.concurrent.ListenableFuture;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -319,8 +323,10 @@ public ResponseResult download(DownloadQO downloadQO, HttpServletResponse respon
         response.setContentType("application/force-download");
         response.setHeader("Content-Disposition", "attachment;fileName=" + fileOutputName);
         try {
+            String yamlStr  = jsonConverToYaml(dagInfo.toJSONString());
             OutputStream os = response.getOutputStream();
-            os.write(JSON.toJSONBytes(dagInfo, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue, SerializerFeature.WriteDateUseDateFormat));
+//            os.write(JSON.toJSONBytes(dagInfo, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue, SerializerFeature.WriteDateUseDateFormat));
+            os.write(yamlStr.getBytes());
             log.info("download success,file :{}", fileOutputName);
         } catch (Exception e) {
             log.error("download failed", e);
@@ -329,6 +335,17 @@ public ResponseResult download(DownloadQO downloadQO, HttpServletResponse respon
         return null;
     }
 
+    private String jsonConverToYaml(String jsonString) throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        Object obj = objectMapper.readValue(jsonString, Object.class);
+        DumperOptions options = new DumperOptions();
+        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+        Yaml yaml = new Yaml(options);
+        String yamlStr = yaml.dumpAsMap(obj);
+        return yamlStr;
+    }
+
+
     //host端需过滤掉其他方信息
     private JSONObject getHostConfig(JSONObject runtime_confObject) {
         if (runtime_confObject != null) {

diff --git a/static/evaluation.yaml b/static/evaluation.yaml
@@ -54,7 +54,7 @@ component:
           use 'label' in the input dataframe
   input_artifacts:
     data:
-      input_data:
+      input_datas:
         types:
           - dataframe
         optional: false
@@ -82,3 +82,4 @@ component:
         description: metric, invisible for user
         is_multi: false
 schema_version: v1
+
diff --git a/static/hetero_nn.yaml b/static/hetero_nn.yaml
@@ -87,7 +87,7 @@ component:
         description: ''
         is_multi: false
     model:
-      train_model_input:
+      warm_start_model:
         types:
           - model_directory
         optional: true
@@ -98,7 +98,7 @@ component:
           - host
         description: ''
         is_multi: false
-      predict_model_input:
+      input_model:
         types:
           - model_directory
         optional: false
@@ -111,7 +111,7 @@ component:
         is_multi: false
   output_artifacts:
     data:
-      train_data_output:
+      train_output_data:
         types:
           - dataframe
         optional: true
@@ -122,7 +122,7 @@ component:
           - host
         description: ''
         is_multi: false
-      predict_data_output:
+      test_output_data:
         types:
           - dataframe
         optional: true
@@ -134,7 +134,7 @@ component:
         description: ''
         is_multi: false
     model:
-      train_model_output:
+      output_model:
         types:
           - model_directory
         optional: true
@@ -155,3 +155,4 @@ component:
         description: metric, invisible for user
         is_multi: false
 schema_version: v1
+
diff --git a/static/hetero_secureboost.yaml b/static/hetero_secureboost.yaml
@@ -316,7 +316,7 @@ component:
         description: ''
         is_multi: false
     model:
-      train_model_input:
+      warm_start_model:
         types:
           - json_model
         optional: true
@@ -327,7 +327,7 @@ component:
           - host
         description: ''
         is_multi: false
-      predict_model_input:
+      input_model:
         types:
           - json_model
         optional: false
@@ -340,7 +340,7 @@ component:
         is_multi: false
   output_artifacts:
     data:
-      train_data_output:
+      train_output_data:
         types:
           - dataframe
         optional: true
@@ -374,7 +374,7 @@ component:
         description: ''
         is_multi: true
     model:
-      train_model_output:
+      output_model:
         types:
           - json_model
         optional: true
@@ -395,3 +395,4 @@ component:
         description: metric, invisible for user
         is_multi: false
 schema_version: v1
+
diff --git a/static/homo_lr.yaml b/static/homo_lr.yaml
@@ -206,7 +206,7 @@ component:
         description: ''
         is_multi: false
     model:
-      train_input_model:
+      warm_start_model:
         types:
           - json_model
         optional: true
@@ -217,7 +217,7 @@ component:
           - host
         description: ''
         is_multi: false
-      predict_input_model:
+      input_model:
         types:
           - json_model
         optional: false
@@ -253,7 +253,7 @@ component:
         description: ''
         is_multi: false
     model:
-      train_output_model:
+      output_model:
         types:
           - json_model
         optional: false

diff --git a/static/homo_nn.yaml b/static/homo_nn.yaml
@@ -88,7 +88,7 @@ component:
         description: ''
         is_multi: false
     model:
-      train_model_input:
+      warm_start_model:
         types:
           - model_directory
         optional: true
@@ -99,7 +99,7 @@ component:
           - host
         description: ''
         is_multi: false
-      predict_model_input:
+      input_model:
         types:
           - model_directory
         optional: false
@@ -112,7 +112,7 @@ component:
         is_multi: false
   output_artifacts:
     data:
-      train_data_output:
+      train_output_data:
         types:
           - dataframe
         optional: true
@@ -123,7 +123,7 @@ component:
           - host
         description: ''
         is_multi: false
-      predict_data_output:
+      test_output_data:
         types:
           - dataframe
         optional: true
@@ -135,7 +135,7 @@ component:
         description: ''
         is_multi: false
     model:
-      train_model_output:
+      output_model:
         types:
           - model_directory
         optional: true
@@ -156,3 +156,4 @@ component:
         description: metric, invisible for user
         is_multi: false
 schema_version: v1
+
diff --git a/static/union.yaml b/static/union.yaml
@@ -10,7 +10,7 @@ component:
   parameters: { }
   input_artifacts:
     data:
-      input_data_list:
+      input_datas:
         types:
           - dataframe
         optional: false