update

app.py

@@ -146,10 +146,11 @@ update_js = """
 	channel_info = JSON.parse(JSON.stringify(channel_info));
 	
 	let selector;
-	let channel, left, bottom;
+	let cnt, channel, left, bottom;
 	
 	if(stage1_info.state == "step2-selecting"){
 	    selector = "#radio-group > div:nth-of-type(2)";
+	    cnt = stage1_info.step2.fillingCount
 	    
 	    // update the radios
 		let all_elem = document.querySelectorAll(selector+" > label");
@@ -164,10 +165,11 @@ update_js = """
 		});
 	}else if(stage1_info.state == "step3-2-selecting"){
 	    selector = "#chkbox-group > div:nth-of-type(2)";
+	    cnt = stage1_info.step3.fillingCount
 	}else return;
 	
 	// update the indication
-	channel = stage1_info.missingTemplates[stage1_info["fillingCount"]-1];
+	channel = stage1_info.missingTemplates[cnt-1];
 	left = channel_info.templateDict[channel].css_position[0];
 	bottom = channel_info.templateDict[channel].css_position[1];
 	
@@ -313,8 +315,14 @@ with gr.Blocks() as demo:
 		    	"output_json" : rootpath+'/'+stage1_id+'/mapping_result.json'
 			},
 			"state" : "step1-initializing",
-			"fillingCount" : None,
-			"totalFillingNum" : None,
+	    	"step2" : {
+	    		"fillingCount" : None,
+				"totalFillingNum" : None
+	    	},
+	    	"step3" : {
+	    		"fillingCount" : None,
+				"totalFillingNum" : None
+	    	},
 	    	"unassignedInputs" : None,
 	    	"missingTemplates" : None,
 	    	"totalBatchNum" : None,
