update

app.py

@@ -52,10 +52,10 @@ init_js = """
 	let selector, attribute;
 	let channel, left, bottom;
 	
-	if(app_state.state == "step2-selecting"){
+	if(app_state.stage1State == "step2-selecting"){
 	    selector = "#radio> div:nth-of-type(2)";
 	    attribute = "value";
-	}else if(app_state.state == "step3-selecting"){
+	}else if(app_state.stage1State == "step3-selecting"){
 	    selector = "#chkbox-group> div:nth-of-type(2)";
 	    attribute = "name";
 	}else return;
@@ -129,7 +129,7 @@ update_js = """
 	let selector;
 	let channel, left, bottom;
 	
-	if(app_state.state == "step2-selecting"){
+	if(app_state.stage1State == "step2-selecting"){
 	    selector = "#radio> div:nth-of-type(2)";
 	    
 	    // update the radios
@@ -148,7 +148,7 @@ update_js = """
 			item.className = "";
 			item.querySelector(":scope> span").innerText = "";
 		});
-	}else if(app_state.state == "step3-selecting"){
+	}else if(app_state.stage1State == "step3-selecting"){
 	    selector = "#chkbox-group> div:nth-of-type(2)";
 	}else return;
 	
@@ -211,19 +211,19 @@ with gr.Blocks() as demo:
 					map_btn = gr.Button("Mapping")
 			
 			# ------------------------mapping------------------------
-			# description for step123
-			desc_md = gr.Markdown("### Mapping result:", visible=False) # """??? # test
+			# description for stage1-123
+			desc_md = gr.Markdown("### Step1: Mapping result", visible=False) # """??? # test
 			
-			# step1 : mapping result
+			# stage1-1 : mapping result
 			with gr.Row():
 				tpl_montage = gr.Image("./template_montage.png", label="Template montage", visible=False)
 				map_montage = gr.Image(label="Input channels", visible=False)
 			
-			# step2 : assign unmatched input channels to empty template channels
+			# stage1-2 : assign unmatched input channels to empty template channels
 			radio = gr.Radio(elem_id="radio", visible=False) #, label=""
 			step2_btn = gr.Button("Next", visible=False) #, interactive=False
 			
-			# step3 : select a way to fill the empty template channels
+			# stage1-3 : select a way to fill the empty template channels
 			with gr.Row():
 				in_fill_mode = gr.Dropdown(choices=["mean", "zero"],
 									value="mean",
@@ -278,7 +278,7 @@ with gr.Blocks() as demo:
     
 	#demo.load(js=js)
 	
-	# click on mapping button
+	# stage1
 	def reset_all(raw_data, raw_loc, samplerate):
 		# verify that all required inputs have been provided
 		if raw_data == None or raw_loc == None:
@@ -303,7 +303,7 @@ with gr.Blocks() as demo:
 			"filepath": filepath+"/temp_data/",
 			"filenames": {},
 			"sampleRate": int(samplerate),
-			"state" : "step1"
+			"stage1State" : "step1"
 		}
 		channel_info = {
 			#"dataShape" : data.shape
@@ -313,7 +313,7 @@ with gr.Blocks() as demo:
 		return {app_state_json : app_state,
 				channel_info_json : channel_info,
 				# ------------------Stage1-----------------------
-				desc_md : gr.Markdown(visible=False),# res_md
+				desc_md : gr.Markdown("### Step1: Mapping result", visible=False),
 				tpl_montage : gr.Image(visible=False),
 				map_montage : gr.Image(value=None, visible=False),
 				radio : gr.Radio(choices=[], value=[], label="", visible=False),
@@ -328,7 +328,7 @@ with gr.Blocks() as demo:
 				batch_md : gr.Markdown(visible=False),
 				out_denoised_data : gr.File(visible=False)}
 	
-	# step1
+	# stage1-1
 	def mapping_result(app_state, channel_info, raw_loc):
 		filepath = app_state["filepath"]
 		filename = filepath+"raw_montage_"+str(random.randint(1,10000))+".png"
@@ -347,11 +347,11 @@ with gr.Blocks() as demo:
 		# if the input channels(>=30) has all the 30 template channels
 		# -> Stage2.decode data
 		if matched_num == 30:
-			app_state["state"] = "finished"
+			app_state["stage1State"] = "finished"
 			gr.Info('The mapping process is finished!')
 			
 			return {app_state_json : app_state,
-					desc_md : gr.Markdown("### Mapping result", visible=True),
+					desc_md : gr.Markdown("### Step1: Mapping result", visible=True),
 					tpl_montage : gr.Image(visible=True),
 					map_montage : gr.Image(value=filename, visible=True),
 					run_btn : gr.Button(interactive=True)}
@@ -359,15 +359,15 @@ with gr.Blocks() as demo:
 		# if matched channels < 30, and there're still some unmatched input channels
 		# -> assign these input channels to nearby unmatched/empty template channels
 		if in_num > matched_num:
-			app_state["state"] = "step2-initializing"
+			app_state["stage1State"] = "step2-initializing"
 		
 		# if input channels < 30, but all of them can match to some template channels
 		# -> directly use fill_mode to fill the remaining channels
 		if in_num == matched_num:
-			app_state["state"] = "step3-initializing"
+			app_state["stage1State"] = "step3-initializing"
 		
 		return {app_state_json : app_state,
-				desc_md : gr.Markdown("### Mapping result", visible=True),
+				desc_md : gr.Markdown("### Step1: Mapping result", visible=True),
 				tpl_montage : gr.Image(visible=True),
 				map_montage : gr.Image(value=filename, visible=True),
 				next_btn : gr.Button("Next step", visible=True)}
@@ -391,13 +391,13 @@ with gr.Blocks() as demo:
 
 	def init_next_step(app_state, channel_info, selected_radio, selected_chkbox):
 		
-		# step1 -> step2
-		if app_state["state"] == "step2-initializing":
+		# stage1-1 -> stage1-2
+		if app_state["stage1State"] == "step2-initializing":
 			print('step1 -> step2')
 			app_state["missingTemplates"] = [channel for channel in channel_info["templateByIndex"]
 											if channel_info["templateByName"][channel]["matched"]==False]
 			app_state.update({
-				"state" : "step2-selecting",
+				"stage1State" : "step2-selecting",
 				"fillingCount" : 1,
 				"totalFillingNum" : len(app_state["missingTemplates"])
 			})
@@ -408,7 +408,7 @@ with gr.Blocks() as demo:
 			if len(app_state["stage1UnassignedInputs"])==1 or app_state["totalFillingNum"]==1:
 				return {app_state_json : app_state,
 					    channel_info_json : channel_info,
-					    desc_md : gr.Markdown("### step2"),
+					    desc_md : gr.Markdown("### Step2"),
 					    tpl_montage : gr.Image(visible=False),
 					    map_montage : gr.Image(visible=False),
 					    radio : gr.Radio(choices=app_state["stage1UnassignedInputs"], value=[], label=label, visible=True),
@@ -416,34 +416,34 @@ with gr.Blocks() as demo:
 			else:
 			    return {app_state_json : app_state,
 					    channel_info_json : channel_info,
-					    desc_md : gr.Markdown("### step2"),
+					    desc_md : gr.Markdown("### Step2"),
 					    tpl_montage : gr.Image(visible=False),
 					    map_montage : gr.Image(visible=False),
 					    radio : gr.Radio(choices=app_state["stage1UnassignedInputs"], value=[], label=label, visible=True),
 					    step2_btn : gr.Button(visible=True),
 					    next_btn : gr.Button(visible=False)}
 		
-		# step1 -> step3
-		elif app_state["state"] == "step3-initializing":
+		# stage1-1 -> stage1-3
+		elif app_state["stage1State"] == "step3-initializing":
 			print('step1 -> step3')
 			app_state["missingTemplates"] = [channel for channel in channel_info["templateByIndex"]
 											if channel_info["templateByName"][channel]["matched"]==False]
 			app_state.update({
-				"state" : "step3-initializing",
+				"stage1State" : "step3-initializing",
 				"fillingCount" : 1,
 				"totalFillingNum" : len(app_state["missingTemplates"])
 			})
 			return {app_state_json : app_state,
 			        channel_info_json : channel_info,
-					desc_md : gr.Markdown("### step3"),
+					desc_md : gr.Markdown("### Step3"),
 					tpl_montage : gr.Image(visible=False),
 					map_montage : gr.Image(visible=False),
 					in_fill_mode : gr.Dropdown(visible=True),
 					fillmode_btn : gr.Button(visible=True),
 					next_btn : gr.Button(visible=False)}
 		
-		# step2 -> step3/Stage2.decode data
-		elif app_state["state"] == "step2-selecting":
+		# stage1-2 -> stage1-3 or stage2
+		elif app_state["stage1State"] == "step2-selecting":
 		
 			# save info before clicking on next_btn
 			prev_target_name = app_state["missingTemplates"][app_state["fillingCount"]-1]
@@ -466,11 +466,11 @@ with gr.Blocks() as demo:
 			})
 			
 			# if all the unmatched template channels were filled by input channels
-			# -> Stage2
+			# -> stage2
 			if len(app_state["missingTemplates"]) == 0:
 				print('step2 -> Stage2')
 				gr.Info('The mapping process is finished!')
-				app_state["state"] = "finished"
+				app_state["stage1State"] = "finished"
 				
 				return {app_state_json : app_state,
 						channel_info_json : channel_info,
@@ -479,24 +479,24 @@ with gr.Blocks() as demo:
 						next_btn : gr.Button(visible=False),
 						run_btn : gr.Button(interactive=True)}
 						
-			# -> step3
+			# -> stage1-3
 			else:
 				print('step2 -> step3')
 				app_state.update({
-					"state" : "step3-initializing",
+					"stage1State" : "step3-initializing",
 					"fillingCount" : 1,
 					"totalFillingNum" : len(app_state["missingTemplates"])
 				})
 				return {app_state_json : app_state,
 						channel_info_json : channel_info,
-						desc_md : gr.Markdown("### step3"),
+						desc_md : gr.Markdown("### Step3"),
 						radio : gr.Radio(visible=False),
 						in_fill_mode : gr.Dropdown(visible=True),
 						fillmode_btn : gr.Button(visible=True),
 						next_btn : gr.Button(visible=False)}
 		
-		# step3 -> Stage2.decode data
-		elif app_state["state"] == "step3-selecting":
+		# stage1-3 -> stage2
+		elif app_state["stage1State"] == "step3-selecting":
 			
 			# save info before clicking on next_btn
 			prev_target_name = app_state["missingTemplates"][app_state["fillingCount"]-1]
@@ -509,7 +509,7 @@ with gr.Blocks() as demo:
 			#print(f'{prev_target_name}({prev_target_idx}): {selected_chkbox}')
 			
 			gr.Info('The mapping process is finished!')
-			app_state["state"] = "finished"
+			app_state["stage1State"] = "finished"
 			print('step3 -> Stage2')
 			
 			app_state["missingTemplates"] = [channel for channel in channel_info["templateByIndex"]
@@ -533,7 +533,7 @@ with gr.Blocks() as demo:
 		outputs = []
 	)
 	
-	# step2
+	# stage1-2
 	# def update_selection()
 	def update_radio(app_state, channel_info, selected):
 		
@@ -581,11 +581,11 @@ with gr.Blocks() as demo:
 		outputs = []
 	)
 	
-	# step3
+	# stage1-3
 	def fill_value(app_state, channel_info, fill_mode):
 		
 		if fill_mode == 'zero':
-			app_state["state"] = "finished"
+			app_state["stage1State"] = "finished"
 			gr.Info('The mapping process is finished!')
 			
 			return {app_state_json : app_state,
@@ -595,7 +595,7 @@ with gr.Blocks() as demo:
 					run_btn : gr.Button(interactive=True)}
 		
 		elif fill_mode == 'mean':
-			app_state["state"] = "step3-selecting"
+			app_state["stage1State"] = "step3-selecting"
 			app_state = find_neighbors(app_state, channel_info, fill_mode)
 			
 			name = app_state["missingTemplates"][0]
@@ -673,13 +673,14 @@ with gr.Blocks() as demo:
 		outputs = []
 	)
 	
