Update app.py

app.py

@@ -15,7 +15,6 @@ OUTPUT_DIR = Path("nightpulse_output")
 TEMP_DIR = Path("temp_processing")
 
 def process_track(audio_file, cover_art_image):
-    # Initialize return variables
     zip_path = None
     video_path = None
 
@@ -29,19 +28,19 @@ def process_track(audio_file, cover_art_image):
             shutil.rmtree(OUTPUT_DIR)
         if TEMP_DIR.exists():
             shutil.rmtree(TEMP_DIR)
-        OUTPUT_DIR.mkdir(parents=True, exist_ok=True)
+        
+        # Create subfolders for organization
+        (OUTPUT_DIR / "Stems").mkdir(parents=True, exist_ok=True)
+        (OUTPUT_DIR / "Loops").mkdir(parents=True, exist_ok=True)
         TEMP_DIR.mkdir(parents=True, exist_ok=True)
         
         filename = Path(audio_file).stem
         
-        # --- 2. Analyze BPM & Key (Librosa) ---
+        # --- 2. Analyze BPM (Librosa) ---
         print(f"Analyzing {filename}...")
         try:
-            # Mono load for robust BPM detection
             y, sr = librosa.load(audio_file, duration=60, mono=True)
             tempo, _ = librosa.beat.beat_track(y=y, sr=sr)
-            
-            # Handle different librosa return types (float vs array)
             if np.ndim(tempo) > 0:
                 detected_bpm = int(round(tempo[0]))
             else:
@@ -49,12 +48,11 @@ def process_track(audio_file, cover_art_image):
             print(f"Detected BPM: {detected_bpm}")
         except Exception as e:
             print(f"BPM Warning: {e}")
-            detected_bpm = 120 # Safe Fallback
+            detected_bpm = 120 
         
         # --- 3. AI Stem Separation (Demucs) ---
         print("Separating stems...")
         try:
-            # Call Demucs via subprocess to ensure clean execution
             subprocess.run([
                 sys.executable, "-m", "demucs", 
                 "-n", "htdemucs", 
@@ -62,22 +60,27 @@ def process_track(audio_file, cover_art_image):
                 audio_file
             ], check=True, capture_output=True)
         except subprocess.CalledProcessError as e:
-            # Catch and display the specific error from Demucs
             raise RuntimeError(f"Demucs failed: {e.stderr.decode()}")
         
-        # Locate Stems (Robust Search)
         demucs_out = TEMP_DIR / "htdemucs"
-        # Demucs might normalize filenames (spaces -> underscores), so we find the first folder
         track_folder = next(demucs_out.iterdir(), None)
         
-        if not track_folder:
-             raise FileNotFoundError("Demucs output folder missing.")
+        if not track_folder: raise FileNotFoundError("Demucs output folder missing.")
 
+        # Map the raw stems
         drums_path = track_folder / "drums.wav"
         melody_path = track_folder / "other.wav"
         bass_path = track_folder / "bass.wav"
+        vocals_path = track_folder / "vocals.wav"
 
-        # --- 4. Loop Logic ---
+        # --- 4. EXPORT FULL STEMS (New Step) ---
+        # Copy the full length files to the Stems folder
+        if drums_path.exists(): shutil.copy(drums_path, OUTPUT_DIR / "Stems" / f"{detected_bpm}BPM_Full_Drums.wav")
+        if melody_path.exists(): shutil.copy(melody_path, OUTPUT_DIR / "Stems" / f"{detected_bpm}BPM_Full_Melody.wav")
+        if bass_path.exists(): shutil.copy(bass_path, OUTPUT_DIR / "Stems" / f"{detected_bpm}BPM_Full_Bass.wav")
+        if vocals_path.exists(): shutil.copy(vocals_path, OUTPUT_DIR / "Stems" / f"{detected_bpm}BPM_Full_Vocals.wav")
+
+        # --- 5. Loop Logic (The Chop) ---
         if detected_bpm <= 0: detected_bpm = 120
         ms_per_beat = (60 / detected_bpm) * 1000
         eight_bars_ms = ms_per_beat * 4 * 8
@@ -86,7 +89,6 @@ def process_track(audio_file, cover_art_image):
             if not source_path.exists(): return None, None
             
             audio = AudioSegment.from_wav(str(source_path))
-            # Grab middle 8 bars
             start = len(audio) // 3
             end = start + eight_bars_ms
             
@@ -95,7 +97,8 @@ def process_track(audio_file, cover_art_image):
                 end = min(len(audio), eight_bars_ms)
                 
             loop = audio[start:int(end)].fade_in(15).fade_out(15).normalize()
-            out_name = OUTPUT_DIR / f"{detected_bpm}BPM_{output_name}.wav"
+            # Save to Loops folder
+            out_name = OUTPUT_DIR / "Loops" / f"{detected_bpm}BPM_{output_name}.wav"
             loop.export(out_name, format="wav")
             return out_name, loop
 
@@ -103,15 +106,13 @@ def process_track(audio_file, cover_art_image):
         loop_melody, _ = create_loop(melody_path, "MelodyLoop")
         create_loop(bass_path, "BassLoop")
         
-        # --- 5. Video Generation ---
+        # --- 6. Video Generation ---
         if cover_art_image and loop_melody:
             print("Rendering Video...")
             try:
                 vid_out = OUTPUT_DIR / "Promo_Video.mp4"
                 audio_clip = AudioFileClip(str(loop_melody))
                 img_clip = ImageClip(cover_art_image)
-                
-                # Resize to 1080w (maintain aspect ratio)
                 img_clip = img_clip.resize(width=1080)
                 img_clip = img_clip.set_duration(audio_clip.duration)
                 img_clip = img_clip.set_audio(audio_clip)
@@ -122,11 +123,15 @@ def process_track(audio_file, cover_art_image):
             except Exception as e:
                 print(f"Video skipped: {e}")
 
-        # --- 6. Zip Export ---
+        # --- 7. Zip Export ---
         zip_file = "NightPulse_Pack.zip"
         with zipfile.ZipFile(zip_file, 'w') as zf:
-            for f in OUTPUT_DIR.iterdir():
-                zf.write(f, f.name)
+            for root, dirs, files in os.walk(OUTPUT_DIR):
+                for file in files:
+                    file_path = Path(root) / file
+                    # Create structure inside zip (Stems/file.wav, Loops/file.wav)
+                    arcname = file_path.relative_to(OUTPUT_DIR)
+                    zf.write(file_path, arcname)
         zip_path = zip_file
         
         return zip_path, video_path
@@ -142,11 +147,11 @@ iface = gr.Interface(
         gr.Image(type="filepath", label="Upload Cover Art")
     ],
     outputs=[
-        gr.File(label="Download ZIP"),
+        gr.File(label="Download Full Pack (ZIP)"),
         gr.Video(label="Preview Video")
     ],
     title="Night Pulse Audio | Automator",
-    description="Night Pulse Pipeline v1.2 (Stable)"
+    description="Night Pulse Pipeline v1.3 (Full Stems Included)"
 )
 
 if __name__ == "__main__":