Update app.py

app.py

@@ -14,6 +14,7 @@ import numpy as np
 import os
 import random
 from collections import Counter
+import math
 from tqdm import tqdm
 
 import TMIDIX
@@ -23,7 +24,7 @@ from midi_to_colab_audio import midi_to_colab_audio
 # =================================================================================================
 
 def Generate_Chords_Progression(total_song_length_in_chords_chunks,
-                                chords_chunks_memory_length,
+                                chords_chunks_memory_ratio,
                                 chord_time_step,
                                 merge_chords_notes,
                                 melody_MIDI_patch_number,
@@ -38,7 +39,7 @@ def Generate_Chords_Progression(total_song_length_in_chords_chunks,
     print('=' * 70)
     print('Requested settings:')
     print('Total song length in chords chunks:', total_song_length_in_chords_chunks)
-    print('Chords chunks memory length:', chords_chunks_memory_length)
+    print('Chords chunks memory ratio:', chords_chunks_memory_ratio)
     print('Chord time step:', chord_time_step)
     print('Merge chords notes max time:', merge_chords_notes)
     print('Melody MIDI patch number:', melody_MIDI_patch_number)
@@ -58,66 +59,77 @@ def Generate_Chords_Progression(total_song_length_in_chords_chunks,
     print('Generating...')
     print('=' * 70)
     
+matching_long_chords_chunks = []
+
+ridx = random.randint(0, len(all_long_chords_tokens_chunks)-1)
+
+matching_long_chords_chunks.append(ridx)
+
+max_song_len = 0
+
+tries = 0
+
+while len(matching_long_chords_chunks) < minimum_song_length_in_chords_chunks:
+
     matching_long_chords_chunks = []
-    
+
     ridx = random.randint(0, len(all_long_chords_tokens_chunks)-1)
-    
+
     matching_long_chords_chunks.append(ridx)
-    
-    max_song_len = 0
-    
-    tries = 0
-    
-    while len(matching_long_chords_chunks) < total_song_length_in_chords_chunks:
-    
-        matching_long_chords_chunks = []
-    
-        ridx = random.randint(0, len(all_long_chords_tokens_chunks)-1)
-    
-        matching_long_chords_chunks.append(ridx)
-        seen = [ridx]
-    
-        for a in range(16):
-    
-          schunk = all_long_chords_tokens_chunks[matching_long_chords_chunks[-1]]
-          trg_long_chunk = np.array(schunk[-chunk_size:])
-          idxs = np.where((src_long_chunks == trg_long_chunk).all(axis=1))[0].tolist()
-    
-          if len(idxs) > 1:
-            eidx = random.choice(idxs)
-            tr = 0
-            while eidx in seen and tr < 5:
-              eidx = random.choice(idxs)
-              tr += 1
-    
-            if eidx not in seen:
-    
-              matching_long_chords_chunks.append(eidx)
-              seen.append(eidx)
-    
-              if chords_chunks_memory_length > 0:
-                seen = seen[-chords_chunks_memory_length:]
-              elif chords_chunks_memory_length == 0:
-                seen = []
-    
-            else:
-              break
-    
-          else:
-            break
-    
-        if len(matching_long_chords_chunks) > max_song_len:
-          print('Current song length:', len(matching_long_chords_chunks), 'chords chunks')
-          print('=' * 70)
-          final_song = matching_long_chords_chunks
-    
-        max_song_len = max(max_song_len, len(matching_long_chords_chunks))
-    
-        tries += 1
-    
-        if tries % 500 == 0:
-          print('Number of passed tries:', tries)
-          print('=' * 70)
+    seen = [ridx]
+    gseen = [ridx]
+
+    for a in range(minimum_song_length_in_chords_chunks * 10):
+
+      if not matching_long_chords_chunks:
+        break
+
+      if len(matching_long_chords_chunks) > minimum_song_length_in_chords_chunks:
+        break
+
+      schunk = all_long_chords_tokens_chunks[matching_long_chords_chunks[-1]]
+      trg_long_chunk = np.array(schunk[-chunk_size:])
+      idxs = np.where((src_long_chunks == trg_long_chunk).all(axis=1))[0].tolist()
+
+      if len(idxs) > 1:
+
+        random.shuffle(idxs)
+
+        eidxs = [i for i in idxs if i not in seen]
+
+        if eidxs:
+          eidx = eidxs[0]
+          matching_long_chords_chunks.append(eidx)
+          seen.append(eidx)
+          gseen.append(eidx)
+
+          if 0 < chords_chunks_memory_ratio < 1:
+            seen = random.choices(gseen, k=math.ceil(len(gseen) * chords_chunks_memory_ratio))
+          elif chords_chunks_memory_ratio == 0:
+            seen = []
+
+        else:
+            gseen.pop()
+            matching_long_chords_chunks.pop()
+
+      else:
+        gseen.pop()
+        matching_long_chords_chunks.pop()
+
+
+    if len(matching_long_chords_chunks) > max_song_len:
+      print('Current song length:', len(matching_long_chords_chunks), 'chords chunks')
+      print('=' * 70)
+      final_song = matching_long_chords_chunks
+
+    max_song_len = max(max_song_len, len(matching_long_chords_chunks))
+
+    tries += 1
+
+    if tries % 500 == 0:
+      print('Number of passed tries:', tries)
+      print('=' * 70)
+
     
     if len(matching_long_chords_chunks) > max_song_len:
       print(len(matching_long_chords_chunks))
@@ -339,8 +351,8 @@ if __name__ == "__main__":
 
         gr.Markdown("## Select generation options")
 
-        total_song_length_in_chords_chunks = gr.Slider(4, 10, value=8, step=1, label="Total song length in chords chunks")
-        chords_chunks_memory_length = gr.Slider(-1, 12, value=-1, step=1, label="Chords chunks memory length")
+        total_song_length_in_chords_chunks = gr.Slider(4, 60, value=30, step=1, label="Total song length in chords chunks")
+        chords_chunks_memory_ratio = gr.Slider(0, 1, value=-1, step=0.1, label="Chords chunks memory ratio")
         chord_time_step = gr.Slider(100, 1000, value=500, step=50, label="Chord time step")
         merge_chords_notes = gr.Slider(0, 4000, value=1000, step=100, label="Merged chords notes max time")
         melody_MIDI_patch_number = gr.Slider(0, 127, value=40, step=1, label="Melody MIDI patch number")
@@ -359,7 +371,7 @@ if __name__ == "__main__":
 
         run_event = run_btn.click(Generate_Chords_Progression, 
                                                               [total_song_length_in_chords_chunks,
-                                                                chords_chunks_memory_length,
+                                                                chords_chunks_memory_ratio,
                                                                 chord_time_step,
                                                                 merge_chords_notes,
                                                                 melody_MIDI_patch_number,