From 44dd15fbcf851e66b1b836f632c5888269d83388 Mon Sep 17 00:00:00 2001 From: Yan Cheng <58191769+yanchengnv@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:46:16 -0400 Subject: [PATCH] fix job config section (#2063) * fix job config section * fix unused imports --- nvflare/apis/fl_constant.py | 1 - nvflare/private/fed/client/client_json_config.py | 4 +--- nvflare/private/fed/server/server_json_config.py | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nvflare/apis/fl_constant.py b/nvflare/apis/fl_constant.py index c76c2f70b9..1bb7f851cd 100644 --- a/nvflare/apis/fl_constant.py +++ b/nvflare/apis/fl_constant.py @@ -360,7 +360,6 @@ class SiteType: class SystemConfigs: STARTUP_CONF = "start_config" RESOURCES_CONF = "resources_config" - APPLICATION_CONF = "application_config" class SecureTrainConst: diff --git a/nvflare/private/fed/client/client_json_config.py b/nvflare/private/fed/client/client_json_config.py index a5e2cac29f..0aa0acd901 100644 --- a/nvflare/private/fed/client/client_json_config.py +++ b/nvflare/private/fed/client/client_json_config.py @@ -12,12 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os import re from nvflare.apis.executor import Executor from nvflare.apis.fl_component import FLComponent -from nvflare.apis.fl_constant import SystemConfigs from nvflare.fuel.utils.argument_utils import parse_vars from nvflare.fuel.utils.config_service import ConfigService from nvflare.fuel.utils.json_scanner import Node @@ -142,7 +140,7 @@ def finalize_config(self, config_ctx: ConfigContext): ) ConfigService.initialize( - section_files={SystemConfigs.APPLICATION_CONF: os.path.basename(self.config_files[0])}, + section_files={}, config_path=[self.args.workspace], parsed_args=self.args, var_dict=self.cmd_vars, diff --git a/nvflare/private/fed/server/server_json_config.py b/nvflare/private/fed/server/server_json_config.py index d2771054dd..f1fb36738b 100644 --- a/nvflare/private/fed/server/server_json_config.py +++ b/nvflare/private/fed/server/server_json_config.py @@ -12,11 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os import re from nvflare.apis.fl_component import FLComponent -from nvflare.apis.fl_constant import SystemConfigs from nvflare.apis.responder import Responder from nvflare.fuel.utils.argument_utils import parse_vars from nvflare.fuel.utils.config_service import ConfigService @@ -161,7 +159,7 @@ def finalize_config(self, config_ctx: ConfigContext): ) ConfigService.initialize( - section_files={SystemConfigs.APPLICATION_CONF: os.path.basename(self.config_files[0])}, + section_files={}, config_path=[self.args.workspace], parsed_args=self.args, var_dict=self.cmd_vars,