diff --git a/nvflare/apis/fl_constant.py b/nvflare/apis/fl_constant.py index 2486c577b1..8b833205db 100644 --- a/nvflare/apis/fl_constant.py +++ b/nvflare/apis/fl_constant.py @@ -403,7 +403,7 @@ class WorkspaceConstants: ADMIN_STARTUP_CONFIG = "fed_admin.json" - RESOURCE_FILE_NAME_PATTERN = "*__resources.json" # for bot parent and job processes + RESOURCE_FILE_NAME_PATTERN = "*__resources.json" # for both parent and job processes JOB_RESOURCE_FILE_NAME_PATTERN = "*__j_resources.json" # for job process only PARENT_RESOURCE_FILE_NAME_PATTERN = "*__p_resources.json" # for parent process only diff --git a/nvflare/apis/workspace.py b/nvflare/apis/workspace.py index 349a135260..9ec4b47d47 100644 --- a/nvflare/apis/workspace.py +++ b/nvflare/apis/workspace.py @@ -187,9 +187,9 @@ def get_config_files_for_startup(self, is_server: bool, for_job: bool) -> list: - the startup file (fed_server.json or fed_client.json) in "startup" folder - resource file (resources.json.default or resources.json) in "local" folder - We then try to get component files (usually generated by different builders of the Provision system): - - component files from the "startup" folder take precedence - - component files from the "local" folder are next + We then try to get resources files (usually generated by different builders of the Provision system): + - resources files from the "startup" folder take precedence + - resources files from the "local" folder are next These extra resource config files must be json and follow the following patterns: - *__resources.json: these files are for both parent process and job processes