Merge branch 'main' into docker_job_launcher

nvflare/lighter/impl/static_file.py

@@ -386,6 +386,13 @@ def prepare_admin_config(self, admin, ctx):
         agent_config = dict()
         self._prepare_overseer_agent(admin, agent_config, "admin", ctx)
         config["admin"].update(agent_config)
+
+        provision_mode = ctx.get("provision_mode")
+        if provision_mode == "poc":
+            # in poc mode, we change to use "local_cert" as the cred_type so that the user won't be
+            # prompted for username when starting the admin console
+            config["admin"]["username"] = admin.name
+            config["admin"]["cred_type"] = "local_cert"
         return config
 
     def build(self, project, ctx):

nvflare/lighter/spec.py

@@ -246,12 +246,16 @@ def _prepare_workspace(self, ctx):
         dirs = [workspace, resources_dir, wip_dir, state_dir]
         self._make_dir(dirs)
 
-    def provision(self, project: Project):
+    def provision(self, project: Project, mode=None):
         # ctx = {"workspace": os.path.join(self.root_dir, project.name), "project": project}
         workspace = os.path.join(self.root_dir, project.name)
         ctx = {"workspace": workspace}  # project is more static information while ctx is dynamic
         self._prepare_workspace(ctx)
         ctx["project"] = project
+
+        if mode:
+            ctx["provision_mode"] = mode
+
         try:
             for b in self.builders:
                 b.initialize(ctx)

nvflare/private/fed/app/simulator/simulator_runner.py

@@ -708,9 +708,10 @@ def do_one_task(self, client, num_of_threads, gpu, lock, timeout=60.0, task_name
             command += " --gpu " + str(gpu)
         new_env = os.environ.copy()
         add_custom_dir_to_path(app_custom_folder, new_env)
-        if self.server_custom_folder:
+        if os.path.isdir(self.server_custom_folder):
             python_paths = new_env[SystemVarName.PYTHONPATH].split(os.pathsep)
-            python_paths.remove(self.server_custom_folder)
+            if self.server_custom_folder in python_paths:
+                python_paths.remove(self.server_custom_folder)
             new_env[SystemVarName.PYTHONPATH] = os.pathsep.join(python_paths)
 
         _ = subprocess.Popen(shlex.split(command, True), preexec_fn=os.setsid, env=new_env)

nvflare/tool/poc/poc_commands.py

@@ -306,8 +306,9 @@ def local_provision(
     service_config = get_service_config(project_config)
     project = prepare_project(project_config)
     builders = prepare_builders(project_config)
+
     provisioner = Provisioner(workspace, builders)
-    provisioner.provision(project)
+    provisioner.provision(project, mode="poc")
 
     return project_config, service_config