update

app.py

@@ -150,7 +150,7 @@ update_js = """
 	
 	if(stage1_info.state == "step2-selecting"){
 	    selector = "#radio-group > div:nth-of-type(2)";
-	    cnt = stage1_info.step2.fillingCount
+	    cnt = stage1_info.step2.count
 	    
 	    // update the radios
 		let all_elem = document.querySelectorAll(selector+" > label");
@@ -165,7 +165,7 @@ update_js = """
 		});
 	}else if(stage1_info.state == "step3-2-selecting"){
 	    selector = "#chkbox-group > div:nth-of-type(2)";
-	    cnt = stage1_info.step3.fillingCount
+	    cnt = stage1_info.step3.count
 	}else return;
 	
 	// update the indication
@@ -316,16 +316,16 @@ with gr.Blocks() as demo:
 			},
 			"state" : "step1-initializing",
 	    	"step2" : {
-	    		"fillingCount" : None,
-				"totalFillingNum" : None
+	    		"count" : None,
+				"totalNum" : None
 	    	},
 	    	"step3" : {
-	    		"fillingCount" : None,
-				"totalFillingNum" : None
+	    		"count" : None,
+				"totalNum" : None
 	    	},
 	    	"unassignedInputs" : None,
 	    	"missingTemplates" : None,
