Update app.py

app.py

@@ -91,117 +91,117 @@ def find_midi(title, artist):
     
     if len(outy) != 0:
     
-      song = outy
-      song_f = []
-    
-      time = 0
-      dur = 0
-      vel = 90
-      pitch = 0
-      channel = 0
-    
-      patches = [-1] * 16
-    
-      channels = [0] * 16
-      channels[9] = 1
-    
-      for ss in song:
-    
-          if 0 <= ss < 256:
+        song = outy
+        song_f = []
+        
+        time = 0
+        dur = 0
+        vel = 90
+        pitch = 0
+        channel = 0
+        
+        patches = [-1] * 16
+        
+        channels = [0] * 16
+        channels[9] = 1
+        
+        for ss in song:
     
+            if 0 <= ss < 256:
+            
               time += ss * 16
-    
-          if 256 <= ss < 2304:
-    
-              dur = ((ss-256) // 8) * 16
-              vel = (((ss-256) % 8)+1) * 15
-    
-          if 2304 <= ss < 18945:
-    
-              patch = (ss-2304) // 129
-    
-              if patch < 128:
-    
+            
+            if 256 <= ss < 512:
+            
+              dur = (ss-256) * 16
+            
+            if 512 <= ss <= 640:
+
+                patch = (ss-512)
+                
+                if patch < 128:
+            
                   if patch not in patches:
                     if 0 in channels:
                         cha = channels.index(0)
                         channels[cha] = 1
                     else:
                         cha = 15
-    
+            
                     patches[cha] = patch
                     channel = patches.index(patch)
                   else:
                     channel = patches.index(patch)
-    
+            
               if patch == 128:
                   channel = 9
+                
+            if 640 < ss < 768:
+
+                ptc = (ss-640)
+
+            if 768 < ss < 896:
+
+                vel = (ss - 768)
+            
+                song_f.append(['note', time, dur, channel, ptc, vel, patch ])
     
-              pitch = (ss-2304) % 129
+    patches = [0 if x==-1 else x for x in patches]
+
+    print('=' * 70)
     
-              song_f.append(['note', time, dur, channel, pitch, vel, patch ])
+    #===============================================================================
+    print('Rendering results...')
     
-
+    print('=' * 70)
+    print('Sample INTs', song_f[:3])
+    print('=' * 70)
     
-    x = []
-    y = []
-    c = []
+    output_score, patches, overflow_patches = TMIDIX.patch_enhanced_score_notes(song_f)
     
-    colors = ['red', 'yellow', 'green', 'cyan',
-            'blue', 'pink', 'orange', 'purple',
-            'gray', 'white', 'gold', 'silver',
-            'lightgreen', 'indigo', 'maroon', 'turquoise']
+    detailed_stats = TMIDIX.Tegridy_ms_SONG_to_MIDI_Converter(output_score,
+                                                          output_signature = 'Los Angeles MIDI Dataset Search',
+                                                          output_file_name = song_artist,
+                                                          track_name='Project Los Angeles',
+                                                          list_of_MIDI_patches=patches,
+                                                          timings_multiplier=16
+                                                          )
     
-    for s in [m for m in song_f if m[0] == 'note']:
-        x.append(s[1])
-        y.append(s[4])
-        c.append(colors[s[3]])
-
-    plt.close()
-    plt.figure(figsize=(14,5))
-    ax=plt.axes(title='MIDI Match Plot')
-    ax.set_facecolor('black')
+    new_fn = song_artist + '.mid'
+        
+    audio = midi_to_colab_audio(new_fn, 
+                    soundfont_path=soundfont,
+                    sample_rate=16000,
+                    volume_scale=10,
+                    output_for_gradio=True
+                    )
+    
+    print('Done!')
+    print('=' * 70)
+    
+    #========================================================
+    
+    output_midi_title = str(song_artist)
+    output_midi_summary = str(song_f[:3])
+    output_midi = str(new_fn)
+    output_audio = (16000, audio)
+    
+    output_plot = TMIDIX.plot_ms_SONG(output_score, plot_title=output_midi_title, return_plt=True)
+    
+    print('Output MIDI file name:', output_midi)
+    print('Output MIDI title:', output_midi_title)
+    print('Output MIDI summary:', output_midi_summary)
+    print('=' * 70) 
+    
+    #========================================================
+    
+    print('-' * 70)
+    print('Req end time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
+    print('-' * 70)
+    print('Req execution time:', (reqtime.time() - start_time), 'sec')
+    
+    return output_midi_title, output_midi_summary, output_midi, output_audio, output_plot        
     
-    plt.scatter(x,y, c=c)
-    plt.xlabel("Time in MIDI ticks")
-    plt.ylabel("MIDI Pitch")
-
-    output_signature = AUX_DATA[search_index][0]
-    track_name = 'Project Los Angeles'
-    text_encoding = 'ISO-8859-1'
-
-    list_of_MIDI_patches=[0, 24, 32, 40, 42, 46, 56, 71, 73, 0, 53, 19, 0, 0, 0, 0]
-
-    output_header = [1000,
-                    [['set_tempo', 0, 1000000],
-                     ['time_signature', 0, 4, 2, 24, 8],
-                     ['track_name', 0, bytes(output_signature, text_encoding)]]]
-
-    patch_list = [['patch_change', 0, 0, list_of_MIDI_patches[0]], 
-                    ['patch_change', 0, 1, list_of_MIDI_patches[1]],
-                    ['patch_change', 0, 2, list_of_MIDI_patches[2]],
-                    ['patch_change', 0, 3, list_of_MIDI_patches[3]],
-                    ['patch_change', 0, 4, list_of_MIDI_patches[4]],
-                    ['patch_change', 0, 5, list_of_MIDI_patches[5]],
-                    ['patch_change', 0, 6, list_of_MIDI_patches[6]],
-                    ['patch_change', 0, 7, list_of_MIDI_patches[7]],
-                    ['patch_change', 0, 8, list_of_MIDI_patches[8]],
-                    ['patch_change', 0, 9, list_of_MIDI_patches[9]],
-                    ['patch_change', 0, 10, list_of_MIDI_patches[10]],
-                    ['patch_change', 0, 11, list_of_MIDI_patches[11]],
-                    ['patch_change', 0, 12, list_of_MIDI_patches[12]],
-                    ['patch_change', 0, 13, list_of_MIDI_patches[13]],
-                    ['patch_change', 0, 14, list_of_MIDI_patches[14]],
-                    ['patch_change', 0, 15, list_of_MIDI_patches[15]],
-                    ['track_name', 0, bytes(track_name, text_encoding)]]
-
-    output = output_header + [patch_list + song_f]
-
-    with open(f"MIDI-Search-Sample.mid", 'wb') as f:
-        f.write(MIDI.score2midi(output))
-    audio = synthesis(MIDI.score2opus(output), soundfont_path)
-    yield AUX_DATA[search_index][0], "MIDI-Search-Sample.mid", (44100, audio), plt
-
 #==========================================================================================================
 
 if __name__ == "__main__":
@@ -261,12 +261,13 @@ if __name__ == "__main__":
 
         gr.Markdown("# Search results")
 
-        output_midi_seq = gr.Textbox(label="Found MIDI search title")
-        output_audio = gr.Audio(label="Output MIDI search sample audio", format="mp3", elem_id="midi_audio")
-        output_plot = gr.Plot(label="Output MIDI search sample plot")
-        output_midi = gr.File(label="Output MIDI search sample MIDI", file_types=[".mid"])
+        output_midi_title = gr.Textbox(label="Output MIDI title")
+        output_midi_summary = gr.Textbox(label="Output MIDI summary")
+        output_audio = gr.Audio(label="Output MIDI audio", format="wav", elem_id="midi_audio")
+        output_plot = gr.Plot(label="Output MIDI score plot")
+        output_midi = gr.File(label="Output MIDI file", file_types=[".mid"])
         
         run_event = submit.click(find_midi, [title, artist],
-                                                  [output_midi_seq, output_midi, output_audio, output_plot])
+                                                  [output_midi_title, output_midi_summary, output_midi, output_audio, output_plot ])
         
     app.launch()