Update app.py

app.py

@@ -134,17 +134,28 @@ def match_loudness(audio_path, target_lufs=-14.0):
     adjusted.export(out_path, format="wav")
     return out_path
 
-# === Auto-EQ per Genre ===
+# === Auto-EQ per Genre – With New Genres Added ===
 def auto_eq(audio, genre="Pop"):
     eq_map = {
-        "Pop": [(200, 500, -3), (2000, 4000, +4)],
-        "EDM": [(60, 250, +6), (8000, 12000, +3)],
-        "Rock": [(1000, 3000, +4), (7000, 10000, -3)],
-        "Hip-Hop": [(20, 100, +6), (7000, 10000, -4)],
-        "Acoustic": [(100, 300, -3), (4000, 8000, +2)],
-        "Metal": [(100, 500, -4), (2000, 5000, +6), (7000, 12000, -3)],
-        "Trap": [(80, 120, +6), (3000, 6000, -4)],
-        "LoFi": [(20, 200, +3), (1000, 3000, -2)],
+        "Pop": [(200, 500, -3), (2000, 4000, +4)],  # Cut muddiness, boost vocals
+        "EDM": [(60, 250, +6), (8000, 12000, +3)],  # Maximize bass & sparkle
+        "Rock": [(1000, 3000, +4), (7000, 10000, -3)],  # Punchy mids, reduce sibilance
+        "Hip-Hop": [(20, 100, +6), (7000, 10000, -4)],  # Deep lows, smooth highs
+        "Acoustic": [(100, 300, -3), (4000, 8000, +2)],  # Natural tone
+        "Metal": [(100, 500, -4), (2000, 5000, +6), (7000, 12000, -3)],  # Clear low-mids, crisp highs
+        "Trap": [(80, 120, +6), (3000, 6000, -4)],  # Sub-bass boost, cut harsh highs
+        "LoFi": [(20, 200, +3), (1000, 3000, -2)],  # Warmth, soft mids
+        "Jazz": [(100, 400, +2), (1500, 3000, +1)],  # Smooth midrange
+        "Classical": [(200, 1000, +1), (3000, 6000, +2)],  # Balanced orchestral EQ
+        "Chillhop": [(50, 200, +3), (2000, 5000, +1)],  # Laid-back warmth
+        "Ambient": [(100, 500, +4), (6000, 12000, +2)],  # Spacey atmosphere
+        "Jazz Piano": [(100, 1000, +3), (2000, 5000, +2)],  # Rich piano tone
+        "Trap EDM": [(60, 120, +6), (2000, 5000, -3)],  # Heavy sub + clean highs
+        "Indie Rock": [(150, 400, +2), (2000, 5000, +3)],  # Crisp guitars
+        "Lo-Fi Jazz": [(80, 200, +3), (2000, 4000, +1)],  # Cozy jazz warmth
+        "R&B": [(100, 300, +4), (2000, 4000, +3)],  # Full vocals
+        "Soul": [(80, 200, +3), (1500, 3500, +4)],  # Emotive vocal clarity
+        "Funk": [(80, 200, +5), (1000, 3000, +3)],  # Tight low end
         "Default": []
     }
 
@@ -185,7 +196,7 @@ def ai_mastering_chain(audio_path, genre="Pop", target_lufs=-14.0):
     final_audio.export(out_path, format="wav")
     return out_path
 
-# === Harmonic Saturation / Exciter – Now Included Before Use ===
+# === Harmonic Saturation / Exciter – Now Defined Before Use ===
 def harmonic_saturation(audio, saturation_type="Tube", intensity=0.2):
     samples = np.array(audio.get_array_of_samples()).astype(np.float32)
 
@@ -335,7 +346,7 @@ def generate_session_log(audio_path, effects, isolate_vocals, export_format, gen
     }
     return json.dumps(log, indent=2)
 
