Update app.py

app.py

@@ -47,59 +47,75 @@ def print_resource_usage(stage: str):
     print(f"GPU Memory Reserved: {torch.cuda.memory_reserved() / (1024**3):.2f} GB")
     print("---------------")
 
-# 4) GENRE PROMPT FUNCTIONS (Updated for consistency, more instruments, and popular styles)
-def set_rock_prompt():
-    return "Hard rock with dynamic electric guitars, heavy steady drums, deep groovy bass, subtle organ layers, and a hint of Red Hot Chili Peppers' funky rock energy, maintaining a cohesive structure throughout"
+# 4) GENRE PROMPT FUNCTIONS (Redesigned for better track generation)
+def set_classic_rock_prompt():
+    return "Classic rock with bluesy electric guitars, steady drums, groovy bass, Hammond organ fills, and a Led Zeppelin-inspired raw energy, maintaining a cohesive structure with dynamic solos and powerful choruses."
 
-def set_techno_prompt():
-    return "Techno with pulsing dark synths, driving basslines, fast rhythmic drums, atmospheric pads, and a Daft Punk-inspired house groove, keeping a consistent energetic flow"
+def set_alternative_rock_prompt():
+    return "Alternative rock with distorted guitar riffs, punchy drums, melodic basslines, atmospheric synths, and a Nirvana-inspired grunge vibe, featuring introspective verses and explosive choruses."
 
-def set_jazz_prompt():
-    return "Smooth jazz with warm saxophone leads, expressive piano chords, soft rhythmic drums, upright bass, and a Miles Davis-inspired improvisational feel, maintaining a cohesive smooth vibe"
+def set_detroit_techno_prompt():
+    return "Detroit techno with deep pulsing synths, driving basslines, crisp hi-hats, atmospheric pads, and a rhythmic groove inspired by Juan Atkins, maintaining a hypnotic and energetic flow."
 
-def set_classical_prompt():
-    return "Classical orchestral piece with gentle strings, expressive piano, subtle woodwinds, dramatic brass, and a Bach-inspired baroque structure, keeping a consistent classical flow"
+def set_deep_house_prompt():
+    return "Deep house with warm analog synth chords, soulful vocal chops, deep basslines, crisp hi-hats, and a laid-back groove inspired by Larry Heard, creating a consistent hypnotic vibe with smooth transitions."
+
+def set_smooth_jazz_prompt():
+    return "Smooth jazz with warm saxophone leads, expressive Rhodes piano chords, soft bossa nova drums, upright bass, and a George Benson-inspired improvisational feel, maintaining a cohesive and relaxing vibe."
+
+def set_bebop_jazz_prompt():
+    return "Bebop jazz with fast-paced saxophone solos, intricate piano runs, walking basslines, complex drum patterns, and a Charlie Parker-inspired improvisational style, featuring dynamic shifts and virtuosic performances."
+
+def set_baroque_classical_prompt():
+    return "Baroque classical with harpsichord, delicate violin, cello, flute, and a Vivaldi-inspired melodic structure, featuring intricate counterpoint and elegant ornamentation, maintaining a consistent baroque elegance."
+
+def set_romantic_classical_prompt():
+    return "Romantic classical with lush strings, expressive piano, dramatic brass, subtle woodwinds, and a Chopin-inspired melodic flow, building emotional intensity with sweeping crescendos and delicate pianissimos."
 
-def set_hiphop_prompt():
-    return "Hip-hop with groovy deep bass, tight crisp drums, funky synths, vinyl scratches, and a modern trap influence, maintaining a consistent rhythmic groove"
+def set_boom_bap_hiphop_prompt():
+    return "Boom bap hip-hop with gritty sampled drums, deep basslines, jazzy piano loops, vinyl scratches, and a J Dilla-inspired rhythmic groove, maintaining a consistent head-nodding vibe."
+
+def set_trap_hiphop_prompt():
+    return "Trap hip-hop with hard-hitting 808 bass, snappy snares, rapid hi-hats, eerie synth melodies, and a modern Atlanta-inspired sound, featuring catchy hooks and energetic drops."
 
 def set_pop_rock_prompt():
-    return "Pop rock with catchy electric guitar riffs, uplifting vocals synths, steady drums, melodic basslines, and a U2-inspired anthemic feel, keeping a consistent uplifting vibe"
+    return "Pop rock with catchy electric guitar riffs, uplifting synths, steady drums, melodic basslines, and a Coldplay-inspired anthemic feel, featuring bright intros and powerful choruses."
 
 def set_fusion_jazz_prompt():
-    return "Fusion jazz with electric piano, funky basslines, intricate drum patterns, soaring trumpet, and a Herbie Hancock-inspired groove, maintaining a consistent fusion energy"
+    return "Fusion jazz with electric piano, funky basslines, intricate drum patterns, soaring trumpet, and a Herbie Hancock-inspired groove, blending jazz improvisation with rock and funk elements."
 