-
+    
 	def delete_file(filename):
 		try:
 			os.remove(filename)
 		except OSError as e:
 			print(e)
 	
+	# stage2
 	def reset_run(app_state, channel_info, raw_data, model_name):
 		filepath = app_state["filepath"]
 		delete_file(filepath+'mapped.csv')
@@ -695,7 +696,7 @@ with gr.Blocks() as demo:
 		
 		app_state["filenames"]["denoised"] = filepath + output_name
 		app_state.update({
-			"runnigState" : "stage1",
+			"runningState" : "stage1",
 			"batchCount" : 1,
 			"totalBatchNum" : batch_num,
 			"stage2UnassignedInputs" : app_state["stage1UnassignedInputs"],
@@ -717,16 +718,16 @@ with gr.Blocks() as demo:
 		samplerate = app_state["sampleRate"]
 		new_filename = app_state["filenames"]["denoised"]
 		
-		while app_state["runnigState"] != "finished":
+		while app_state["runningState"] != "finished":
 			#if app_state["batchCount"] > app_state["totalBatchNum"]:
-				#app_state["runnigState"] = "finished"
+				#app_state["runningState"] = "finished"
 				#break
 			md = 'Running model('+str(app_state["batchCount"])+'/'+str(app_state["totalBatchNum"])+')...'
 			yield {batch_md : gr.Markdown(md, visible=True)}
 			
 			if app_state["batchCount"] > 1:
 				app_state, channel_info = mapping_stage2(app_state, channel_info, fill_mode)
-				if app_state["runnigState"] == "finished":
+				if app_state["runningState"] == "finished":
 					#yield {batch_md : gr.Markdown("error", visible=True)}
 					break
 			
@@ -762,4 +763,4 @@ with gr.Blocks() as demo:
 	)
 	
 if __name__ == "__main__":
-    demo.launch()
+    demo.launch(server_name="0.0.0.0", server_port=7860)

channel_mapping.py

@@ -11,7 +11,7 @@ from scipy.optimize import linear_sum_assignment
 from sklearn.neighbors import NearestNeighbors
 
 def reorder_to_template(app_state, filename):
-	old_idx = app_state["stage1NewOrder"] if app_state["runnigState"]=="stage1" else app_state["stage2NewOrder"]
+	old_idx = app_state["stage1NewOrder"] if app_state["runningState"]=="stage1" else app_state["stage2NewOrder"]
 	old_data = utils.read_train_data(filename) # original raw data
 	new_data = np.zeros((30, old_data.shape[1])) # reordered raw data
 	new_filename = app_state["filepath"]+'mapped.csv'
@@ -36,11 +36,11 @@ def reorder_to_template(app_state, filename):
 	return
 
 def reorder_to_origin(app_state, channel_info, filename, new_filename):
-	old_idx = app_state["stage1NewOrder"] if app_state["runnigState"]=="stage1" else app_state["stage2NewOrder"]
+	old_idx = app_state["stage1NewOrder"] if app_state["runningState"]=="stage1" else app_state["stage2NewOrder"]
 	old_data = utils.read_train_data(filename) # denoised data
 	template_order = channel_info["templateByIndex"]
 	
-	if app_state["runnigState"] == "stage1":
+	if app_state["runningState"] == "stage1":
 		new_data = np.zeros((len(channel_info["inputByIndex"]), old_data.shape[1]))
 	else:
 		new_data = utils.read_train_data(new_filename)
@@ -162,7 +162,7 @@ def align_coords(channel_info, template_montage, input_montage):
 	return channel_info
 
 def find_neighbors(app_state, channel_info, fill_mode):
-	new_idx = app_state["stage1NewOrder"] if app_state["runnigState"]=="stage1" else app_state["stage2NewOrder"]
+	new_idx = app_state["stage1NewOrder"] if app_state["runningState"]=="stage1" else app_state["stage2NewOrder"]
 	template_dict = channel_info["templateByName"]
 	input_dict = channel_info["inputByName"]
 	template_order = channel_info["templateByIndex"]
@@ -184,12 +184,12 @@ def find_neighbors(app_state, channel_info, fill_mode):
 	for channel in missing_channels:
 		distances, indices = knn.kneighbors(np.array(template_dict[channel]["coord"]).reshape(1,-1))
 		selected = [input_order[i] for i in indices[0]]
-		#print(channel, ':', selected)
+		print(channel, ':', selected)
 		
 		idx = template_dict[channel]["index"]
 		new_idx[idx] = indices[0].tolist()
 	
-	if app_state["runnigState"] == "stage1":
+	if app_state["runningState"] == "stage1":
 		app_state["stage1NewOrder"] = new_idx
 	else:
 		app_state["stage2NewOrder"] = new_idx
@@ -240,7 +240,7 @@ def mapping_stage1(app_state, channel_info, loc_file):
 	})
 	app_state.update({
 	    "stage1NewOrder" : new_idx,
-	    "runnigState" : "stage1",
+	    "runningState" : "stage1",
 	    "stage1UnassignedInputs" : [channel for channel in input_order if input_dict[channel].assigned==False],
 	    "missingTemplates" : [channel for channel in template_order if template_dict[channel].matched==False]
 	})
@@ -263,7 +263,7 @@ def mapping_stage2(app_state, channel_info, fill_mode):
 	input_order = channel_info["inputByIndex"]
 	unassigned = app_state["stage2UnassignedInputs"]
 	if unassigned == []:
-		app_state["runnigState"] = "finished"
+		app_state["runningState"] = "finished"
 		return app_state, channel_info
 	
 	tpl_coords = np.array([template_dict[channel]["coord"] for channel in template_order])
@@ -306,7 +306,7 @@ def mapping_stage2(app_state, channel_info, fill_mode):
 	})
 	app_state.update({
 	    "stage2NewOrder" : new_idx,
-	    "runnigState" : "stage2",
+	    "runningState" : "stage2",
 	    "stage2UnassignedInputs" : [channel for channel in input_order if input_dict[channel]["assigned"]==False],
 	    "missingTemplates" : [channel for channel in template_order if template_dict[channel]["matched"]==False]
 	})