-# === Load Presets ===
+# === Load Presets – With Missing Genres Added Back ===
 preset_choices = {
     "Default": [],
     "Clean Podcast": ["Noise Reduction", "Normalize"],
@@ -350,7 +361,18 @@ preset_choices = {
     "🎶 Singer's Harmony": ["Harmony", "Stereo Widening", "Pitch Shift"],
     "🌫 ASMR Vocal": ["Auto Gain", "Low-Pass Filter (3000Hz)", "Noise Gate"],
     "🎼 Stage Mode": ["Reverb", "Bass Boost", "Limiter"],
-    "🎵 Auto-Tune Style": ["Pitch Shift (+1 semitone)", "Normalize", "Treble Boost"]
+    "🎵 Auto-Tune Style": ["Pitch Shift (+1 semitone)", "Normalize", "Treble Boost"],
+    "🎷 Jazz Vocal": ["Bass Boost (-200-400Hz)", "Treble Boost (2000-4000Hz)", "Normalize"],
+    "🎹 Jazz Piano": ["Treble Boost (4000-6000Hz)", "Normalize", "Stereo Widening"],
+    "🎻 Classical Strings": ["Bass Boost (100-500Hz)", "Treble Boost (3000-6000Hz)", "Reverb"],
+    "☕ Chillhop": ["Noise Gate", "Treble Boost (-3000Hz)", "Reverb"],
+    "🌌 Ambient": ["Reverb", "Noise Gate", "Treble Boost (6000-12000Hz)"],
+    "🎤 R&B Vocal": ["Noise Reduction", "Bass Boost (100-300Hz)", "Treble Boost (2000-4000Hz)"],
+    "💃 Soul Vocal": ["Noise Reduction", "Bass Boost (80-200Hz)", "Treble Boost (1500-3500Hz)"],
+    "🕺 Funk Groove": ["Bass Boost (80-200Hz)", "Treble Boost (1000-3000Hz)", "Stereo Widening"],
+    "🎹 Jazz Piano Solo": ["Treble Boost (2000-5000Hz)", "Normalize", "Stage Mode"],
+    "🎶 Trap EDM": ["Bass Boost (60-120Hz)", "Treble Boost (2000-5000Hz)", "Limiter"],
+    "🎸 Indie Rock": ["Bass Boost (150-400Hz)", "Treble Boost (2000-5000Hz)", "Compress Dynamic Range"]
 }
 
 preset_names = list(preset_choices.keys())
@@ -391,7 +413,6 @@ def auto_tune_vocal(audio_path, target_key="C"):
 def visualize_spectrum(audio_path):
     y, sr = torchaudio.load(audio_path)
     y_np = y.numpy().flatten()
-    
     stft = librosa.stft(y_np)
     db = librosa.amplitude_to_db(abs(stft))
 
@@ -439,7 +460,10 @@ with gr.Blocks(title="AI Audio Studio", css="style.css") as demo:
             fn=ai_mastering_chain,
             inputs=[
                 gr.Audio(label="Upload Track", type="filepath"),
-                gr.Dropdown(choices=["Pop", "EDM", "Rock", "Hip-Hop", "Acoustic", "Metal", "Trap", "LoFi"], label="Genre", value="Pop"),
+                gr.Dropdown(choices=["Pop", "EDM", "Rock", "Hip-Hop", "Acoustic", "Metal", "Trap", "LoFi",
+                                 "Jazz", "Classical", "Chillhop", "Ambient", "Jazz Piano", "Trap EDM",
+                                 "Indie Rock", "Lo-Fi Jazz", "R&B", "Soul", "Funk"],
+                       label="Genre", value="Pop"),
                 gr.Slider(minimum=-24, maximum=-6, value=-14, label="Target LUFS")
             ],
             outputs=gr.Audio(label="Mastered Output", type="filepath"),
@@ -479,7 +503,7 @@ with gr.Blocks(title="AI Audio Studio", css="style.css") as demo:
             description="Enhance clarity and presence using saturation styles like Tube or Tape."
         )
 
-    # --- Vocal Doubler / Harmonizer ===
+    # --- Vocal Doubler / Harmonizer – Added ===
     with gr.Tab("🎧 Vocal Doubler / Harmonizer"):
         gr.Interface(
             fn=lambda x: apply_harmony(x),
@@ -562,7 +586,16 @@ with gr.Blocks(title="AI Audio Studio", css="style.css") as demo:
     def load_project(project_file):
         with open(project_file.name, "rb") as f:
             data = pickle.load(f)
-        return data["preset"], data["effects"]
+        return (
+            array_to_audiosegment(data["audio"], 44100),
+            array_to_audiosegment(data["audio"], 44100),
+            array_to_audiosegment(data["audio"], 44100),
+            array_to_audiosegment(data["audio"], 44100),
+            data["preset"],
+            data["effects"],
+            data["effects"],
+            data["effects"]
+        )
 
     with gr.Tab("📁 Save/Load Project"):
         gr.Interface(
@@ -574,14 +607,21 @@ with gr.Blocks(title="AI Audio Studio", css="style.css") as demo:
             ],
             outputs=gr.File(label="Project File (.aiproj)"),
             title="Save Everything Together",
-            description="Save your session, effects, and settings in one file to reuse later."
+            description="Save your session, effects, and settings in one file to reuse later.",
+            allow_flagging="never"
         )
 
         gr.Interface(
             fn=load_project,
             inputs=gr.File(label="Upload .aiproj File"),
             outputs=[
+                gr.File(label="Loaded Vocals"),
+                gr.File(label="Loaded Drums"),
+                gr.File(label="Loaded Bass"),
+                gr.File(label="Loaded Other"),
                 gr.Dropdown(choices=preset_names, label="Loaded Preset"),
+                gr.CheckboxGroup(choices=preset_choices["Default"], label="Loaded Effects"),
+                gr.CheckboxGroup(choices=preset_choices["Default"], label="Loaded Effects"),
                 gr.CheckboxGroup(choices=preset_choices["Default"], label="Loaded Effects")
             ],
             title="Resume Last Project",
@@ -599,16 +639,24 @@ with gr.Blocks(title="AI Audio Studio", css="style.css") as demo:
             ("images/acoustic_card.png", "Acoustic"),
             ("images/stage_mode_card.png", "Stage Mode"),
             ("images/vocal_distortion_card.png", "Vocal Distortion"),
-            ("images/tube_saturation_card.png", "Tube Saturation")
+            ("images/tube_saturation_card.png", "Tube Saturation"),
+            ("images/jazz_card.png", "Jazz"),
+            ("images/classical_card.png", "Classical"),
+            ("images/chillhop_card.png", "Chillhop"),
+            ("images/ambient_card.png", "Ambient"),
+            ("images/rnb_card.png", "R&B"),
+            ("images/soul_card.png", "Soul"),
+            ("images/funk_card.png", "Funk")
         ], label="Preset Cards", columns=4, height="auto")
 
         preset_name_out = gr.Dropdown(choices=preset_names, label="Selected Preset")
-        preset_effects_out = gr.CheckboxGroup(choices=list(preset_choices["Default"]), label="Effects")
+        preset_effects_out = gr.CheckboxGroup(choices=list(preset_choices.keys())[0:], label="Effects")
 
         def load_preset_by_card(evt: gr.SelectData):
             index = evt.index % len(preset_names)
             name = preset_names[index]
-            return name, preset_choices[name]
+            effects = preset_choices[name]
+            return name, effects
 
         preset_gallery.select(fn=load_preset_by_card, inputs=[], outputs=[preset_name_out, preset_effects_out])