-def set_baroque_classical_prompt():
-    return "Baroque classical with harpsichord, delicate violin, cello, flute, and a Vivaldi-inspired melodic structure, keeping a consistent baroque elegance"
+def set_edm_prompt():
+    return "EDM with high-energy synth leads, pounding basslines, four-on-the-floor kicks, euphoric breakdowns, and a festival-ready drop, inspired by artists like Avicii and Calvin Harris."
 
-def set_deep_house_prompt():
-    return "Deep house with warm synth chords, deep basslines, crisp hi-hats, soulful vocal chops, and a Carl Cox-inspired underground vibe, maintaining a consistent hypnotic groove"
+def set_indie_folk_prompt():
+    return "Indie folk with acoustic guitars, heartfelt vocals, gentle percussion, warm bass, and a Bon Iver-inspired intimate atmosphere, featuring layered harmonies and emotional crescendos."
 
-# 5) AUDIO PROCESSING FUNCTIONS
+# 5) AUDIO PROCESSING FUNCTIONS (Unchanged)
 def apply_chorus(segment):
-    # Enhanced chorus effect for richer sound
-    delayed = segment - 6  # Reduced gain to -6 dB for a subtler effect
+    delayed = segment - 6
     delayed = delayed.set_frame_rate(segment.frame_rate)
     return segment.overlay(delayed, position=20)
 
 def apply_eq(segment):
-    # Adjusted EQ for a more balanced sound
-    segment = segment.low_pass_filter(8000)  # Raised cutoff to 8kHz for brighter highs
-    segment = segment.high_pass_filter(80)  # Lowered cutoff to 80Hz for deeper bass
+    segment = segment.low_pass_filter(8000)
+    segment = segment.high_pass_filter(80)
     return segment
 
 def apply_limiter(segment, max_db=-3.0):
-    # Apply limiter with a higher threshold to preserve dynamics
     if segment.dBFS > max_db:
         segment = segment - (segment.dBFS - max_db)
     return segment
 
 def apply_final_gain(segment, target_db=-12.0):
-    # Add final gain adjustment for consistent loudness
     gain_adjustment = target_db - segment.dBFS
     return segment + gain_adjustment
 
-# 6) GENERATION & I/O FUNCTIONS
+def apply_fade(segment, fade_in_duration=2000, fade_out_duration=2000):
+    segment = segment.fade_in(fade_in_duration)
+    segment = segment.fade_out(fade_out_duration)
+    return segment
+
+# 6) GENERATION & I/O FUNCTIONS (Unchanged)
 def generate_music(instrumental_prompt: str, cfg_scale: float, top_k: int, top_p: float, temperature: float, total_duration: int, crossfade_duration: int):
     global musicgen_model
     if not instrumental_prompt.strip():
