remove asserts

job_templates/sag_cse_ccwf_pt/config_fed_client.conf

@@ -59,16 +59,16 @@
       }
     }
     {
-      # All tasks prefixed with wf1_ are routed to this ClientControllerExecutor
-      tasks = ["wf1_*"]
+      # All tasks prefixed with wf_ are routed to this ClientControllerExecutor
+      tasks = ["wf_*"]
       executor {
-        id = "client_controller_executor1"
+        id = "client_controller_executor"
         path = "nvflare.app_common.ccwf.client_controller_executor.ClientControllerExecutor"
         # ClientControllerExecutor for running controllers on client-side.
         args {
           # list of controller ids from components to be run in order
           controller_id_list = ["sag_ctl", "cse_ctl"]
-          task_name_prefix = "wf1"
+          task_name_prefix = "wf"
           # persistor used to distribute and save final results for clients
           persistor_id = "persistor"           
         }

job_templates/sag_cse_ccwf_pt/config_fed_server.conf

@@ -21,7 +21,7 @@
         path = "nvflare.app_common.ccwf.server_ctl.ServerSideController"
         args {
           # the prefix for task names of this workflow
-          task_name_prefix = "wf1"
+          task_name_prefix = "wf"
           # the maximum amount of time allowed for a client to miss a status report
           max_status_report_interval = 300
           # policy to choose which client to run the controller logic from

nvflare/app_common/ccwf/client_controller_executor.py

@@ -108,7 +108,7 @@ def start_run(self, fl_ctx: FLContext):
         self.persistor = self.engine.get_component(self.persistor_id)
         if not isinstance(self.persistor, LearnablePersistor):
             self.log_warning(
-                fl_ctx, f"Persistor {self.persistor_id} must be a Persistor instance, but got {type(self.persistor)}"
+                fl_ctx, f"Persistor {self.persistor_id} must be a Persistor instance but got {type(self.persistor)}"
             )
             self.persistor = None
 
@@ -240,7 +240,7 @@ def execute(self, task_name: str, shareable: Shareable, fl_ctx: FLContext, abort
 
                 self.update_status(action=f"finished_{controller_id}", error=None, all_done=True)
 
-            self.update_status(action=f"finished_start_task", error=None, all_done=True)
+            self.update_status(action="finished_start_task", error=None, all_done=True)
 
             return make_reply(ReturnCode.OK)
 
@@ -288,8 +288,11 @@ def update_status(self, last_round=None, action=None, error=None, all_done=False
 
     def _process_final_result(self, request: Shareable, fl_ctx: FLContext) -> Shareable:
         peer_ctx = fl_ctx.get_peer_context()
-        assert isinstance(peer_ctx, FLContext)
-        client_name = peer_ctx.get_identity_name()
+        if peer_ctx:
+            client_name = peer_ctx.get_identity_name()
+        else:
+            self.log_error(fl_ctx, "Request from unknown client")
+            return make_reply(ReturnCode.BAD_REQUEST_DATA)
         result = request.get(Constant.RESULT)
 
         if not result:
@@ -330,7 +333,10 @@ def is_task_secure(self, fl_ctx: FLContext) -> bool:
     def broadcast_final_result(self, result: Learnable, fl_ctx: FLContext):
         targets = self.get_config_prop(Constant.RESULT_CLIENTS)
 
-        assert isinstance(targets, list)
+        if not isinstance(targets, list):
+            self.log_warning(fl_ctx, f"expected targets of result clients to be type list, but got {type(targets)}")
+            return None
+
         if self.me in targets:
             targets.remove(self.me)
 
@@ -360,7 +366,10 @@ def broadcast_final_result(self, result: Learnable, fl_ctx: FLContext):
             fl_ctx=fl_ctx,
         )
 
-        assert isinstance(resp, dict)
+        if not isinstance(resp, dict):
+            self.log_error(fl_ctx, f"bad response for final result from clients, expected dict but got {type(resp)}")
+            return
+
         num_errors = 0
         for t in targets:
             reply = resp.get(t)