task conf: json to yaml

Signed-off-by: Jat <jat@sinosky.org>
FederatedAI · Jan 17, 2023 · 73ad253 · 73ad253
1 parent 3f0ea5e
commit 73ad253
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/python/fate/components/entrypoint/component_cli.py b/python/fate/components/entrypoint/component_cli.py
@@ -117,10 +117,10 @@ def _set(v):
 
 
 def load_config_from_file(configs, config_file):
-    import json
+    from ruamel import yaml
 
     if config_file is not None:
-        configs.update(json.load(config_file))
+        configs.update(yaml.safe_load(config_file))
     return configs
 
 
@@ -138,10 +138,10 @@ def load_config_from_entrypoint(configs, config_entrypoint):
 
 def load_config_from_env(configs, env_name):
     import os
-    import json
+    from ruamel import yaml
 
     if env_name is not None and os.environ.get(env_name):
-        configs.update(json.loads(os.environ[env_name]))
+        configs.update(yaml.safe_load(os.environ[env_name]))
     return configs
 
 

diff --git a/python/fate/components/loader/model.py b/python/fate/components/loader/model.py
@@ -18,6 +18,8 @@
 import tempfile
 from datetime import datetime
 
+from ruamel import yaml
+
 from fate.components.spec.model import (
     MLModelComponentSpec,
     MLModelFederatedSpec,
@@ -26,7 +28,6 @@
     MLModelPartySpec,
     MLModelSpec,
 )
-from ruamel import yaml
 
 
 def load_output_model_wrapper(task_id, party_task_id, cpn, role, partyid, federation):