Bug fixes and minor UI changes

MC/markov_chain.py

@@ -95,8 +95,8 @@ def generate_notes(csv_file):
             gen_notes.append(int(next_note))
             gen_durations.append(next_duration)
 
-            start_notes.pop()
-            start_durations.pop()
+            start_notes.pop(0)
+            start_durations.pop(0)
 
             start_notes.append(next_note)
             start_durations.append(next_duration)
@@ -218,7 +218,7 @@ def main_markov(time_sign):
        
     mid.tracks.append(track)
     print(mid)
-    track.append((MetaMessage('time_signature', numerator=6, denominator=8)))
+    track.append((MetaMessage('time_signature', numerator=int(time_signature[0]), denominator=int(time_signature[1]))))
     # https://mido.readthedocs.io/en/latest/midi_files.html
     for i in range(num_notes):
         track.append(Message('note_on', channel=0, note=gen_notes[i], velocity=60, time=0))

app.py

@@ -5,9 +5,9 @@ import gradio as gr
 import os
 from MC.markov_chain import main_markov #Function to generate music based on midi files
 
-keysignature = ["C","G","D","No selection"]
+keysignature = ["C","G","D","A","No selection"]
 difficulty = ["beginner","intermediate","expert"]
-timesignature = ['3/4','4/4','1/8','6/8']
+timesignature = ['3/4','4/4','2/2','2/4']
 
 # output = gr.Gallery() if GlobalUIGallery else "image"
 
@@ -23,11 +23,13 @@ timesignature = ['3/4','4/4','1/8','6/8']
 with gr.Blocks() as demo:
     
     gr.Markdown("""
-    ## Sheet Music Generation for Sight-Reading
+    ## Sight-reading generator for sheet music.
+    Markov models which generate sheet music based on different input
+    parameters given by the user. 
     """)
     with gr.Tabs():
         with gr.TabItem("ABC Model"):
-            gr.Markdown("ABC Model discription")
+            gr.Markdown("N-grams model using ABC data as training data.")
             with gr.Row():
                 with gr.Column():
                     difficulty_input_abc = gr.Radio(difficulty,label="Difficulty") #input
@@ -39,8 +41,8 @@ with gr.Blocks() as demo:
                 with gr.Column():
                     output_gallery_abc = gr.Gallery(label="Sheet Music")
                     output_audio_abc = gr.Audio(label="Audio")
-        with gr.TabItem("Midi Model"):
-            gr.Markdown("ABC Model discription")
+        with gr.TabItem("MIDI Model"):
+            gr.Markdown("Markov model using MIDI fata as training data.")
             with gr.Row():
                 with gr.Column():
                     # difficulty_input_midi = gr.Radio(difficulty,label="Difficulty") #input

markov.py

@@ -105,11 +105,11 @@ def generate_model_from_token_lists(token_lines, n, count=14, max_iterations=100
 		It also builds a separate Markov model for each line, and then merges
 		those models together, to ensure that lines end with n-grams statistically
 		likely to end lines in the original text.""" 
-	beginnings = list()
+	# beginnings = list()
 	models = list()
 	for token_line in token_lines:
-		beginning = token_line[:n]
-		beginnings.append(beginning)
+		# beginning = token_line[:n]
+		# beginnings.append(beginning)
 		line_model = build_model(token_line, n)
 		models.append(line_model)
 	combined_model = merge_models(models)

music.py

@@ -55,6 +55,10 @@ def time_sigFinder(time_Signature):
 		return 'M:2/4',2
 	elif time_Signature == "1/8":
 		pass
+	elif time_Signature == "2/4":
+		return 'M:2/4',2
+	elif time_Signature == "2/2":
+		return 'M:2/2',2
 # def get_pngs(path):
 # 	filelist=os.listdir(path)
 # 	for fichier in filelist[:]: # filelist[:] makes a copy of filelist.
@@ -100,6 +104,7 @@ def music_gen(difficulty,time_Signature, Key_Signature):
 						last = index
 					elif "M:" in line:
 						#time signature
+						print(line)
 						if selected_timeSign == "4/4":
 							if "4/4" in line or "C|" in line:
 								accepted = True
@@ -107,6 +112,7 @@ def music_gen(difficulty,time_Signature, Key_Signature):
 							accepted = True
 					elif line.find("K:") and key_enforced:
 						#key signature
+						print(line)
 						if selected_keySign in line:
 							key_accepted = True
 						
@@ -207,8 +213,4 @@ def music_gen(difficulty,time_Signature, Key_Signature):
 	#Introduces this wait time as we were returning file path even before lilypond converted the abc file
 	# final_path = os.path.abspath(song_path+".png")
 	png_list = get_pngs(path)
-	# if len(png_list)>1:
-	# 	print("In HereEEEEEEEEEEEE")
-	# 	GlobalUIGallery = True
-	# 	return png_list,song_path+".wav"
 	return png_list,song_path+".wav"