update

app.py

@@ -306,7 +306,6 @@ with gr.Blocks() as demo:
 		os.mkdir(rootpath+'/'+stage1_id+'/')
 		
 		stage1_info = {
-			"id" : stage1_id,
 			"filePath" : rootpath+'/'+stage1_id+'/',
 			"fileNames" : {
 				"inputLocation" : in_loc,
@@ -435,17 +434,16 @@ with gr.Blocks() as demo:
 				currently indicated in red.
 				"""
 				# initialize the progress indication label
-				step2 = {
+				stage1_info["step2"] = {
 					"count" : 1,
 					"totalNum" : len(stage1_info["missingTemplates"])
 				}
 				name = stage1_info["missingTemplates"][0]
-				label = '{} (1/{})'.format(name, step2["totalNum"])
+				label = '{} (1/{})'.format(name, stage1_info["step2"]["totalNum"])
 				
-				stage1_info["step2"] = step2
 				stage1_info["state"] = "step2-selecting"
 				# determine which button to display
-				if step2["totalNum"] == 1:
+				if stage1_info["step2"]["totalNum"] == 1:
 					yield {stage1_json : stage1_info,
 							desc_md : gr.Markdown(md),
 							tpl_img : gr.Image(visible=False),
@@ -479,11 +477,10 @@ with gr.Blocks() as demo:
 		
 		# ========================================step2=========================================
 		elif stage1_info["state"] == "step2-selecting":
-			step2 = stage1_info["step2"]
-			# --------------------store information before the button click---------------------
+			# --------------------------------store information---------------------------------
 			# 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"][step2["count"]-1]
+				prev_target_name = stage1_info["missingTemplates"][stage1_info["step2"]["count"]-1]
 				prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 				selected_idx = channel_info["inputDict"][selected_radio]["index"]
 				
@@ -493,7 +490,7 @@ with gr.Blocks() as demo:
 				channel_info["inputDict"][selected_radio]["assigned"] = True				
 				#print(prev_target_name, '<-', selected_radio)
 			
-			# -----------------------update information for the next step-----------------------
+			# -------------------------------update the next step-------------------------------
 			# exclude the selected in_channel of the previous round
 			stage1_info["unassignedInputs"] = app_utils.get_unassigned_inputs(channel_info["inputOrder"],
 																			  channel_info["inputDict"])
@@ -568,21 +565,20 @@ with gr.Blocks() as demo:
 																		stage1_info["missingTemplates"],
 																		stage1_info["mappingResults"][0]["newOrder"])
 				# initialize the progress indication label
-				step3 = {
+				stage1_info["step3"] = {
 					"count" : 1,
 					"totalNum" : len(stage1_info["missingTemplates"])
 				}
 				target_name = stage1_info["missingTemplates"][0]
-				chkbox_label = '{} (1/{})'.format(target_name, step3["totalNum"])
+				chkbox_label = '{} (1/{})'.format(target_name, stage1_info["step3"]["totalNum"])
 				
 				target_idx = channel_info["templateDict"][target_name]["index"]
 				chkbox_value = stage1_info["mappingResults"][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 step3["totalNum"] == 1:
+				if stage1_info["step3"]["totalNum"] == 1:
 					yield {stage1_json : stage1_info,
 					        desc_md : gr.Markdown(md),
 							in_fillmode : gr.Dropdown(visible=False),
@@ -602,9 +598,8 @@ 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"][step3["count"]-1]
+			# --------------------------------store information---------------------------------
+			prev_target_name = stage1_info["missingTemplates"][stage1_info["step3"]["count"]-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["mappingResults"][0]["newOrder"][prev_target_idx] = selected_indices
@@ -658,7 +653,6 @@ with gr.Blocks() as demo:
 	# +========================================================================================+
 	# |                                      Stage1-step2                                      |
 	# +========================================================================================+
-	# determine which button to display based on the current state
 	@radio_group.select(inputs = stage1_json, outputs = [step2_btn, next_btn])
 	def determine_button(stage1_info):
 		if len(stage1_info["unassignedInputs"]) == 1:
@@ -679,7 +673,7 @@ with gr.Blocks() as demo:
 	
 	def update_radio(stage1_info, channel_info, selected):
 		step2 = stage1_info["step2"]
-		# ----------------------store information before the button click-----------------------
+		# ----------------------------------store information-----------------------------------
 		# if the user has selected an in_channel to forward to the previous target tpl_channel
 		if selected != []:
 			prev_target_name = stage1_info["missingTemplates"][step2["count"]-1]
@@ -692,7 +686,7 @@ with gr.Blocks() as demo:
 			channel_info["inputDict"][selected]["assigned"] = True
 			#print(prev_target_name, '<-', selected)
 		
-		# ------------------------update information for the new round--------------------------
+		# ---------------------------------update the new round---------------------------------
 		step2["count"] += 1
 		
 		# exclude the selected in_channel of the previous round
@@ -715,7 +709,6 @@ with gr.Blocks() as demo:
 					channel_json : channel_info,
 					radio_group : gr.Radio(choices=stage1_info["unassignedInputs"],
 					                        value=[], label=radio_label)}
-	
 	step2_btn.click(
 	    fn = update_radio,
 	    inputs = [stage1_json, channel_json, radio_group],
@@ -733,14 +726,14 @@ with gr.Blocks() as demo:
 	# +========================================================================================+	
 	def update_chkbox(stage1_info, channel_info, selected):
 		step3 = stage1_info["step3"]
-		# ----------------------store information before the button click-----------------------
+		# ----------------------------------store information-----------------------------------
 		prev_target_name = stage1_info["missingTemplates"][step3["count"]-1]
 		prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 		selected_indices = [channel_info["inputDict"][channel]["index"] for channel in selected]
 		stage1_info["mappingResults"][0]["newOrder"][prev_target_idx] = selected_indices
 		#print(f'{prev_target_name}({prev_target_idx}): {selected_indices}')
 		
-		# ------------------------update information for the new round--------------------------
+		# ---------------------------------update the new round---------------------------------
 		step3["count"] += 1
 		
 		target_name = stage1_info["missingTemplates"][step3["count"]-1]
@@ -788,7 +781,6 @@ with gr.Blocks() as demo:
 	# +========================================================================================+
 	# |                                  Stage2: decode data                                   |
 	# +========================================================================================+
-	# verify that all required inputs have been provided
 	@gr.on(triggers = [in_data_file.upload, in_data_file.clear, in_samplerate.change, out_json_file.change],
 			inputs = [stage1_json, in_data_file, in_samplerate], outputs = run_btn)
 	def check_input(stage1_info, in_data, samplerate):
@@ -798,7 +790,7 @@ with gr.Blocks() as demo:
 			return gr.Button(interactive=False)
 	
 	@cancel_btn.click(inputs = stage2_json, outputs = [stage2_json, cancel_btn, batch_md])
-	def stop_processing(stage2_info):
+	def stop_stage2(stage2_info):
 		utils.dataDelete(stage2_info["filePath"])
 		stage2_info["state"] = "stopped"
 		return stage2_info, gr.Button(interactive=False), gr.Markdown(visible=False)
@@ -817,7 +809,6 @@ with gr.Blocks() as demo:
 		new_filename = modelname+'_'+os.path.splitext(filename)[0]+'.csv'
 		
 		stage2_info = {
-			"id" : stage2_id,
 			"filePath" : rootpath+'/'+stage2_id+'/',
 			"fileNames" : {
 				"inputData" : in_data,