update

app.py

@@ -213,9 +213,9 @@ update_js = """
 """
 
 with gr.Blocks() as demo:
-	stage1_info_json = gr.JSON(visible=False)
-	stage2_info_json = gr.JSON(visible=False)
-	channel_info_json = gr.JSON(visible=False)
+	stage1_json = gr.JSON(visible=False)
+	stage2_json = gr.JSON(visible=False)
+	channel_json = gr.JSON(visible=False)
 
 	gr.Markdown(intro)
 	with gr.Row():
@@ -329,9 +329,9 @@ with gr.Blocks() as demo:
 		}
 		stage2_info = None
 		channel_info = None
-		return {stage1_info_json : stage1_info,
-				stage2_info_json : stage2_info,
-				channel_info_json : channel_info,
+		return {stage1_json : stage1_info,
+				stage2_json : stage2_info,
+				channel_json : channel_info,
 				# --------------------Stage1-------------------------
 				map_btn : gr.Button(interactive=False),
 				desc_md : gr.Markdown("", visible=False),
@@ -387,8 +387,8 @@ with gr.Blocks() as demo:
 				- channels highlighted in red are those that do not match any template channels.
 				"""
 			stage1_info["state"] = "step1-finished"
-			yield {stage1_info_json : stage1_info,
-					channel_info_json : channel_info,
+			yield {stage1_json : stage1_info,
+					channel_json : channel_info,
 					map_btn : gr.Button(interactive=True),
 					desc_md : gr.Markdown(md),
 					tpl_img : gr.Image(visible=True),
@@ -413,8 +413,8 @@ with gr.Blocks() as demo:
 				stage1_info, channel_info = app_utils.mapping_result(stage1_info, channel_info, filename)
 				
 				stage1_info["state"] = "finished"
-				yield {stage1_info_json : stage1_info,
-						channel_info_json : channel_info,
+				yield {stage1_json : stage1_info,
+						channel_json : channel_info,
 						desc_md : gr.Markdown(md),
 						tpl_img : gr.Image(visible=False),
 						mapped_img : gr.Image(visible=False),
@@ -440,14 +440,14 @@ with gr.Blocks() as demo:
 				stage1_info["state"] = "step2-selecting"
 				# determine which button to display
 				if stage1_info["totalFillingNum"] == 1:
-					yield {stage1_info_json : stage1_info,
+					yield {stage1_json : stage1_info,
 							desc_md : gr.Markdown(md),
 							tpl_img : gr.Image(visible=False),
 							mapped_img : gr.Image(visible=False),
 							radio_group : gr.Radio(choices=stage1_info["unassignedInputs"], value=[], label=label, visible=True),
 							clear_btn : gr.Button(visible=True)}
 				else:
-					yield {stage1_info_json : stage1_info,
+					yield {stage1_json : stage1_info,
 							desc_md : gr.Markdown(md),
 							tpl_img : gr.Image(visible=False),
 							mapped_img : gr.Image(visible=False),
@@ -464,7 +464,7 @@ with gr.Blocks() as demo:
 				Select one of the methods provided below to fill the remaining template channels.
 				"""
 				stage1_info["state"] = "step3-select-method"
-				yield {stage1_info_json : stage1_info,
+				yield {stage1_json : stage1_info,
 						desc_md : gr.Markdown(md),
 						tpl_img : gr.Image(visible=False),
 						mapped_img : gr.Image(visible=False),
@@ -509,8 +509,8 @@ with gr.Blocks() as demo:
 				stage1_info, channel_info = app_utils.mapping_result(stage1_info, channel_info, filename)
 				
 				stage1_info["state"] = "finished"
-				yield {stage1_info_json : stage1_info,
-						channel_info_json : channel_info,
+				yield {stage1_json : stage1_info,
+						channel_json : channel_info,
 						desc_md : gr.Markdown(md),
 						radio_group : gr.Radio(visible=False),
 						out_json_file : gr.File(filename, visible=True),
@@ -523,8 +523,8 @@ with gr.Blocks() as demo:
 				Select one of the methods provided below to fill the remaining template channels.
 				"""
 				stage1_info["state"] = "step3-select-method"
-				yield {stage1_info_json : stage1_info,
-						channel_info_json : channel_info,
+				yield {stage1_json : stage1_info,
+						channel_json : channel_info,
 						desc_md : gr.Markdown(md),
 						radio_group : gr.Radio(visible=False),
 						in_fillmode : gr.Dropdown(visible=True),
@@ -547,8 +547,8 @@ with gr.Blocks() as demo:
 				stage1_info, channel_info = app_utils.mapping_result(stage1_info, channel_info, filename)
 				
 				stage1_info["state"] = "finished"
-				yield {stage1_info_json : stage1_info,
-						channel_info_json : channel_info,
+				yield {stage1_json : stage1_info,
+						channel_json : channel_info,
 						desc_md : gr.Markdown(md),
 						in_fillmode : gr.Dropdown(visible=False),
 						fillmode_btn : gr.Button(visible=False),
@@ -580,7 +580,7 @@ with gr.Blocks() as demo:
 				stage1_info["state"] = "step3-2-selecting"
 				# determine which button to display
 				if stage1_info["totalFillingNum"] == 1:
-					yield {stage1_info_json : stage1_info,
+					yield {stage1_json : stage1_info,
 					        desc_md : gr.Markdown(md),
 							in_fillmode : gr.Dropdown(visible=False),
 				    		fillmode_btn : gr.Button(visible=False),
@@ -588,7 +588,7 @@ with gr.Blocks() as demo:
 															value=chkbox_value, label=chkbox_label, visible=True),
 				            next_btn : gr.Button(visible=True)}
 				else:
-					yield {stage1_info_json : stage1_info,
+					yield {stage1_json : stage1_info,
 					        desc_md : gr.Markdown(md),
 							in_fillmode : gr.Dropdown(visible=False),
 				    		fillmode_btn : gr.Button(visible=False),
@@ -617,8 +617,8 @@ with gr.Blocks() as demo:
 			stage1_info, channel_info = app_utils.mapping_result(stage1_info, channel_info, filename)
 			
 			stage1_info["state"] = "finished"
-			yield {stage1_info_json : stage1_info,
-					channel_info_json : channel_info,
+			yield {stage1_json : stage1_info,
+					channel_json : channel_info,
 					desc_md : gr.Markdown(md),
 					chkbox_group : gr.CheckboxGroup(visible=False),
 					next_btn : gr.Button(visible=False),
@@ -626,13 +626,13 @@ with gr.Blocks() as demo:
 	
 	next_btn.click(
 		fn = init_next_step,
-		inputs = [stage1_info_json, channel_info_json, in_fillmode, radio_group, chkbox_group],
-		outputs = [stage1_info_json, channel_info_json, desc_md, tpl_img, mapped_img, radio_group, clear_btn, step2_btn,
+		inputs = [stage1_json, channel_json, in_fillmode, radio_group, chkbox_group],
+		outputs = [stage1_json, channel_json, desc_md, tpl_img, mapped_img, radio_group, clear_btn, step2_btn,
 		            in_fillmode, fillmode_btn, chkbox_group, step3_btn, out_json_file, next_btn]
 	).success(
 	    fn = None,
 	    js = init_js,
-	    inputs = [stage1_info_json, channel_info_json],
+	    inputs = [stage1_json, channel_json],
 		outputs = []
 	)
 	
@@ -642,14 +642,14 @@ with gr.Blocks() as demo:
 	# +========================================================================================+
 	map_btn.click(
 	    fn = reset_all,
-	    inputs = [stage1_info_json, stage2_info_json, in_loc_file],
-	    outputs = [stage1_info_json, stage2_info_json, channel_info_json, map_btn, desc_md, next_btn, tpl_img, mapped_img,
+	    inputs = [stage1_json, stage2_json, in_loc_file],
+	    outputs = [stage1_json, stage2_json, channel_json, map_btn, desc_md, next_btn, tpl_img, mapped_img,
 	    			radio_group, clear_btn, step2_btn, in_fillmode, fillmode_btn, chkbox_group, step3_btn,
 	    			out_json_file, in_data_file, in_samplerate, run_btn, cancel_btn, batch_md, out_data_file]
 	).success(
 	    fn = init_next_step,
-	    inputs = [stage1_info_json, channel_info_json, in_fillmode, radio_group, chkbox_group], 
-		outputs = [stage1_info_json, channel_info_json, map_btn, desc_md, tpl_img, mapped_img, next_btn]
+	    inputs = [stage1_json, channel_json, in_fillmode, radio_group, chkbox_group], 
+		outputs = [stage1_json, channel_json, map_btn, desc_md, tpl_img, mapped_img, next_btn]
 	)
 	
 	
@@ -657,7 +657,7 @@ with gr.Blocks() as demo:
 	# |                                      Stage1-step2                                      |
 	# +========================================================================================+
 	# determine which button to display based on the current state
-	@radio_group.select(inputs = stage1_info_json, outputs = [step2_btn, next_btn])
+	@radio_group.select(inputs = stage1_json, outputs = [step2_btn, next_btn])
 	def determine_button(stage1_info):
 		if len(stage1_info["unassignedInputs"]) == 1:
 			return {step2_btn : gr.Button(visible=False),
@@ -665,7 +665,7 @@ with gr.Blocks() as demo:
 		else:
 			return {step2_btn : gr.Button()} # change nothing
 	# clear the selected value and reset the buttons
-	@clear_btn.click(inputs = stage1_info_json, outputs = [radio_group, step2_btn, next_btn])
+	@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"]:
 			return {radio_group : gr.Radio(value=[]),
@@ -699,26 +699,26 @@ with gr.Blocks() as demo:
 		
 		# determine which button to display
 		if stage1_info["fillingCount"] == stage1_info["totalFillingNum"]:
-			return {stage1_info_json : stage1_info,
-					channel_info_json : channel_info,
+			return {stage1_json : stage1_info,
+					channel_json : channel_info,
 					radio_group : gr.Radio(choices=stage1_info["unassignedInputs"],
 					                        value=[], label=radio_label),
 					step2_btn : gr.Button(visible=False),
 					next_btn : gr.Button(visible=True)}
 		else:
-			return {stage1_info_json : stage1_info,
-					channel_info_json : channel_info,
+			return {stage1_json : stage1_info,
+					channel_json : channel_info,
 					radio_group : gr.Radio(choices=stage1_info["unassignedInputs"],
 					                        value=[], label=radio_label)}
 	
 	step2_btn.click(
 	    fn = update_radio,
-	    inputs = [stage1_info_json, channel_info_json, radio_group],
-	    outputs = [stage1_info_json, channel_info_json, radio_group, step2_btn, next_btn]
+	    inputs = [stage1_json, channel_json, radio_group],
+	    outputs = [stage1_json, channel_json, radio_group, step2_btn, next_btn]
 	).success(
 	    fn = None,
 	    js = update_js,
-	    inputs = [stage1_info_json, channel_info_json],
+	    inputs = [stage1_json, channel_json],
 		outputs = []
 	)
 	
@@ -746,34 +746,34 @@ with gr.Blocks() as demo:
 		
 		# determine which button to display
 		if stage1_info["fillingCount"] == stage1_info["totalFillingNum"]:
-			return {stage1_info_json : stage1_info,
+			return {stage1_json : stage1_info,
 					chkbox_group : gr.CheckboxGroup(value=chkbox_value, label=chkbox_label),
 					step3_btn : gr.Button(visible=False),
 					next_btn : gr.Button(visible=True)}
 		else:
-			return {stage1_info_json : stage1_info,
+			return {stage1_json : stage1_info,
 					chkbox_group : gr.CheckboxGroup(value=chkbox_value, label=chkbox_label)}
 	
 	fillmode_btn.click(
 	    fn = init_next_step,
-		inputs = [stage1_info_json, channel_info_json, in_fillmode, radio_group, chkbox_group],
-		outputs = [stage1_info_json, channel_info_json, desc_md, in_fillmode, fillmode_btn, chkbox_group, step3_btn,
+		inputs = [stage1_json, channel_json, in_fillmode, radio_group, chkbox_group],
+		outputs = [stage1_json, channel_json, desc_md, in_fillmode, fillmode_btn, chkbox_group, step3_btn,
 					out_json_file, next_btn]
 	).success(
 	    fn = None,
 	    js = init_js,
-	    inputs = [stage1_info_json, channel_info_json],
+	    inputs = [stage1_json, channel_json],
 		outputs = []
 	)
 	
 	step3_btn.click(
 	    fn = update_chkbox,
-	    inputs = [stage1_info_json, channel_info_json, chkbox_group],
-	    outputs = [stage1_info_json, chkbox_group, step3_btn, next_btn]
+	    inputs = [stage1_json, channel_json, chkbox_group],
+	    outputs = [stage1_json, chkbox_group, step3_btn, next_btn]
 	).success(
 	    fn = None,
 	    js = update_js,
-	    inputs = [stage1_info_json, channel_info_json],
+	    inputs = [stage1_json, channel_json],
 		outputs = []
 	)
 	
@@ -783,14 +783,14 @@ with gr.Blocks() as demo:
 	# +========================================================================================+
 	# 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_info_json, in_data_file, in_samplerate], outputs = run_btn)
+			inputs = [stage1_json, in_data_file, in_samplerate], outputs = run_btn)
 	def check_input(stage1_info, in_data, samplerate):
 		if stage1_info["state"]=="finished" and in_data!=None and samplerate!="":
 			return gr.Button(interactive=True)
 		else:
 			return gr.Button(interactive=False)
 	
-	@cancel_btn.click(inputs = stage2_info_json, outputs = [stage2_info_json, cancel_btn, batch_md])
+	@cancel_btn.click(inputs = stage2_json, outputs = [stage2_json, cancel_btn, batch_md])
 	def stop_processing(stage2_info):
 		utils.dataDelete(stage2_info["filePath"])
 		stage2_info["state"] = "interrupted"
@@ -819,7 +819,7 @@ with gr.Blocks() as demo:
 			"state" : "running",
 			"sampleRate" : int(samplerate)
 		}
-		return {stage2_info_json : stage2_info,
+		return {stage2_json : stage2_info,
 				run_btn : gr.Button(visible=False),
 				cancel_btn : gr.Button(visible=True, interactive=True),
 				batch_md : gr.Markdown("", visible=True),
@@ -874,7 +874,7 @@ with gr.Blocks() as demo:
 					cancel_btn : gr.Button(visible=False)}
 		else:
 			stage2_info["state"] = "finished"
-			yield {stage2_info_json : stage2_info,
+			yield {stage2_json : stage2_info,
 					run_btn : gr.Button(visible=True),
 					cancel_btn : gr.Button(visible=False),
 					batch_md : gr.Markdown(visible=False),
@@ -883,11 +883,11 @@ with gr.Blocks() as demo:
 	run_btn.click(
 		fn = reset_run,
 		inputs = [in_data_file, in_samplerate, in_modelname],
-		outputs = [stage2_info_json, run_btn, cancel_btn, batch_md, out_data_file]
+		outputs = [stage2_json, run_btn, cancel_btn, batch_md, out_data_file]
 	).success(
 		fn = run_model,
-		inputs = [stage1_info_json, stage2_info_json, in_modelname],
-		outputs = [stage2_info_json, run_btn, cancel_btn, batch_md, out_data_file]
+		inputs = [stage1_json, stage2_json, in_modelname],
+		outputs = [stage2_json, run_btn, cancel_btn, batch_md, out_data_file]
 	)
 	
 if __name__ == "__main__":