@@ -107,27 +123,22 @@ def generate_music(instrumental_prompt: str, cfg_scale: float, top_k: int, top_p
     try:
         start_time = time.time()
 
-        # Ensure total duration is within reasonable bounds (up to 90 seconds for longer tracks)
         total_duration = min(max(total_duration, 10), 90)
         chunk_duration = 15
-        # Use 2 chunks for durations up to 30 seconds, 3 chunks for longer durations
         num_chunks = 2 if total_duration <= 30 else 3
         chunk_duration = total_duration / num_chunks
 
-        # Generate slightly longer chunks for overlap
         overlap_duration = min(1.0, crossfade_duration / 1000.0)
         generation_duration = chunk_duration + overlap_duration
 
         audio_chunks = []
         sample_rate = musicgen_model.sample_rate
 
-        # Set a fixed seed for consistent generation across chunks
-        torch.manual_seed(42)  # Fixed seed for reproducibility
+        torch.manual_seed(42)
         np.random.seed(42)
 
-        # Generate audio in chunks with a consistent prompt
         for i in range(num_chunks):
-            chunk_prompt = instrumental_prompt  # Use the same prompt for all chunks
+            chunk_prompt = instrumental_prompt
             print(f"Generating chunk {i+1}/{num_chunks} on GPU (prompt: {chunk_prompt})...")
             musicgen_model.set_generation_params(
                 duration=generation_duration,
@@ -171,18 +182,15 @@ def generate_music(instrumental_prompt: str, cfg_scale: float, top_k: int, top_p
             time.sleep(0.5)
             print_resource_usage(f"After Chunk {i+1} Generation")
 
-        # Combine chunks with crossfade
         print("Combining audio chunks...")
         final_segment = AudioSegment.from_mp3(audio_chunks[0])
         for i in range(1, len(audio_chunks)):
             next_segment = AudioSegment.from_mp3(audio_chunks[i])
-            next_segment = next_segment + 1  # Reduced gain boost to +1 dB
+            next_segment = next_segment + 1
             final_segment = final_segment.append(next_segment, crossfade=crossfade_duration)
 
-        # Trim to exact total duration
         final_segment = final_segment[:total_duration * 1000]
 
-        # Post-process with improved dynamics
         print("Post-processing final track...")
         final_segment = apply_eq(final_segment)
         final_segment = apply_chorus(final_segment)
@@ -361,15 +369,20 @@ with gr.Blocks(css=css) as demo:
             elem_classes="textbox"
         )
         with gr.Row(elem_classes="genre-buttons"):
-            rock_btn = gr.Button("Rock", elem_classes="genre-btn")
-            techno_btn = gr.Button("Techno", elem_classes="genre-btn")
-            jazz_btn = gr.Button("Jazz", elem_classes="genre-btn")
-            classical_btn = gr.Button("Classical", elem_classes="genre-btn")
-            hiphop_btn = gr.Button("Hip-Hop", elem_classes="genre-btn")
+            classic_rock_btn = gr.Button("Classic Rock", elem_classes="genre-btn")
+            alternative_rock_btn = gr.Button("Alternative Rock", elem_classes="genre-btn")
+            detroit_techno_btn = gr.Button("Detroit Techno", elem_classes="genre-btn")
+            deep_house_btn = gr.Button("Deep House", elem_classes="genre-btn")
+            smooth_jazz_btn = gr.Button("Smooth Jazz", elem_classes="genre-btn")
+            bebop_jazz_btn = gr.Button("Bebop Jazz", elem_classes="genre-btn")
+            baroque_classical_btn = gr.Button("Baroque Classical", elem_classes="genre-btn")
+            romantic_classical_btn = gr.Button("Romantic Classical", elem_classes="genre-btn")
+            boom_bap_hiphop_btn = gr.Button("Boom Bap Hip-Hop", elem_classes="genre-btn")
+            trap_hiphop_btn = gr.Button("Trap Hip-Hop", elem_classes="genre-btn")
             pop_rock_btn = gr.Button("Pop Rock", elem_classes="genre-btn")
             fusion_jazz_btn = gr.Button("Fusion Jazz", elem_classes="genre-btn")
-            baroque_btn = gr.Button("Baroque Classical", elem_classes="genre-btn")
-            deep_house_btn = gr.Button("Deep House", elem_classes="genre-btn")
+            edm_btn = gr.Button("EDM", elem_classes="genre-btn")
+            indie_folk_btn = gr.Button("Indie Folk", elem_classes="genre-btn")
     
     with gr.Column(elem_classes="settings-container"):
         cfg_scale = gr.Slider(
@@ -428,15 +441,20 @@ with gr.Blocks(css=css) as demo:
         out_audio = gr.Audio(label="Generated Stereo Instrumental Track", type="filepath")
         status = gr.Textbox(label="Status", interactive=False)
     
-    rock_btn.click(set_rock_prompt, inputs=None, outputs=[instrumental_prompt])
-    techno_btn.click(set_techno_prompt, inputs=None, outputs=[instrumental_prompt])
-    jazz_btn.click(set_jazz_prompt, inputs=None, outputs=[instrumental_prompt])
-    classical_btn.click(set_classical_prompt, inputs=None, outputs=[instrumental_prompt])
-    hiphop_btn.click(set_hiphop_prompt, inputs=None, outputs=[instrumental_prompt])
+    classic_rock_btn.click(set_classic_rock_prompt, inputs=None, outputs=[instrumental_prompt])
+    alternative_rock_btn.click(set_alternative_rock_prompt, inputs=None, outputs=[instrumental_prompt])
+    detroit_techno_btn.click(set_detroit_techno_prompt, inputs=None, outputs=[instrumental_prompt])
+    deep_house_btn.click(set_deep_house_prompt, inputs=None, outputs=[instrumental_prompt])
+    smooth_jazz_btn.click(set_smooth_jazz_prompt, inputs=None, outputs=[instrumental_prompt])
+    bebop_jazz_btn.click(set_bebop_jazz_prompt, inputs=None, outputs=[instrumental_prompt])
+    baroque_classical_btn.click(set_baroque_classical_prompt, inputs=None, outputs=[instrumental_prompt])
+    romantic_classical_btn.click(set_romantic_classical_prompt, inputs=None, outputs=[instrumental_prompt])
+    boom_bap_hiphop_btn.click(set_boom_bap_hiphop_prompt, inputs=None, outputs=[instrumental_prompt])
+    trap_hiphop_btn.click(set_trap_hiphop_prompt, inputs=None, outputs=[instrumental_prompt])
     pop_rock_btn.click(set_pop_rock_prompt, inputs=None, outputs=[instrumental_prompt])
     fusion_jazz_btn.click(set_fusion_jazz_prompt, inputs=None, outputs=[instrumental_prompt])
-    baroque_btn.click(set_baroque_classical_prompt, inputs=None, outputs=[instrumental_prompt])
-    deep_house_btn.click(set_deep_house_prompt, inputs=None, outputs=[instrumental_prompt])
+    edm_btn.click(set_edm_prompt, inputs=None, outputs=[instrumental_prompt])
+    indie_folk_btn.click(set_indie_folk_prompt, inputs=None, outputs=[instrumental_prompt])
     gen_btn.click(
         generate_music,
         inputs=[instrumental_prompt, cfg_scale, top_k, top_p, temperature, total_duration, crossfade_duration],