@@ -427,16 +435,17 @@ with gr.Blocks() as demo:
 				currently indicated in red.
 				"""
 				# initialize the progress indication label
-				stage1_info.update({
+				step2 = {
 					"fillingCount" : 1,
 					"totalFillingNum" : len(stage1_info["missingTemplates"])
-				})
+				}
 				name = stage1_info["missingTemplates"][0]
-				label = '{} (1/{})'.format(name, stage1_info["totalFillingNum"])
+				label = '{} (1/{})'.format(name, step2["totalFillingNum"])
 				
+				stage1_info["step2"] = step2
 				stage1_info["state"] = "step2-selecting"
 				# determine which button to display
-				if stage1_info["totalFillingNum"] == 1:
+				if step2["totalFillingNum"] == 1:
 					yield {stage1_json : stage1_info,
 							desc_md : gr.Markdown(md),
 							tpl_img : gr.Image(visible=False),
@@ -470,11 +479,11 @@ with gr.Blocks() as demo:
 		
 		# ========================================step2=========================================
 		elif stage1_info["state"] == "step2-selecting":
-		
+			step2 = stage1_info["step2"]
 			# --------------------store information before the button click---------------------
 			# if the user has selected an in_channel to forward to the previous target tpl_channel
 			if selected_radio != []:
-				prev_target_name = stage1_info["missingTemplates"][stage1_info["fillingCount"]-1]
+				prev_target_name = stage1_info["missingTemplates"][step2["fillingCount"]-1]
 				prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 				selected_idx = channel_info["inputDict"][selected_radio]["index"]
 				
@@ -559,20 +568,21 @@ with gr.Blocks() as demo:
 																		stage1_info["missingTemplates"],
 																		stage1_info["mappingData"][0]["newOrder"])
 				# initialize the progress indication label
-				stage1_info.update({
+				step3 = {
 					"fillingCount" : 1,
 					"totalFillingNum" : len(stage1_info["missingTemplates"])
-				})
+				}
 				target_name = stage1_info["missingTemplates"][0]
-				chkbox_label = '{} (1/{})'.format(target_name, stage1_info["totalFillingNum"])
+				chkbox_label = '{} (1/{})'.format(target_name, step3["totalFillingNum"])
 				
 				target_idx = channel_info["templateDict"][target_name]["index"]
 				chkbox_value = stage1_info["mappingData"][0]["newOrder"][target_idx]
 				chkbox_value = [channel_info["inputOrder"][i] for i in chkbox_value]
 				
+				stage1_info["step3"] = step3
 				stage1_info["state"] = "step3-2-selecting"
 				# determine which button to display
-				if stage1_info["totalFillingNum"] == 1:
+				if step3["totalFillingNum"] == 1:
 					yield {stage1_json : stage1_info,
 					        desc_md : gr.Markdown(md),
 							in_fillmode : gr.Dropdown(visible=False),
@@ -592,9 +602,9 @@ with gr.Blocks() as demo:
 		# =======================================step3-2========================================
 		# step3-2 to step4
 		elif stage1_info["state"] == "step3-2-selecting":
-			
+			step3 = stage1_info["step3"]
 			# --------------------store information before the button click---------------------
-			prev_target_name = stage1_info["missingTemplates"][stage1_info["fillingCount"]-1]
+			prev_target_name = stage1_info["missingTemplates"][step3["fillingCount"]-1]
 			prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 			selected_indices = [channel_info["inputDict"][channel]["index"] for channel in selected_chkbox]
 			stage1_info["mappingData"][0]["newOrder"][prev_target_idx] = selected_indices
@@ -659,7 +669,8 @@ with gr.Blocks() as demo:
 	# clear the selected value and reset the buttons
 	@clear_btn.click(inputs = stage1_json, outputs = [radio_group, step2_btn, next_btn])
 	def clear_value(stage1_info):
-		if len(stage1_info["unassignedInputs"])==1 and stage1_info["fillingCount"]<stage1_info["totalFillingNum"]:
+		step2 = stage1_info["step2"]
+		if len(stage1_info["unassignedInputs"])==1 and step2["fillingCount"]<step2["totalFillingNum"]:
 			return {radio_group : gr.Radio(value=[]),
 					step2_btn : gr.Button(visible=True),
 					next_btn : gr.Button(visible=False)}
@@ -667,10 +678,11 @@ with gr.Blocks() as demo:
 			return {radio_group : gr.Radio(value=[])}
 	
 	def update_radio(stage1_info, channel_info, selected):
+		step2 = stage1_info["step2"]
 		# ----------------------store information before the button click-----------------------
 		# if the user has selected an in_channel to forward to the previous target tpl_channel
 		if selected != []:
-			prev_target_name = stage1_info["missingTemplates"][stage1_info["fillingCount"]-1]
+			prev_target_name = stage1_info["missingTemplates"][step2["fillingCount"]-1]
 			prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 			selected_idx = channel_info["inputDict"][selected]["index"]
 			
@@ -681,16 +693,17 @@ with gr.Blocks() as demo:
 			#print(prev_target_name, '<-', selected)
 		
 		# ------------------------update information for the new round--------------------------
-		stage1_info["fillingCount"] += 1
+		step2["fillingCount"] += 1
 		
 		# exclude the selected in_channel of the previous round
 		stage1_info["unassignedInputs"] = app_utils.get_unassigned_inputs(channel_info["inputOrder"], channel_info["inputDict"])
 		
-		target_name = stage1_info["missingTemplates"][stage1_info["fillingCount"]-1]
-		radio_label = '{} ({}/{})'.format(target_name, stage1_info["fillingCount"], stage1_info["totalFillingNum"])
+		target_name = stage1_info["missingTemplates"][step2["fillingCount"]-1]
+		radio_label = '{} ({}/{})'.format(target_name, step2["fillingCount"], step2["totalFillingNum"])
 		
+		stage1_info["step2"] = step2
 		# determine which button to display
-		if stage1_info["fillingCount"] == stage1_info["totalFillingNum"]:
+		if step2["fillingCount"] == step2["totalFillingNum"]:
 			return {stage1_json : stage1_info,
 					channel_json : channel_info,
 					radio_group : gr.Radio(choices=stage1_info["unassignedInputs"],
@@ -719,25 +732,27 @@ with gr.Blocks() as demo:
 	# |                                      Stage1-step3                                      |
 	# +========================================================================================+	
 	def update_chkbox(stage1_info, channel_info, selected):
+		step3 = stage1_info["step3"]
 		# ----------------------store information before the button click-----------------------
-		prev_target_name = stage1_info["missingTemplates"][stage1_info["fillingCount"]-1]
+		prev_target_name = stage1_info["missingTemplates"][step3["fillingCount"]-1]
 		prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 		selected_indices = [channel_info["inputDict"][channel]["index"] for channel in selected]
 		stage1_info["mappingData"][0]["newOrder"][prev_target_idx] = selected_indices
 		#print(f'{prev_target_name}({prev_target_idx}): {selected_indices}')
 		
 		# ------------------------update information for the new round--------------------------
-		stage1_info["fillingCount"] += 1
+		step3["fillingCount"] += 1
 		
-		target_name = stage1_info["missingTemplates"][stage1_info["fillingCount"]-1]
-		chkbox_label = '{} ({}/{})'.format(target_name, stage1_info["fillingCount"], stage1_info["totalFillingNum"])
+		target_name = stage1_info["missingTemplates"][step3["fillingCount"]-1]
+		chkbox_label = '{} ({}/{})'.format(target_name, step3["fillingCount"], step3["totalFillingNum"])
 		
 		target_idx = channel_info["templateDict"][target_name]["index"]
 		chkbox_value = stage1_info["mappingData"][0]["newOrder"][target_idx]
 		chkbox_value = [channel_info["inputOrder"][i] for i in chkbox_value]
 		
+		stage1_info["step3"] = step3
 		# determine which button to display
-		if stage1_info["fillingCount"] == stage1_info["totalFillingNum"]:
+		if step3["fillingCount"] == step3["totalFillingNum"]:
 			return {stage1_json : stage1_info,
 					chkbox_group : gr.CheckboxGroup(value=chkbox_value, label=chkbox_label),
 					step3_btn : gr.Button(visible=False),