Update app.py

app.py

@@ -1,7 +1,7 @@
 import argparse
 import glob
 import os.path
-
+import hashlib
 import time
 import datetime
 from pytz import timezone
@@ -28,57 +28,57 @@ in_space = os.getenv("SYSTEM") == "spaces"
 
 #==========================================================================================================
 
-def render_midi(search_string, render_options):
+def render_midi(input_midi, render_options):
+    
     print('=' * 70)
     print('Req start time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
     start_time = time.time()
-    
     print('=' * 70)
-    print('Search string:', search_string)
-    print('Search options:', search_options)
+    print('Loading MIDI...')
+
+    fn = os.path.basename(input_midi)
+    fn1 = fn.split('.')[-2]
+
+    fdata = open(input_midi, 'rb').read()
+
+    input_midi_md5hash = hashlib.md5(fdata).hexdigest()
     
     print('=' * 70)
-    print('Preparing to search...')
-    
-    #==================================================
-    
-    random.shuffle(AUX_DATA)
-    
-    search_data = []
-    
-    for A in AUX_DATA:
-        data = ''
-        if 'Titles' in search_options:
-            data += A[1] + '\n\n'
-        if 'Lyrics' in search_options:
-            data += A[2] + '\n\n'
-        if 'Summaries' in search_options:
-            data += A[3] + '\n\n'
-
-        search_data.append(data)
+    print('Input MIDI file name:', fn)
+    print('Input MIDI md5 hash', input_midi_md5hash)
+    print('Render options:', render_options)
     
-    print('Searching titles...Please wait...')
-    
-    search_match_data = TMIDIX.ascii_texts_search(search_data, search_string, deterministic_matching = True)
+    print('=' * 70)
+    print('Processing MIDI...Please wait...')
     
-    search_match_text = search_match_data[0]
-    search_match_ratio = search_match_data[1]
-    search_match_index = search_data.index(search_match_text)
+    #=======================================================
+    # START PROCESSING
+
+    raw_score = TMIDIX.midi2single_track_ms_score(fdata, recalculate_channels=False)
+
+    escore = TMIDIX.advanced_score_processor(raw_score, return_score_analysis=False, return_enhanced_score_notes=True)[0]
+
+    first_note_index = raw_score[1].index(escore[0][:6])
+
+    for e in escore:
+        e[1] = int(e[1] / 16)
+        e[2] = int(e[2] / 16)
+
+    # Sorting by patch, pitch, then by start-time
+
+    escore.sort(key=lambda x: x[6])
+    escore.sort(key=lambda x: x[4], reverse=True)
+    escore.sort(key=lambda x: x[1])
+
+    cscore = TMIDIX.chordify_score([1000, escore])
+
+    meta_data = raw_score[1][:first_note_index] + [escore[0]] + [escore[-1]] + [raw_score[1][-1]]
     
     print('Done!')
     print('=' * 70)
-    print('Search match ratio:', search_match_ratio)
-    print('Selected file/title:', AUX_DATA[search_match_index][:2])
+    print('Input MIDI metadata:', meta_data)
     print('=' * 70)
 
-    fn = AUX_DATA[search_match_index][0]
-    title = AUX_DATA[search_match_index][1]
-    lyric = AUX_DATA[search_match_index][2]
-    summary = AUX_DATA[search_match_index][3]
-    raw_score = AUX_DATA[search_match_index][4]
-    single_track_score_notes = TMIDIX.advanced_score_processor(raw_score, 
-                                                               return_score_analysis=False, 
-                                                               return_enhanced_score_notes=True)[0]
 
     print('Sample INTs', raw_score[1][:5])
     print('=' * 70)
@@ -92,7 +92,7 @@ def render_midi(search_string, render_options):
             'gray', 'white', 'gold', 'silver',
             'lightgreen', 'indigo', 'maroon', 'turquoise']
     
-    for s in single_track_score_notes:
+    for s in escore:
         x.append(s[1])
         y.append(s[4])
         c.append(colors[s[3]])
@@ -103,14 +103,14 @@ def render_midi(search_string, render_options):
     ax.set_facecolor('black')
     
     plt.scatter(x,y, s=10, c=c)
-    plt.xlabel("Time in MIDI ticks")
+    plt.xlabel("Time in ms")
     plt.ylabel("MIDI Pitch")
 
     with open(fn+'.mid', 'wb') as f:
         f.write(TMIDIX.score2midi(raw_score))
     
     audio = midi_to_colab_audio(fn+'.mid', 
-                        soundfont_path=soundfont_path, 
+                        soundfont_path=soundfont[0], 
                         sample_rate=16000, # 44100
                         volume_scale=10,
                         output_for_gradio=True