-	    	"totalBatchNum" : None,
+	    	"batchNum" : None,
 	    	"mappingData" : [
 	    	{
 				"newOrder" : None,
@@ -436,16 +436,16 @@ with gr.Blocks() as demo:
 				"""
 				# initialize the progress indication label
 				step2 = {
-					"fillingCount" : 1,
-					"totalFillingNum" : len(stage1_info["missingTemplates"])
+					"count" : 1,
+					"totalNum" : len(stage1_info["missingTemplates"])
 				}
 				name = stage1_info["missingTemplates"][0]
-				label = '{} (1/{})'.format(name, step2["totalFillingNum"])
+				label = '{} (1/{})'.format(name, step2["totalNum"])
 				
 				stage1_info["step2"] = step2
 				stage1_info["state"] = "step2-selecting"
 				# determine which button to display
-				if step2["totalFillingNum"] == 1:
+				if step2["totalNum"] == 1:
 					yield {stage1_json : stage1_info,
 							desc_md : gr.Markdown(md),
 							tpl_img : gr.Image(visible=False),
@@ -483,7 +483,7 @@ with gr.Blocks() as demo:
 			# --------------------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"][step2["fillingCount"]-1]
+				prev_target_name = stage1_info["missingTemplates"][step2["count"]-1]
 				prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 				selected_idx = channel_info["inputDict"][selected_radio]["index"]
 				
@@ -569,11 +569,11 @@ with gr.Blocks() as demo:
 																		stage1_info["mappingData"][0]["newOrder"])
 				# initialize the progress indication label
 				step3 = {
-					"fillingCount" : 1,
-					"totalFillingNum" : len(stage1_info["missingTemplates"])
+					"count" : 1,
+					"totalNum" : len(stage1_info["missingTemplates"])
 				}
 				target_name = stage1_info["missingTemplates"][0]
-				chkbox_label = '{} (1/{})'.format(target_name, step3["totalFillingNum"])
+				chkbox_label = '{} (1/{})'.format(target_name, step3["totalNum"])
 				
 				target_idx = channel_info["templateDict"][target_name]["index"]
 				chkbox_value = stage1_info["mappingData"][0]["newOrder"][target_idx]
@@ -582,7 +582,7 @@ with gr.Blocks() as demo:
 				stage1_info["step3"] = step3
 				stage1_info["state"] = "step3-2-selecting"
 				# determine which button to display
-				if step3["totalFillingNum"] == 1:
+				if step3["totalNum"] == 1:
 					yield {stage1_json : stage1_info,
 					        desc_md : gr.Markdown(md),
 							in_fillmode : gr.Dropdown(visible=False),
@@ -604,7 +604,7 @@ with gr.Blocks() as demo:
 		elif stage1_info["state"] == "step3-2-selecting":
 			step3 = stage1_info["step3"]
 			# --------------------store information before the button click---------------------
-			prev_target_name = stage1_info["missingTemplates"][step3["fillingCount"]-1]
+			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_chkbox]
 			stage1_info["mappingData"][0]["newOrder"][prev_target_idx] = selected_indices
@@ -670,7 +670,7 @@ with gr.Blocks() as demo:
 	@clear_btn.click(inputs = stage1_json, outputs = [radio_group, step2_btn, next_btn])
 	def clear_value(stage1_info):
 		step2 = stage1_info["step2"]
-		if len(stage1_info["unassignedInputs"])==1 and step2["fillingCount"]<step2["totalFillingNum"]:
+		if len(stage1_info["unassignedInputs"])==1 and step2["count"]<step2["totalNum"]:
 			return {radio_group : gr.Radio(value=[]),
 					step2_btn : gr.Button(visible=True),
 					next_btn : gr.Button(visible=False)}
@@ -682,7 +682,7 @@ with gr.Blocks() as demo:
 		# ----------------------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"][step2["fillingCount"]-1]
+			prev_target_name = stage1_info["missingTemplates"][step2["count"]-1]
 			prev_target_idx = channel_info["templateDict"][prev_target_name]["index"]
 			selected_idx = channel_info["inputDict"][selected]["index"]
 			
@@ -693,17 +693,17 @@ with gr.Blocks() as demo:
 			#print(prev_target_name, '<-', selected)
 		
 		# ------------------------update information for the new round--------------------------
-		step2["fillingCount"] += 1
+		step2["count"] += 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"][step2["fillingCount"]-1]
-		radio_label = '{} ({}/{})'.format(target_name, step2["fillingCount"], step2["totalFillingNum"])
+		target_name = stage1_info["missingTemplates"][step2["count"]-1]
+		radio_label = '{} ({}/{})'.format(target_name, step2["count"], step2["totalNum"])
 		
 		stage1_info["step2"] = step2
 		# determine which button to display
-		if step2["fillingCount"] == step2["totalFillingNum"]:
+		if step2["count"] == step2["totalNum"]:
 			return {stage1_json : stage1_info,
 					channel_json : channel_info,
 					radio_group : gr.Radio(choices=stage1_info["unassignedInputs"],
@@ -734,17 +734,17 @@ with gr.Blocks() as demo:
 	def update_chkbox(stage1_info, channel_info, selected):
 		step3 = stage1_info["step3"]
 		# ----------------------store information before the button click-----------------------
-		prev_target_name = stage1_info["missingTemplates"][step3["fillingCount"]-1]
+		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["mappingData"][0]["newOrder"][prev_target_idx] = selected_indices
 		#print(f'{prev_target_name}({prev_target_idx}): {selected_indices}')
 		
 		# ------------------------update information for the new round--------------------------
-		step3["fillingCount"] += 1
+		step3["count"] += 1
 		
-		target_name = stage1_info["missingTemplates"][step3["fillingCount"]-1]
-		chkbox_label = '{} ({}/{})'.format(target_name, step3["fillingCount"], step3["totalFillingNum"])
+		target_name = stage1_info["missingTemplates"][step3["count"]-1]
+		chkbox_label = '{} ({}/{})'.format(target_name, step3["count"], step3["totalNum"])
 		
 		target_idx = channel_info["templateDict"][target_name]["index"]
 		chkbox_value = stage1_info["mappingData"][0]["newOrder"][target_idx]
@@ -752,7 +752,7 @@ with gr.Blocks() as demo:
 		
 		stage1_info["step3"] = step3
 		# determine which button to display
-		if step3["fillingCount"] == step3["totalFillingNum"]:
+		if step3["count"] == step3["totalNum"]:
 			return {stage1_json : stage1_info,
 					chkbox_group : gr.CheckboxGroup(value=chkbox_value, label=chkbox_label),
 					step3_btn : gr.Button(visible=False),
@@ -833,7 +833,7 @@ with gr.Blocks() as demo:
 				out_data_file : gr.File(value=None, visible=False)}
 	
 	def run_model(stage1_info, stage2_info, modelname):
-		batch_num = stage1_info["totalBatchNum"]
+		batch_num = stage1_info["batchNum"]
 		mapping_data = stage1_info["mappingData"]
 		samplerate = stage2_info["sampleRate"]
 		filepath = stage2_info["filePath"]

app_utils.py

@@ -352,7 +352,7 @@ def mapping_result(stage1_info, channel_info, filename):
 		jsonfile.write(json.dumps(new_dict))
 	
 	stage1_info.update({
-		"totalBatchNum" : batch_num,
+		"batchNum" : batch_num,
 		"mappingData" : all_mapping_data
 	})
 	return stage1_info, channel_info