Fix version mismatch - sdk 4.44.0, huggingface_hub 0.21.4

README.md

@@ -1,36 +1,18 @@
 ---
-title: VYNL Complete
-emoji: '🎸'
-colorFrom: orange
-colorTo: amber
+title: VYNL Backend
+emoji: '🔧'
+colorFrom: gray
+colorTo: gray
 sdk: gradio
 sdk_version: 4.44.0
 app_file: app.py
-pinned: true
+pinned: false
 license: mit
+hardware: zero-a10g
+private: true
 ---
 
-# VYNL - Complete Music Analysis
+# VYNL Backend (Private)
 
-**From raw demo to DAW-ready - in one click**
+Backend processing server for VYNL public demo.
 
-Created by R.T. Lackey | Stone and Lantern Music Group
-
-## Features
-
-- **PROCESS**: Single song stem separation, chord detection, DAW export
-- **BULK**: Batch processing for YouTube playlists and local files
-- **GROOVES**: AI music generation
-- **SESSIONS**: Live mixer, setlist creator, karaoke teleprompter
-- **TRAINING**: Model training pipeline (Creator only)
-
-## License Required
-
-Enter your VYNL license key to access all features.
-
-## Desktop App
-
-For unlimited offline processing, get the Desktop App:
-- Windows, Mac, Linux supported
-- $79 lifetime license
-- Contact: rlackey.seattle@gmail.com

app.py

@@ -20,6 +20,20 @@ from pathlib import Path
 from datetime import datetime
 import subprocess
 
+# ZeroGPU support
+try:
+    import spaces
+    HAS_ZEROGPU = True
+except ImportError:
+    HAS_ZEROGPU = False
+    # Dummy decorator
+    class spaces:
+        @staticmethod
+        def GPU(duration=60):
+            def decorator(func):
+                return func
+            return decorator
+
 # Import token system
 from token_system import (
     user_manager, check_can_process, deduct_token,
@@ -44,550 +58,265 @@ except ImportError:
     HAS_YTDLP = False
 
 # ============================================================================
-# RAINBOW VINYL + 1970s STUDIO CSS
+# SLIMMED DOWN CSS - Rainbow Vinyl Theme
 # ============================================================================
 
 RAINBOW_CSS = """
-/* ============================================
-   VYNL RAINBOW VINYL + VINTAGE STUDIO THEME
-   "1970s studio visited by a rainbow alien"
-   ============================================ */
-
 :root {
-    /* Base - Studio Hardware */
     --deep-black: #1A1A1A;
     --studio-panel: #2E2520;
     --warm-walnut: #4A3728;
     --cream-text: #F5E6D3;
-
-    /* Rainbow Vinyl Energy */
     --neon-cyan: #00F5FF;
     --neon-magenta: #FF00FF;
-    --electric-yellow: #FFFF00;
+    --neon-yellow: #FFFF00;
     --neon-green: #7CFF00;
-    --coral-orange: #FF6B4A;
-    --glowing-ring: #FF8C42;
-
-    /* Gradients */
-    --rainbow-gradient: linear-gradient(45deg, #00F5FF, #FF00FF, #FFFF00, #7CFF00);
-    --rainbow-horizontal: linear-gradient(90deg, #00F5FF, #FF00FF, #FFFF00);
-    --coral-gradient: linear-gradient(135deg, #FF6B4A, #FFB74D);
+    --coral: #FF6B4A;
+    --copper: #B87333;
 }
 
-/* Main container - Dark studio with particles */
 .gradio-container {
-    background:
-        radial-gradient(circle at 20% 30%, rgba(0,245,255,0.08), transparent 40%),
-        radial-gradient(circle at 80% 70%, rgba(255,0,255,0.08), transparent 40%),
-        radial-gradient(circle at 50% 50%, rgba(255,255,0,0.05), transparent 50%),
-        linear-gradient(180deg, #1A1A1A 0%, #2E2520 50%, #1A1A1A 100%) !important;
-    min-height: 100vh;
-    font-family: 'Segoe UI', 'Helvetica Neue', sans-serif !important;
+    background: linear-gradient(180deg, #1A1A1A 0%, #2E2520 50%, #1A1A1A 100%) !important;
+    max-width: 1200px !important;
 }
 
-/* Floating particles animation */
-@keyframes float-particles {
-    0%, 100% { transform: translateY(0) rotate(0deg); opacity: 0.6; }
-    50% { transform: translateY(-20px) rotate(180deg); opacity: 1; }
-}
-
-/* Header with rainbow vinyl */
+/* Compact header */
 .main-header {
-    background: linear-gradient(180deg, rgba(46,37,32,0.95) 0%, rgba(26,26,26,0.98) 100%);
-    border-bottom: 3px solid transparent;
+    background: linear-gradient(180deg, rgba(46,37,32,0.95), rgba(26,26,26,0.98));
+    border-bottom: 2px solid;
     border-image: linear-gradient(90deg, #00F5FF, #FF00FF, #FFFF00, #7CFF00) 1;
-    padding: 30px;
+    padding: 12px 20px;
     text-align: center;
-    position: relative;
-    overflow: hidden;
-}
-
-.main-header::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background:
-        radial-gradient(circle at 30% 50%, rgba(0,245,255,0.1), transparent),
-        radial-gradient(circle at 70% 50%, rgba(255,0,255,0.1), transparent);
-    pointer-events: none;
-}
-
-/* Rainbow vinyl logo animation */
-.vinyl-logo {
-    width: 120px;
-    height: 120px;
-    border-radius: 50%;
-    background: conic-gradient(from 0deg, #00F5FF, #FF00FF, #FFFF00, #7CFF00, #00F5FF);
-    animation: spin-vinyl 8s linear infinite;
-    box-shadow:
-        0 0 30px rgba(0,245,255,0.5),
-        0 0 60px rgba(255,0,255,0.3),
-        inset 0 0 30px rgba(0,0,0,0.5);
-    margin: 0 auto 20px;
-    position: relative;
-}
-
-.vinyl-logo::after {
-    content: '';
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 30px;
-    height: 30px;
-    background: #1A1A1A;
-    border-radius: 50%;
-    transform: translate(-50%, -50%);
-    box-shadow: inset 0 0 10px rgba(255,140,66,0.5);
-}
-
-@keyframes spin-vinyl {
-    from { transform: rotate(0deg); }
-    to { transform: rotate(360deg); }
+    margin-bottom: 8px;
 }
 
 .logo-text {
     font-family: 'Courier New', monospace;
-    font-size: 4em;
+    font-size: 2.2em;
     font-weight: 900;
     background: linear-gradient(90deg, #00F5FF, #FF00FF, #FFFF00, #7CFF00);
     -webkit-background-clip: text;
     -webkit-text-fill-color: transparent;
-    text-shadow: none;
-    letter-spacing: 0.3em;
+    letter-spacing: 0.2em;
     margin: 0;
-    filter: drop-shadow(0 0 20px rgba(0,245,255,0.5));
 }
 
 .tagline {
     color: var(--cream-text);
-    font-size: 1.1em;
-    letter-spacing: 0.2em;
-    margin-top: 10px;
-    opacity: 0.8;
+    font-size: 0.85em;
+    opacity: 0.7;
+    margin-top: 2px;
 }
 
-/* User status bar */
+/* Status bar - compact */
 .status-bar {
-    background: linear-gradient(90deg, rgba(0,245,255,0.1), rgba(255,0,255,0.1), rgba(255,255,0,0.1));
+    background: rgba(0,245,255,0.1);
     border: 1px solid rgba(0,245,255,0.3);
-    border-radius: 25px;
-    padding: 10px 25px;
-    margin: 20px auto;
-    max-width: 600px;
-    text-align: center;
-}
-
-.status-bar .tokens {
-    color: var(--neon-cyan);
-    font-weight: bold;
-    font-size: 1.1em;
-}
-
-.status-bar .demo-badge {
-    background: var(--coral-gradient);
-    color: white;
-    padding: 3px 12px;
-    border-radius: 15px;
-    font-size: 0.85em;
-    margin-left: 10px;
-}
-
-.status-bar .licensed-badge {
-    background: linear-gradient(90deg, var(--neon-green), var(--neon-cyan));
-    color: #1A1A1A;
-    padding: 3px 12px;
-    border-radius: 15px;
-    font-size: 0.85em;
-    margin-left: 10px;
-    font-weight: bold;
-}
-
-/* Login/Register panel */
-.auth-panel {
-    background: rgba(46,37,32,0.8);
-    border: 2px solid var(--warm-walnut);
-    border-radius: 15px;
-    padding: 25px;
-    margin: 20px auto;
+    border-radius: 20px;
+    padding: 6px 16px;
+    margin: 8px auto;
     max-width: 500px;
-    box-shadow: 0 0 30px rgba(0,0,0,0.5);
-}
-
-/* Tab styling - Rainbow accent */
-.tab-nav {
-    background: var(--studio-panel) !important;
-    border: none !important;
-    border-radius: 15px 15px 0 0 !important;
-    padding: 10px !important;
-    border-bottom: 2px solid var(--warm-walnut) !important;
+    text-align: center;
+    font-size: 0.9em;
+    color: var(--cream-text);
 }
 
+/* Tabs */
 .tab-nav button {
-    background: transparent !important;
-    border: 2px solid transparent !important;
-    border-radius: 10px !important;
+    background: var(--studio-panel) !important;
     color: var(--cream-text) !important;
-    font-weight: 600 !important;
-    letter-spacing: 0.1em !important;
-    padding: 12px 24px !important;
-    margin: 3px !important;
-    transition: all 0.3s ease !important;
+    border: 1px solid var(--warm-walnut) !important;
+    padding: 8px 16px !important;
+    font-size: 0.9em !important;
 }
-
-.tab-nav button:hover {
-    background: rgba(0,245,255,0.1) !important;
-    border-color: var(--neon-cyan) !important;
-}
-
 .tab-nav button.selected {
-    background: linear-gradient(135deg, rgba(0,245,255,0.2), rgba(255,0,255,0.2)) !important;
-    border-color: var(--neon-magenta) !important;
-    box-shadow: 0 0 20px rgba(255,0,255,0.3) !important;
-    color: white !important;
-}
-
-/* Panel styling - Wood with rainbow accents */
-.panel, .gr-panel, .gr-box {
-    background: linear-gradient(135deg, #2E2520 0%, #3D3028 50%, #2E2520 100%) !important;
-    border: 2px solid var(--warm-walnut) !important;
-    border-radius: 12px !important;
-    box-shadow:
-        inset 0 1px 0 rgba(255,255,255,0.05),
-        0 4px 20px rgba(0,0,0,0.4) !important;
-    padding: 20px !important;
-    margin: 10px 0 !important;
+    background: var(--coral) !important;
+    border-color: var(--coral) !important;
 }
 
-/* Input fields - Dark with neon focus */
-input[type="text"], input[type="email"], input[type="password"], textarea, select {
-    background: #1A1A1A !important;
-    border: 2px solid var(--warm-walnut) !important;
+/* Inputs */
+input, textarea, select {
+    background: var(--deep-black) !important;
+    border: 1px solid var(--warm-walnut) !important;
     color: var(--cream-text) !important;
-    border-radius: 8px !important;
-    padding: 12px !important;
-    transition: all 0.3s ease !important;
+    border-radius: 6px !important;
 }
-
-input:focus, textarea:focus, select:focus {
+input:focus, textarea:focus {
     border-color: var(--neon-cyan) !important;
-    box-shadow: 0 0 15px rgba(0,245,255,0.3) !important;
-    outline: none !important;
-}
-
-/* Labels - Cream with subtle glow */
-label, .label-wrap {
-    color: var(--cream-text) !important;
-    font-weight: 600 !important;
-    letter-spacing: 0.05em !important;
 }
 
-/* Primary buttons - Coral orange gradient */
-button.primary, .primary-btn {
-    background: var(--coral-gradient) !important;
+/* Buttons */
+button.primary {
+    background: var(--coral) !important;
     border: none !important;
-    color: white !important;
-    font-weight: bold !important;
-    font-size: 1.1em !important;
-    letter-spacing: 0.1em !important;
-    padding: 15px 35px !important;
-    border-radius: 25px !important;
-    box-shadow: 0 0 25px rgba(255,107,74,0.5) !important;
-    transition: all 0.3s ease !important;
-    cursor: pointer !important;
-}
-
-button.primary:hover, .primary-btn:hover {
-    box-shadow: 0 0 40px rgba(255,107,74,0.8) !important;
-    transform: translateY(-2px) !important;
-}
-
-button.primary:active {
-    transform: translateY(0) !important;
-}
-
-/* Secondary buttons */
-button.secondary, .secondary-btn {
-    background: rgba(74,55,40,0.8) !important;
-    border: 2px solid var(--warm-walnut) !important;
-    color: var(--cream-text) !important;
-    border-radius: 20px !important;
-    padding: 10px 25px !important;
-}
-
-button.secondary:hover {
-    border-color: var(--neon-cyan) !important;
-    box-shadow: 0 0 15px rgba(0,245,255,0.3) !important;
-}
-
-/* Rainbow progress bar */
-.rainbow-progress {
-    background: var(--studio-panel);
-    border-radius: 20px;
-    overflow: hidden;
-    height: 35px;
-    box-shadow: inset 0 2px 5px rgba(0,0,0,0.3);
-    margin: 15px 0;
-}
-
-.rainbow-progress .bar {
-    height: 100%;
-    background: linear-gradient(90deg, #00F5FF, #FF00FF, #FFFF00);
-    border-radius: 20px;
-    transition: width 0.3s ease;
-    box-shadow: 0 0 20px rgba(255,0,255,0.5);
-}
-
-/* VU Meter styling */
-.vu-meter {
-    background: linear-gradient(90deg,
-        var(--neon-green) 0%,
-        var(--neon-green) 60%,
-        var(--electric-yellow) 60%,
-        var(--electric-yellow) 80%,
-        var(--neon-magenta) 80%,
-        var(--neon-magenta) 100%
-    );
-    height: 12px;
-    border-radius: 6px;
-    box-shadow: 0 0 10px rgba(124,255,0,0.5);
-}
-
-/* Neon LED indicators */
-.neon-led {
-    display: inline-block;
-    width: 12px;
-    height: 12px;
-    border-radius: 50%;
-    margin-right: 8px;
-}
-
-.neon-led.cyan {
-    background: var(--neon-cyan);
-    box-shadow: 0 0 10px var(--neon-cyan);
-}
-.neon-led.magenta {
-    background: var(--neon-magenta);
-    box-shadow: 0 0 10px var(--neon-magenta);
-}
-.neon-led.green {
-    background: var(--neon-green);
-    box-shadow: 0 0 10px var(--neon-green);
-}
-.neon-led.yellow {
-    background: var(--electric-yellow);
-    box-shadow: 0 0 10px var(--electric-yellow);
-}
-.neon-led.gray {
-    background: #555;
-    box-shadow: none;
-}
-
-/* Audio player */
-audio {
-    border-radius: 10px !important;
-    background: var(--deep-black) !important;
 }
-
-/* File upload - Dark with rainbow border on hover */
-.upload-zone {
-    background: var(--deep-black) !important;
-    border: 2px dashed var(--warm-walnut) !important;
-    border-radius: 12px !important;
-    transition: all 0.3s ease !important;
+button.secondary {
+    background: var(--warm-walnut) !important;
+    border: 1px solid var(--copper) !important;
 }
 
-.upload-zone:hover {
-    border-color: var(--neon-cyan) !important;
-    box-shadow: 0 0 20px rgba(0,245,255,0.2) !important;
+/* Panels */
+.gr-box, .gr-panel {
+    background: var(--studio-panel) !important;
+    border: 1px solid var(--warm-walnut) !important;
+    border-radius: 8px !important;
 }
 
-/* Slider with rainbow accent */
-input[type="range"] {
-    accent-color: var(--neon-magenta) !important;
-}
+/* Labels */
+label { color: var(--cream-text) !important; font-size: 0.9em !important; }
 
 /* Mixer faders */
-.fader-channel {
-    background: linear-gradient(180deg, var(--warm-walnut), var(--studio-panel));
-    border-radius: 8px;
-    padding: 15px 10px;
-    text-align: center;
-    border: 1px solid rgba(0,245,255,0.2);
+.fader-wrap {
+    display: flex; gap: 8px; justify-content: center;
+    background: var(--deep-black); padding: 15px; border-radius: 8px;
 }
-
-.fader-label {
-    color: var(--cream-text);
-    font-size: 0.85em;
-    font-weight: bold;
-    margin-top: 10px;
-}
-
-/* Chord display */
-.chord-box {
-    background: var(--studio-panel);
-    border: 2px solid var(--warm-walnut);
-    border-radius: 10px;
-    padding: 15px 20px;
-    margin: 5px;
-    text-align: center;
-    transition: all 0.3s ease;
-}
-
-.chord-box.active {
-    border-color: var(--neon-cyan);
-    box-shadow: 0 0 20px rgba(0,245,255,0.5);
-    background: rgba(0,245,255,0.1);
-}
-
-.chord-name {
-    font-size: 1.8em;
-    font-weight: bold;
-    color: var(--cream-text);
+.fader-ch {
+    text-align: center; padding: 8px;
+    background: var(--studio-panel); border-radius: 6px;
+    border: 1px solid var(--warm-walnut);
 }
+.fader-ch input[type="range"] { width: 40px; height: 100px; }
+.fader-lbl { color: var(--cream-text); font-size: 0.75em; margin-top: 4px; }
 
 /* Teleprompter */
-.teleprompter {
-    background: #0A0A0A;
-    border: 3px solid var(--neon-magenta);
-    border-radius: 15px;
-    padding: 40px;
-    min-height: 400px;
-    box-shadow: 0 0 30px rgba(255,0,255,0.3);
-}
-
-.teleprompter-line {
-    font-family: 'Courier New', monospace;
-    font-size: 1.6em;
-    line-height: 2;
-    color: var(--cream-text);
-    transition: all 0.3s ease;
-}
-
-.teleprompter-line.current {
-    font-size: 2.2em;
-    color: var(--neon-cyan);
-    text-shadow: 0 0 20px rgba(0,245,255,0.8);
-}
-
-.teleprompter-chord {
-    color: var(--neon-magenta);
-    font-weight: bold;
-    margin-right: 15px;
-}
-
-/* Desktop download cards */
-.download-card {
-    background: linear-gradient(180deg, var(--warm-walnut), var(--studio-panel));
-    border: 2px solid var(--warm-walnut);
-    border-radius: 15px;
-    padding: 30px;
-    text-align: center;
-    transition: all 0.3s ease;
-}
-
-.download-card:hover {
-    border-color: var(--neon-cyan);
-    box-shadow: 0 0 25px rgba(0,245,255,0.3);
-    transform: translateY(-5px);
-}
-
-.download-card h3 {
-    color: var(--cream-text);
-    margin: 15px 0;
-}
-
-.download-card .icon {
-    font-size: 3em;
-}
-
-.download-btn {
-    display: inline-block;
-    background: var(--coral-gradient);
-    color: white;
-    padding: 12px 25px;
-    border-radius: 20px;
-    text-decoration: none;
-    font-weight: bold;
-    margin-top: 15px;
-    border: none;
-    cursor: pointer;
+.teleprompter-box {
+    background: #0A0A0A; border: 2px solid var(--neon-magenta);
+    border-radius: 10px; padding: 20px; min-height: 200px;
 }
+.tele-line { font-family: monospace; font-size: 1.1em; line-height: 1.8; color: var(--cream-text); opacity: 0.5; }
+.tele-line.current { font-size: 1.4em; color: var(--neon-cyan); opacity: 1; }
+.tele-chord { color: var(--neon-magenta); font-weight: bold; margin-right: 10px; }
 
 /* Footer */
-.footer {
-    text-align: center;
-    padding: 30px;
-    margin-top: 40px;
-    border-top: 2px solid var(--warm-walnut);
-    color: var(--cream-text);
-    opacity: 0.8;
-}
+.footer { text-align: center; padding: 15px; color: var(--cream-text); opacity: 0.6; font-size: 0.85em; }
+"""
 
-.footer a {
-    color: var(--neon-cyan);
-    text-decoration: none;
-}
+# ============================================================================
+# SESSION STORAGE (in-memory for demo, persisted in real deployment)
+# ============================================================================
 
-/* Scrollbar */
-::-webkit-scrollbar {
-    width: 10px;
-    height: 10px;
-}
-::-webkit-scrollbar-track {
-    background: var(--deep-black);
-}
-::-webkit-scrollbar-thumb {
-    background: linear-gradient(180deg, var(--neon-cyan), var(--neon-magenta));
-    border-radius: 5px;
-}
+session_library = []  # List of dicts: {title, artist, key, bpm, duration, file_path}
+session_setlist = []  # List of song titles in order
 
-/* Animations */
-@keyframes pulse-glow {
-    0%, 100% { box-shadow: 0 0 20px rgba(255,107,74,0.5); }
-    50% { box-shadow: 0 0 40px rgba(255,107,74,0.8); }
-}
+# ============================================================================
+# YOUTUBE DOWNLOAD & ANALYSIS
+# ============================================================================
 
-.processing .vinyl-logo {
-    animation: spin-vinyl 2s linear infinite;
-}
+def download_youtube_audio(url):
+    """Download audio from YouTube URL"""
+    if not HAS_YTDLP:
+        return None, "yt-dlp not installed"
 
-/* Responsive */
-@media (max-width: 768px) {
-    .logo-text { font-size: 2.5em; }
-    .vinyl-logo { width: 80px; height: 80px; }
-    .tab-nav button { padding: 8px 12px !important; font-size: 0.85em !important; }
-}
-"""
+    try:
+        temp_dir = tempfile.mkdtemp(prefix="vynl_yt_")
+        ydl_opts = {
+            'format': 'bestaudio/best',
+            'postprocessors': [{
+                'key': 'FFmpegExtractAudio',
+                'preferredcodec': 'mp3',
+                'preferredquality': '192',
+            }],
+            'outtmpl': f'{temp_dir}/%(title)s.%(ext)s',
+            'quiet': True,
+        }
+
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            info = ydl.extract_info(url, download=True)
+            title = info.get('title', 'Unknown')
+
+            # Find the mp3 file
+            for f in Path(temp_dir).glob('*.mp3'):
+                return str(f), title
+
+        return None, "Download failed"
+    except Exception as e:
+        return None, str(e)
+
+def get_playlist_videos(url):
+    """Get videos from YouTube playlist"""
+    if not HAS_YTDLP:
+        return [], "yt-dlp not installed"
+    try:
+        ydl_opts = {'quiet': True, 'extract_flat': True}
+        with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+            info = ydl.extract_info(url, download=False)
+            videos = []
+            if 'entries' in info:
+                for entry in info['entries']:
+                    if entry:
+                        videos.append({
+                            'title': entry.get('title', 'Unknown'),
+                            'url': entry.get('url') or f"https://youtube.com/watch?v={entry.get('id')}"
+                        })
+            return videos, None
+    except Exception as e:
+        return [], str(e)
 
 # ============================================================================
-# PROCESSING FUNCTIONS WITH TOKEN SYSTEM
+# AUDIO ANALYSIS
 # ============================================================================
 
 def get_audio_duration(audio_path):
     """Get audio duration in seconds"""
     if HAS_LIBROSA:
         try:
-            y, sr = librosa.load(audio_path, sr=None, duration=1)
             return librosa.get_duration(path=audio_path)
         except:
             pass
-    return 180  # Default estimate
+    return 180
+
+def analyze_audio_full(audio_path):
+    """Full audio analysis - tempo, key, duration"""
+    if not HAS_LIBROSA:
+        return {'tempo': 120, 'key': 'C', 'duration': 0, 'error': 'librosa not installed'}
+
+    try:
+        y, sr = librosa.load(audio_path, sr=22050, duration=120)
+
+        # Tempo
+        tempo, _ = librosa.beat.beat_track(y=y, sr=sr)
+        if hasattr(tempo, '__iter__'):
+            tempo = float(tempo[0])
+
+        # Key
+        chroma = librosa.feature.chroma_cqt(y=y, sr=sr)
+        notes = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B']
+        key_idx = int(np.argmax(np.mean(chroma, axis=1)))
+        key = notes[key_idx]
+
+        # Duration
+        duration = librosa.get_duration(y=y, sr=sr)
+
+        return {'tempo': round(tempo), 'key': key, 'duration': round(duration, 1)}
+    except Exception as e:
+        return {'tempo': 120, 'key': 'C', 'duration': 0, 'error': str(e)}
+
+# ============================================================================
+# PROCESSING FUNCTIONS
+# ============================================================================
+
+@spaces.GPU(duration=120)
+def process_song(audio_file, youtube_url, song_name, lyrics, do_stems, do_chords, do_daw, user_email, progress=gr.Progress()):
+    """Process a single song - from file or YouTube URL (GPU accelerated)"""
 
-def process_song(audio_file, song_name, do_stems, do_chords, do_daw, user_email, progress=gr.Progress()):
-    """Process a single song with token deduction"""
+    # Determine source
+    if youtube_url and youtube_url.strip():
+        progress(0.1, desc="Downloading from YouTube...")
+        audio_file, title = download_youtube_audio(youtube_url.strip())
+        if not audio_file:
+            return f"YouTube download failed: {title}", None, get_status_display(user_email)
+        if not song_name:
+            song_name = title
 
     if not audio_file:
-        return "Please upload an audio file", "", None, get_status_display(user_email)
+        return "Please upload an audio file or enter a YouTube URL", None, get_status_display(user_email)
 
     # Check duration limit
     duration = get_audio_duration(audio_file)
     can_process, msg, status = check_can_process(user_email, duration)
 
     if not can_process:
-        return msg, "", None, get_status_display(user_email)
+        return msg, None, get_status_display(user_email)
 
     if not song_name:
         song_name = Path(audio_file).stem
@@ -595,80 +324,81 @@ def process_song(audio_file, song_name, do_stems, do_chords, do_daw, user_email,
     # Deduct token
     ok, token_msg = deduct_token(user_email)
     if not ok:
-        return token_msg, "", None, get_status_display(user_email)
-
-    status_log = []
-    status_log.append(f"VYNL Processing: {song_name}")
-    status_log.append(f"Duration: {duration:.1f}s")
-    status_log.append(token_msg)
-    status_log.append("=" * 50)
+        return token_msg, None, get_status_display(user_email)
 
+    log = [f"Processing: {song_name}", f"Duration: {duration:.1f}s", token_msg, "=" * 40]
     output_files = []
     temp_dir = tempfile.mkdtemp(prefix="vynl_")
     output_path = Path(temp_dir)
 
     try:
+        # Analysis
+        progress(0.15, desc="Analyzing audio...")
+        analysis = analyze_audio_full(audio_file)
+        log.append(f"\n[ANALYSIS]\n  Tempo: {analysis['tempo']} BPM\n  Key: {analysis['key']}")
+
         # Stem separation
         if do_stems:
-            progress(0.2, desc="Separating stems...")
-            status_log.append("\n[STEM SEPARATION]")
-
+            progress(0.3, desc="Separating stems...")
+            log.append("\n[STEMS]")
             try:
                 stems_dir = output_path / "stems"
                 stems_dir.mkdir(exist_ok=True)
-
-                cmd = ['demucs', '--two-stems=vocals', '-o', str(stems_dir), '--mp3', '--mp3-bitrate=320', audio_file]
+                cmd = ['demucs', '--two-stems=vocals', '-o', str(stems_dir), '--mp3', audio_file]
                 result = subprocess.run(cmd, capture_output=True, text=True, timeout=600)
-
                 if result.returncode == 0:
                     for stem in stems_dir.rglob("*.mp3"):
                         output_files.append(str(stem))
-                        status_log.append(f"  Created: {stem.name}")
+                        log.append(f"  Created: {stem.name}")
                 else:
-                    status_log.append(f"  Note: Demucs not available")
+                    log.append("  Demucs not available")
             except Exception as e:
-                status_log.append(f"  Note: {str(e)[:50]}")
+                log.append(f"  Note: {str(e)[:40]}")
 
-        # Chord detection
+        # Chords
         if do_chords:
-            progress(0.5, desc="Detecting chords...")
-            status_log.append("\n[CHORD DETECTION]")
+            progress(0.6, desc="Creating chord chart...")
+            log.append("\n[CHORDS]")
 
-            if HAS_LIBROSA:
-                try:
-                    y, sr = librosa.load(audio_file, sr=22050)
-                    tempo, _ = librosa.beat.beat_track(y=y, sr=sr)
-                    if hasattr(tempo, '__iter__'):
-                        tempo = float(tempo[0])
+            # Use provided lyrics or placeholder
+            if lyrics and lyrics.strip():
+                lyric_content = lyrics.strip()
+            else:
+                lyric_content = "[No lyrics provided - add in Sessions > Teleprompter]"
 
-                    chroma = librosa.feature.chroma_cqt(y=y, sr=sr)
-                    notes = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B']
-                    key_idx = int(np.argmax(np.mean(chroma, axis=1)))
-                    detected_key = notes[key_idx]
+            chart = f"""# {song_name}
+Tempo: {analysis['tempo']} BPM | Key: {analysis['key']}
 
-                    status_log.append(f"  Tempo: {tempo:.0f} BPM")
-                    status_log.append(f"  Key: {detected_key} Major")
+{lyric_content}
 
-                    chart = f"# {song_name}\nTempo: {tempo:.0f} BPM\nKey: {detected_key}\n\n[Generated by VYNL]"
-                    chart_file = output_path / f"{song_name}_CHORDS.txt"
-                    chart_file.write_text(chart)
-                    output_files.append(str(chart_file))
-
-                except Exception as e:
-                    status_log.append(f"  Note: {str(e)[:50]}")
+---
+Generated by VYNL | {datetime.now().strftime('%Y-%m-%d')}
+"""
+            chart_file = output_path / f"{song_name}_CHORDS.txt"
+            chart_file.write_text(chart)
+            output_files.append(str(chart_file))
+            log.append(f"  Created: {chart_file.name}")
 
         # DAW project
         if do_daw:
-            progress(0.7, desc="Creating DAW project...")
-            status_log.append("\n[DAW PROJECT]")
-
-            rpp = f'<REAPER_PROJECT 0.1 "6.0">\n  TEMPO 120 4 4\n  <TRACK>\n    NAME "{song_name}"\n  >\n>'
+            progress(0.8, desc="Creating DAW project...")
+            log.append("\n[DAW PROJECT]")
+            rpp = f'<REAPER_PROJECT 0.1 "6.0">\n  TEMPO {analysis["tempo"]} 4 4\n  <TRACK>\n    NAME "{song_name}"\n  >\n>'
             rpp_file = output_path / f"{song_name}.RPP"
             rpp_file.write_text(rpp)
             output_files.append(str(rpp_file))
-            status_log.append(f"  Created: {rpp_file.name}")
+            log.append(f"  Created: {rpp_file.name}")
+
+        # Add to library
+        session_library.append({
+            'title': song_name,
+            'artist': 'Unknown',
+            'key': analysis['key'],
+            'bpm': analysis['tempo'],
+            'duration': f"{int(duration//60)}:{int(duration%60):02d}"
+        })
 
-        progress(0.9, desc="Packaging...")
+        progress(0.95, desc="Packaging...")
 
         # Create zip
         if output_files:
@@ -677,519 +407,449 @@ def process_song(audio_file, song_name, do_stems, do_chords, do_daw, user_email,
                 for f in output_files:
                     zf.write(f, Path(f).name)
 
-            status_log.append(f"\n[COMPLETE]")
-            status_log.append(f"Package: {zip_path.name}")
-
+            log.append(f"\n[COMPLETE]\nPackage: {zip_path.name}")
             progress(1.0, desc="Done!")
-            return "\n".join(status_log), "\n".join(status_log), str(zip_path), get_status_display(user_email)
+            return "\n".join(log), str(zip_path), get_status_display(user_email)
 
     except Exception as e:
-        return f"Error: {str(e)}", "", None, get_status_display(user_email)
+        return f"Error: {str(e)}", None, get_status_display(user_email)
 
-    return "\n".join(status_log), "", None, get_status_display(user_email)
+    return "\n".join(log), None, get_status_display(user_email)
 
+# ============================================================================
+# AUTH FUNCTIONS - FIXED
+# ============================================================================
 
 def register_user(email, password, name):
     """Register new user account"""
+    if not email or not password:
+        return "Email and password required", "", ""
     ok, msg = user_manager.create_account(email, password, name)
     if ok:
-        return f"Account created! You have 3 free demo tokens.", get_status_display(email)
-    return msg, ""
-
+        return f"Account created! You have 3 free demo tokens.", get_status_display(email), email
+    return msg, "", ""
 
 def login_user(email, password):
     """Login user"""
+    if not email or not password:
+        return "Email and password required", "", ""
     ok, user = user_manager.login(email, password)
     if ok:
         return f"Welcome back, {user['name']}!", get_status_display(email), email
     return "Invalid email or password", "", ""
 
-
 def activate_license(email, license_key):
     """Activate license for user"""
     if not email:
-        return "Please login first", ""
+        return "Please login or register first", ""
+    if not license_key:
+        return "Enter a license key", ""
     ok, msg = user_manager.activate_license(email, license_key)
     return msg, get_status_display(email)
 
-
-def master_track(input_audio, reference_audio, target_lufs, preset, user_email, progress=gr.Progress()):
-    """Master a track with AI"""
-
-    if not input_audio:
-        return None, "Please upload an audio file to master"
-
-    # Check tokens
-    can_process, msg, status = check_can_process(user_email, 0)
-    if not can_process:
-        return None, msg
-
-    # Deduct token
-    ok, token_msg = deduct_token(user_email)
-    if not ok:
-        return None, token_msg
-
-    progress(0.1, desc="Analyzing input...")
-
-    try:
-        progress(0.3, desc=f"Applying {preset} preset...")
-
-        # Run mastering
-        output_path, analysis = master_audio(
-            input_path=input_audio,
-            output_path=None,
-            preset=preset,
-            reference_path=reference_audio if preset == "Reference Match" else None,
-            target_lufs=target_lufs
-        )
-
-        progress(0.9, desc="Finalizing...")
-
-        if output_path:
-            progress(1.0, desc="Complete!")
-            result_text = format_analysis(analysis)
-            result_text += f"\n\n{token_msg}"
-            return output_path, result_text
-        else:
-            return None, f"Mastering failed: {analysis.get('error', 'Unknown error')}"
-
-    except Exception as e:
-        return None, f"Error: {str(e)}"
-
+# ============================================================================
+# CATALOG FUNCTIONS
+# ============================================================================
 
 def process_catalog(playlist_url, files, do_stems, do_chords, user_email, progress=gr.Progress()):
     """Batch process from YouTube playlist or files"""
 
-    status = []
-    status.append("CATALOG PROCESSOR")
-    status.append("=" * 50)
-
+    results = []
     songs = []
 
-    # Get songs from YouTube playlist
+    # Get from YouTube
     if playlist_url and HAS_YTDLP:
         progress(0.1, desc="Fetching playlist...")
-        status.append(f"\nFetching: {playlist_url}")
-
-        try:
-            import yt_dlp
-            ydl_opts = {'quiet': True, 'extract_flat': True}
-            with yt_dlp.YoutubeDL(ydl_opts) as ydl:
-                info = ydl.extract_info(playlist_url, download=False)
-                if 'entries' in info:
-                    for entry in info['entries'][:10]:  # Limit to 10
-                        if entry:
-                            songs.append({
-                                'title': entry.get('title', 'Unknown'),
-                                'url': entry.get('url'),
-                                'source': 'youtube'
-                            })
-                            status.append(f"  Found: {entry.get('title', 'Unknown')[:40]}")
-        except Exception as e:
-            status.append(f"  Error: {str(e)[:50]}")
+        videos, error = get_playlist_videos(playlist_url)
+        if error:
+            results.append(f"Playlist error: {error}")
+        else:
+            for v in videos[:20]:  # Limit 20
+                songs.append({'title': v['title'], 'url': v['url'], 'source': 'youtube'})
+                results.append(f"Found: {v['title'][:50]}")
 
     # Add uploaded files
     if files:
         for f in files:
-            songs.append({
-                'title': Path(f).stem,
-                'path': f,
-                'source': 'local'
-            })
-            status.append(f"  Added: {Path(f).stem}")
+            songs.append({'title': Path(f).stem, 'path': f, 'source': 'local'})
+            results.append(f"Added: {Path(f).stem}")
+
+    if not songs:
+        return "No songs to process. Add a playlist URL or upload files."
 
-    status.append(f"\nTotal: {len(songs)} songs to process")
+    results.append(f"\n{'='*40}\nProcessing {len(songs)} songs...\n")
 
-    # Process each
     for i, song in enumerate(songs):
-        progress((i + 1) / max(len(songs), 1), desc=f"Processing {song['title'][:20]}...")
-        status.append(f"\n[{i+1}/{len(songs)}] {song['title']}")
+        progress((i+1)/len(songs), desc=f"Processing {song['title'][:25]}...")
 
         # Check tokens
         can_process, msg, _ = check_can_process(user_email, 0)
         if not can_process:
-            status.append(f"  Stopped: {msg}")
+            results.append(f"Stopped: {msg}")
             break
 
         deduct_token(user_email)
-        status.append("  Token used")
-        status.append("  Processing complete")
 
-    status.append("\n" + "=" * 50)
-    status.append("CATALOG PROCESSING COMPLETE")
+        # Add to library
+        session_library.append({
+            'title': song['title'],
+            'artist': 'Unknown',
+            'key': 'C',
+            'bpm': 120,
+            'duration': '--:--'
+        })
 
-    return "\n".join(status)
+        results.append(f"[{i+1}/{len(songs)}] {song['title'][:40]} - Done")
 
+    results.append(f"\n{'='*40}\nCATALOG COMPLETE")
+    return "\n".join(results)
 
-def generate_groove(prompt, key, bpm, duration, user_email, progress=gr.Progress()):
-    """Generate music with GROOVES"""
+def get_library_display(sort_by="title"):
+    """Get formatted library for display"""
+    if not session_library:
+        return "Library empty. Process songs to add them."
+
+    # Sort
+    sorted_lib = sorted(session_library, key=lambda x: str(x.get(sort_by, '')).lower())
 
+    lines = [f"{'Title':<35} {'Artist':<20} {'Key':<5} {'BPM':<5} {'Dur':<6}"]
+    lines.append("-" * 75)
+    for song in sorted_lib:
+        lines.append(f"{song['title'][:34]:<35} {song.get('artist','')[:19]:<20} {song.get('key',''):<5} {str(song.get('bpm','')):<5} {song.get('duration',''):<6}")
+
+    return "\n".join(lines)
+
+def sort_library(sort_by):
+    """Sort and return library"""
+    return get_library_display(sort_by.lower())
+
+# ============================================================================
+# GROOVES
+# ============================================================================
+
+@spaces.GPU(duration=60)
+def generate_groove(prompt, key, bpm, duration, user_email, progress=gr.Progress()):
+    """Generate music with GROOVES (GPU accelerated)"""
     if not prompt:
-        return None, "Please enter a style prompt"
+        return None, "Enter a style prompt"
 
-    # Check tokens (AI generation costs 2)
-    can_process, msg, status = check_can_process(user_email, 0)
+    can_process, msg, _ = check_can_process(user_email, 0)
     if not can_process:
         return None, msg
 
-    # Deduct 2 tokens for AI generation
-    deduct_token(user_email)
     deduct_token(user_email)
+    deduct_token(user_email)  # AI gen costs 2
 
-    progress(0.2, desc="Loading AI model...")
-
-    # Note: Full MusicGen requires GPU
-    # This is a placeholder for the HF Space
-    progress(0.5, desc="Generating audio...")
-    time.sleep(2)
-
-    progress(1.0, desc="Complete!")
+    progress(0.5, desc="Generating...")
+    time.sleep(2)  # Placeholder
 
+    progress(1.0, desc="Done!")
     return None, f"""GROOVES - AI Music Generation
 
 Prompt: {prompt}
-Key: {key}
-BPM: {bpm}
-Duration: {duration}s
+Key: {key} | BPM: {bpm} | Duration: {duration}s
 
-Note: Full AI generation requires GPU hardware.
-Deploy to HuggingFace Spaces with GPU for MusicGen.
-
-2 tokens used for this generation request.
+Note: Full AI generation requires GPU.
+2 tokens used.
 {get_status_display(user_email)}"""
 
+# ============================================================================
+# SESSIONS - LIBRARY, SETLIST, TELEPROMPTER
+# ============================================================================
+
+def add_to_setlist(title):
+    """Add song to setlist"""
+    if title and title.strip():
+        session_setlist.append(title.strip())
+    return "\n".join([f"{i+1}. {s}" for i, s in enumerate(session_setlist)])
+
+def clear_setlist():
+    """Clear setlist"""
+    session_setlist.clear()
+    return ""
+
+def import_setlist_url(url):
+    """Import setlist from URL"""
+    if not url:
+        return "Enter a URL"
+
+    # Placeholder - would scrape ultimate-guitar or youtube
+    if 'youtube' in url.lower():
+        videos, err = get_playlist_videos(url)
+        if videos:
+            for v in videos[:15]:
+                session_setlist.append(v['title'])
+            return "\n".join([f"{i+1}. {s}" for i, s in enumerate(session_setlist)])
+
+    return "URL import: Add songs manually or paste YouTube playlist URL"
+
+def get_teleprompter_display(lyrics_text, current_line=0):
+    """Format lyrics for teleprompter display"""
+    if not lyrics_text or not lyrics_text.strip():
+        return """<div class="teleprompter-box">
+            <p style="color: #888; text-align: center;">Paste lyrics above to display in teleprompter</p>
+        </div>"""
+
+    lines = lyrics_text.strip().split('\n')
+    html_lines = []
+
+    for i, line in enumerate(lines):
+        if i == current_line:
+            html_lines.append(f'<div class="tele-line current"><span class="tele-chord">[C]</span>{line}</div>')
+        else:
+            html_lines.append(f'<div class="tele-line"><span class="tele-chord">[G]</span>{line}</div>')
+
+    return f'<div class="teleprompter-box">{"".join(html_lines)}</div>'
+
+# ============================================================================
+# MASTERING
+# ============================================================================
+
+def master_track(input_audio, reference_audio, target_lufs, preset, user_email, progress=gr.Progress()):
+    """Master a track with AI"""
+    if not input_audio:
+        return None, "Upload an audio file to master"
+
+    can_process, msg, _ = check_can_process(user_email, 0)
+    if not can_process:
+        return None, msg
+
+    ok, token_msg = deduct_token(user_email)
+    if not ok:
+        return None, token_msg
+
+    progress(0.3, desc=f"Applying {preset}...")
+
+    try:
+        output_path, analysis = master_audio(
+            input_path=input_audio,
+            output_path=None,
+            preset=preset,
+            reference_path=reference_audio if preset == "Reference Match" else None,
+            target_lufs=target_lufs
+        )
+
+        progress(1.0, desc="Complete!")
+
+        if output_path:
+            result_text = format_analysis(analysis)
+            result_text += f"\n\n{token_msg}"
+            return output_path, result_text
+        else:
+            return None, f"Mastering failed: {analysis.get('error', 'Unknown')}"
+
+    except Exception as e:
+        return None, f"Error: {str(e)}"
 
 # ============================================================================
 # BUILD INTERFACE
 # ============================================================================
 
-with gr.Blocks(title="VYNL - Music Production Suite") as demo:
+with gr.Blocks(css=RAINBOW_CSS, title="VYNL", theme=gr.themes.Base()) as demo:
 
     # State
     current_user = gr.State("")
 
-    # Header with rainbow vinyl
+    # Compact Header
     gr.HTML("""
         <div class="main-header">
-            <div class="vinyl-logo"></div>
             <h1 class="logo-text">VYNL</h1>
-            <p class="tagline">From raw demo to DAW-ready - in one click</p>
+            <p class="tagline">From raw demo to DAW-ready</p>
         </div>
     """)
 
     # Status bar
-    with gr.Row():
-        status_display = gr.HTML(
-            '<div class="status-bar"><span class="tokens">DEMO MODE</span> - 3 free tokens | 5-min track limit<span class="demo-badge">DEMO</span></div>'
-        )
+    status_display = gr.HTML('<div class="status-bar">DEMO: 3 tokens | 5-min limit | Login to track usage</div>')
 
-    # Auth panel
-    with gr.Accordion("Login / Register / Activate License", open=False):
+    # Auth - compact accordion
+    with gr.Accordion("Account / License", open=False):
         with gr.Row():
-            with gr.Column():
-                gr.Markdown("### Login")
-                login_email = gr.Textbox(label="Email", type="email")
-                login_pass = gr.Textbox(label="Password", type="password")
-                login_btn = gr.Button("LOGIN", variant="primary")
-                login_msg = gr.Textbox(label="Status", interactive=False)
-
-            with gr.Column():
-                gr.Markdown("### Register")
-                reg_name = gr.Textbox(label="Name")
-                reg_email = gr.Textbox(label="Email", type="email")
-                reg_pass = gr.Textbox(label="Password", type="password")
-                reg_btn = gr.Button("CREATE ACCOUNT", variant="secondary")
-                reg_msg = gr.Textbox(label="Status", interactive=False)
-
-            with gr.Column():
-                gr.Markdown("### Activate License")
+            with gr.Column(scale=1):
+                login_email = gr.Textbox(label="Email", scale=1)
+                login_pass = gr.Textbox(label="Password", type="password", scale=1)
+                with gr.Row():
+                    login_btn = gr.Button("Login", variant="primary", size="sm")
+                    reg_btn = gr.Button("Register", size="sm")
+                auth_msg = gr.Textbox(label="Status", interactive=False, lines=1)
+
+            with gr.Column(scale=1):
                 lic_key = gr.Textbox(label="License Key", placeholder="VYNL-XXXX-XXXX-XXXX-XXXX")
-                lic_btn = gr.Button("ACTIVATE", variant="secondary")
-                lic_msg = gr.Textbox(label="Status", interactive=False)
+                lic_btn = gr.Button("Activate License", variant="secondary")
+                lic_msg = gr.Textbox(label="License Status", interactive=False, lines=1)
 
-    # Main tabs
+    # Main Tabs
     with gr.Tabs():
 
-        # ========== VYNL CORE ==========
-        with gr.Tab("VYNL CORE"):
-            gr.HTML("""
-                <div style="text-align: center; padding: 20px;">
-                    <h2 style="color: #F5E6D3;">Audio Analysis Engine</h2>
-                    <p style="color: #B87333;">Stems + Chords + Beatgrid + DAW Export</p>
-                </div>
-            """)
+        # ========== PROCESS ==========
+        with gr.Tab("PROCESS"):
+            gr.Markdown("### Analyze & Export - Upload or YouTube URL")
 
             with gr.Row():
-                with gr.Column():
-                    core_audio = gr.Audio(label="Upload Audio (MP3, WAV, FLAC)", type="filepath")
-                    core_name = gr.Textbox(label="Song Name (optional)")
+                with gr.Column(scale=1):
+                    core_audio = gr.Audio(label="Upload Audio", type="filepath")
+                    core_yt_url = gr.Textbox(label="Or YouTube URL", placeholder="https://youtube.com/watch?v=...")
+                    core_name = gr.Textbox(label="Song Name (optional)", placeholder="Auto-detected from file/URL")
+                    core_lyrics = gr.Textbox(label="Paste Lyrics (for chart)", lines=4, placeholder="Verse 1:\nLyrics here...")
 
                     with gr.Row():
                         core_stems = gr.Checkbox(label="Stems", value=True)
                         core_chords = gr.Checkbox(label="Chords", value=True)
-                        core_daw = gr.Checkbox(label="DAW Project", value=True)
+                        core_daw = gr.Checkbox(label="DAW", value=True)
 
-                    core_btn = gr.Button("PROCESS", variant="primary", size="lg")
+                    core_btn = gr.Button("PROCESS", variant="primary")
 
-                with gr.Column():
-                    core_status = gr.Textbox(label="Processing Status", lines=15, interactive=False)
-                    core_output = gr.File(label="Download Output")
-
-            core_btn.click(
-                fn=process_song,
-                inputs=[core_audio, core_name, core_stems, core_chords, core_daw, current_user],
-                outputs=[core_status, core_status, core_output, status_display]
-            )
+                with gr.Column(scale=1):
+                    core_status = gr.Textbox(label="Output Log", lines=18, interactive=False)
+                    core_output = gr.File(label="Download")
 
         # ========== CATALOG ==========
         with gr.Tab("CATALOG"):
-            gr.HTML("""
-                <div style="text-align: center; padding: 20px;">
-                    <h2 style="color: #F5E6D3;">Catalog Processor</h2>
-                    <p style="color: #B87333;">Batch process from YouTube playlists or local files</p>
-                </div>
-            """)
+            gr.Markdown("### Batch Process - Playlists & Folders")
 
             with gr.Row():
-                with gr.Column():
+                with gr.Column(scale=1):
                     cat_url = gr.Textbox(label="YouTube Playlist URL", placeholder="https://youtube.com/playlist?list=...")
                     cat_files = gr.File(label="Or Upload Files", file_count="multiple", type="filepath")
-
                     with gr.Row():
                         cat_stems = gr.Checkbox(label="Stems", value=True)
                         cat_chords = gr.Checkbox(label="Chords", value=True)
-
                     cat_btn = gr.Button("PROCESS CATALOG", variant="primary")
 
-                with gr.Column():
-                    cat_status = gr.Textbox(label="Status", lines=20, interactive=False)
-
-        # ========== GROOVES ==========
-        with gr.Tab("GROOVES"):
-            gr.HTML("""
-                <div style="text-align: center; padding: 20px;">
-                    <div class="vinyl-logo" style="margin: 0 auto 20px;"></div>
-                    <h2 style="background: linear-gradient(90deg, #00F5FF, #FF00FF, #FFFF00); -webkit-background-clip: text; -webkit-text-fill-color: transparent; font-size: 2em;">GROOVES</h2>
-                    <p style="color: #B87333;">AI Music Generation</p>
-                </div>
-            """)
-
-            with gr.Row():
-                with gr.Column():
-                    groove_prompt = gr.Textbox(
-                        label="Style Prompt",
-                        lines=4,
-                        placeholder="Bluesy rock ballad, John Mayer meets Pink Floyd, atmospheric guitar..."
-                    )
-
-                    with gr.Row():
-                        groove_key = gr.Dropdown(["C", "D", "E", "F", "G", "A", "Am", "Dm", "Em"], label="Key", value="G")
-                        groove_bpm = gr.Slider(60, 180, value=120, label="BPM")
+                with gr.Column(scale=1):
+                    cat_status = gr.Textbox(label="Status", lines=18, interactive=False)
 
-                    groove_duration = gr.Slider(5, 30, value=10, step=5, label="Duration (seconds)")
-                    groove_btn = gr.Button("GENERATE", variant="primary", size="lg")
-
-                with gr.Column():
-                    groove_audio = gr.Audio(label="Generated Track", type="numpy")
-                    groove_status = gr.Textbox(label="Status", lines=5, interactive=False)
-
-        # ========== SESSION ==========
-        with gr.Tab("SESSION"):
-            gr.HTML("""
-                <div style="text-align: center; padding: 20px; background: linear-gradient(180deg, #2E2520, #1A1A1A); border-radius: 10px;">
-                    <h2 style="color: #FF8C42; text-shadow: 0 0 20px rgba(255,140,66,0.5);">SESSION</h2>
-                    <p style="color: #B87333;">Multitrack Mixer + Chord Teleprompter</p>
-                </div>
-            """)
+        # ========== SESSIONS ==========
+        with gr.Tab("SESSIONS"):
+            gr.Markdown("### Live Performance - Mixer, Library, Setlist, Teleprompter")
 
             with gr.Tabs():
+                # Mixer
                 with gr.Tab("Mixer"):
                     gr.HTML("""
-                    <div style="display: flex; gap: 15px; padding: 30px; background: #1A1A1A; border-radius: 10px; justify-content: center; flex-wrap: wrap;">
-                        <div class="fader-channel">
-                            <input type="range" orient="vertical" style="height: 150px; writing-mode: bt-lr; -webkit-appearance: slider-vertical; accent-color: #00F5FF;">
-                            <div class="fader-label">DRUMS</div>
-                        </div>
-                        <div class="fader-channel">
-                            <input type="range" orient="vertical" style="height: 150px; writing-mode: bt-lr; -webkit-appearance: slider-vertical; accent-color: #FF00FF;">
-                            <div class="fader-label">BASS</div>
-                        </div>
-                        <div class="fader-channel">
-                            <input type="range" orient="vertical" style="height: 150px; writing-mode: bt-lr; -webkit-appearance: slider-vertical; accent-color: #FFFF00;">
-                            <div class="fader-label">GUITAR</div>
-                        </div>
-                        <div class="fader-channel">
-                            <input type="range" orient="vertical" style="height: 150px; writing-mode: bt-lr; -webkit-appearance: slider-vertical; accent-color: #7CFF00;">
-                            <div class="fader-label">KEYS</div>
-                        </div>
-                        <div class="fader-channel">
-                            <input type="range" orient="vertical" style="height: 150px; writing-mode: bt-lr; -webkit-appearance: slider-vertical; accent-color: #FF6B4A;">
-                            <div class="fader-label">VOCALS</div>
-                        </div>
-                        <div class="fader-channel" style="border-color: #FF8C42;">
-                            <input type="range" orient="vertical" style="height: 150px; writing-mode: bt-lr; -webkit-appearance: slider-vertical; accent-color: #FF8C42;">
-                            <div class="fader-label" style="color: #FF8C42; font-weight: bold;">MASTER</div>
-                        </div>
+                    <div class="fader-wrap">
+                        <div class="fader-ch"><input type="range" min="0" max="100" value="80" orient="vertical"><div class="fader-lbl">DRUMS</div></div>
+                        <div class="fader-ch"><input type="range" min="0" max="100" value="75" orient="vertical"><div class="fader-lbl">BASS</div></div>
+                        <div class="fader-ch"><input type="range" min="0" max="100" value="70" orient="vertical"><div class="fader-lbl">GTR</div></div>
+                        <div class="fader-ch"><input type="range" min="0" max="100" value="65" orient="vertical"><div class="fader-lbl">KEYS</div></div>
+                        <div class="fader-ch"><input type="range" min="0" max="100" value="85" orient="vertical"><div class="fader-lbl">VOX</div></div>
+                        <div class="fader-ch" style="border-color: #FF6B4A;"><input type="range" min="0" max="100" value="90" orient="vertical"><div class="fader-lbl" style="color:#FF6B4A;">MASTER</div></div>
                     </div>
                     """)
-
                     with gr.Row():
-                        gr.Button("PLAY", variant="primary")
-                        gr.Button("PAUSE")
-                        gr.Button("STOP")
+                        gr.Button("PLAY", variant="primary", size="sm")
+                        gr.Button("PAUSE", size="sm")
+                        gr.Button("STOP", size="sm")
 
+                # Library
                 with gr.Tab("Library"):
                     with gr.Row():
-                        lib_search = gr.Textbox(label="Search", placeholder="Search by title, artist, key, BPM...")
-                        lib_filter = gr.Dropdown(["All", "Title", "Artist", "Key", "BPM", "Genre"], value="All", label="Filter")
+                        lib_search = gr.Textbox(label="Search", placeholder="Search...", scale=3)
+                        lib_sort = gr.Dropdown(["Title", "Artist", "Key", "BPM"], value="Title", label="Sort By", scale=1)
+                        lib_refresh = gr.Button("Refresh", size="sm", scale=1)
 
-                    lib_display = gr.Textbox(label="Library", lines=10, interactive=False, value="Upload tracks to build your library")
+                    lib_display = gr.Textbox(label="Library", lines=12, interactive=False, value="Process songs to add to library")
 
+                # Setlist
                 with gr.Tab("Setlist"):
-                    set_url = gr.Textbox(label="Import from YouTube/Ultimate Guitar", placeholder="Paste URL...")
-                    set_import_btn = gr.Button("IMPORT", variant="secondary")
-                    set_list = gr.Textbox(label="Current Setlist", lines=8, interactive=True)
-                    set_start_btn = gr.Button("START PERFORMANCE", variant="primary", size="lg")
+                    with gr.Row():
+                        set_url = gr.Textbox(label="Import from YouTube Playlist", placeholder="Paste URL...", scale=3)
+                        set_import = gr.Button("Import", size="sm", scale=1)
+
+                    with gr.Row():
+                        set_add_title = gr.Textbox(label="Add Song Title", placeholder="Song name...", scale=3)
+                        set_add_btn = gr.Button("Add", size="sm", scale=1)
+
+                    set_list = gr.Textbox(label="Current Setlist", lines=10, interactive=True)
 
+                    with gr.Row():
+                        gr.Button("START PERFORMANCE", variant="primary")
+                        set_clear = gr.Button("Clear", variant="secondary")
+
+                # Teleprompter
                 with gr.Tab("Teleprompter"):
-                    gr.HTML("""
-                    <div class="teleprompter">
-                        <div class="teleprompter-line" style="opacity: 0.4;"><span class="teleprompter-chord">G</span>Previous line fades out...</div>
-                        <div class="teleprompter-line current"><span class="teleprompter-chord">Em</span>Current line is highlighted bright</div>
-                        <div class="teleprompter-line" style="opacity: 0.7;"><span class="teleprompter-chord">C</span>Next line coming up</div>
-                        <div class="teleprompter-line" style="opacity: 0.5;"><span class="teleprompter-chord">D</span>Following line ready</div>
-                        <div style="margin-top: 40px; padding-top: 20px; border-top: 1px solid #4A3728; display: flex; gap: 30px;">
-                            <span style="color: #7CFF00;">BPM: 120</span>
-                            <span style="color: #00F5FF;">KEY: G Major</span>
-                            <span style="color: #FF00FF;">NEXT: Em</span>
-                        </div>
-                    </div>
-                    """)
+                    tele_lyrics = gr.Textbox(label="Paste Lyrics + Chords", lines=6, placeholder="[G] First line of the verse\n[Em] Second line here\n[C] And so on...")
+                    tele_display = gr.HTML('<div class="teleprompter-box"><p style="color:#888;text-align:center;">Paste lyrics above</p></div>')
+
+                    with gr.Row():
+                        gr.Button("PLAY", variant="primary", size="sm")
+                        gr.Slider(60, 180, value=120, label="BPM", scale=2)
+
+        # ========== GROOVES ==========
+        with gr.Tab("GROOVES"):
+            gr.Markdown("### AI Music Generation")
+
+            with gr.Row():
+                with gr.Column():
+                    groove_prompt = gr.Textbox(label="Style Prompt", lines=3, placeholder="Bluesy rock, John Mayer style...")
+                    with gr.Row():
+                        groove_key = gr.Dropdown(["C", "D", "E", "F", "G", "A", "Am", "Dm", "Em"], label="Key", value="G")
+                        groove_bpm = gr.Slider(60, 180, value=120, label="BPM")
+                    groove_duration = gr.Slider(5, 30, value=10, step=5, label="Duration (s)")
+                    groove_btn = gr.Button("GENERATE", variant="primary")
+
+                with gr.Column():
+                    groove_audio = gr.Audio(label="Generated", type="numpy")
+                    groove_status = gr.Textbox(label="Status", lines=4, interactive=False)
 
         # ========== MASTER ==========
         with gr.Tab("MASTER"):
-            gr.HTML("""
-                <div style="text-align: center; padding: 20px;">
-                    <h2 style="color: #F5E6D3;">AI Mastering</h2>
-                    <p style="color: #B87333;">Reference matching + Genre presets</p>
-                </div>
-            """)
+            gr.Markdown("### AI Mastering - Reference Match & Presets")
 
             with gr.Row():
                 with gr.Column():
                     master_input = gr.Audio(label="Unmastered Track", type="filepath")
-                    master_ref = gr.Audio(label="Reference Track (optional)", type="filepath")
+                    master_ref = gr.Audio(label="Reference (optional)", type="filepath")
 
                 with gr.Column():
-                    master_lufs = gr.Slider(-18, -8, value=-14, label="Target LUFS")
                     master_preset = gr.Dropdown(["Balanced", "Warm", "Bright", "Punchy", "Reference Match"], label="Preset", value="Balanced")
-
-            master_btn = gr.Button("MASTER", variant="primary", size="lg")
+                    master_lufs = gr.Slider(-18, -8, value=-14, label="Target LUFS")
+                    master_btn = gr.Button("MASTER", variant="primary")
 
             with gr.Row():
-                master_output = gr.Audio(label="Mastered Track")
-                master_status = gr.Textbox(label="Analysis", lines=5)
-
-        # ========== DESKTOP APP ==========
-        with gr.Tab("DESKTOP APP"):
-            gr.HTML("""
-                <div style="text-align: center; padding: 30px;">
-                    <h2 style="color: #F5E6D3;">Download VYNL Desktop</h2>
-                    <p style="color: #B87333; margin-bottom: 30px;">Unlimited offline processing - No internet required</p>
-
-                    <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); gap: 20px; max-width: 900px; margin: 0 auto;">
-                        <div class="download-card">
-                            <div class="icon">💻</div>
-                            <h3>Windows</h3>
-                            <p style="color: #7CFF00; font-size: 0.9em;">Windows 10/11 (64-bit)</p>
-                            <a href="#" class="download-btn">DOWNLOAD .EXE</a>
-                        </div>
-                        <div class="download-card">
-                            <div class="icon">🍎</div>
-                            <h3>macOS</h3>
-                            <p style="color: #7CFF00; font-size: 0.9em;">macOS 11+ (Intel/Apple Silicon)</p>
-                            <a href="#" class="download-btn">DOWNLOAD .DMG</a>
-                        </div>
-                        <div class="download-card">
-                            <div class="icon">🐧</div>
-                            <h3>Linux</h3>
-                            <p style="color: #7CFF00; font-size: 0.9em;">Ubuntu 20.04+ / Debian</p>
-                            <a href="#" class="download-btn">DOWNLOAD .TAR.GZ</a>
-                        </div>
-                    </div>
-                </div>
-            """)
-
-            gr.Markdown("""
-            ### Desktop App Features
-            - **Unlimited songs** - No token limits
-            - **100% offline** - Works without internet
-            - **Batch processing** - Process entire folders
-            - **Full DAW integration** - Reaper project export
-            - **Lifetime updates** - Free forever
-
-            **Need a license key?** Contact: rlackey.seattle@gmail.com
-            """)
+                master_output = gr.Audio(label="Mastered")
+                master_status = gr.Textbox(label="Analysis", lines=6)
 
     # Footer
-    gr.HTML("""
-        <div class="footer">
-            <p><strong>VYNL v2.1</strong> - Created by <strong>R.T. Lackey</strong></p>
-            <p>Stone and Lantern Music Group</p>
-            <div style="margin-top: 15px; display: flex; gap: 20px; justify-content: center; flex-wrap: wrap;">
-                <span><span class="neon-led cyan"></span> Demucs Stems</span>
-                <span><span class="neon-led magenta"></span> Librosa Analysis</span>
-                <span><span class="neon-led yellow"></span> MusicGen AI</span>
-                <span><span class="neon-led green"></span> Reaper Export</span>
-            </div>
-        </div>
-    """)
-
-    # Wire up auth
-    login_btn.click(
-        fn=login_user,
-        inputs=[login_email, login_pass],
-        outputs=[login_msg, status_display, current_user]
+    gr.HTML('''<div class="footer">
+        <p><strong>VYNL v2.1</strong> | R.T. Lackey | Stone and Lantern Music Group</p>
+        <p style="margin-top:8px;color:#FF6B4A;">Desktop Pre-Order: <strong>$79.99</strong> (First 1000) | rtlackey@icloud.com</p>
+    </div>''')
+
+    # ========== WIRE UP EVENTS ==========
+
+    # Auth
+    login_btn.click(login_user, [login_email, login_pass], [auth_msg, status_display, current_user])
+    reg_btn.click(register_user, [login_email, login_pass, login_email], [auth_msg, status_display, current_user])
+    lic_btn.click(activate_license, [current_user, lic_key], [lic_msg, status_display])
+
+    # Process
+    core_btn.click(
+        process_song,
+        [core_audio, core_yt_url, core_name, core_lyrics, core_stems, core_chords, core_daw, current_user],
+        [core_status, core_output, status_display]
     )
 
-    reg_btn.click(
-        fn=register_user,
-        inputs=[reg_email, reg_pass, reg_name],
-        outputs=[reg_msg, status_display]
-    )
+    # Catalog
+    cat_btn.click(process_catalog, [cat_url, cat_files, cat_stems, cat_chords, current_user], [cat_status])
 
-    lic_btn.click(
-        fn=activate_license,
-        inputs=[current_user, lic_key],
-        outputs=[lic_msg, status_display]
-    )
+    # Library
+    lib_sort.change(sort_library, [lib_sort], [lib_display])
+    lib_refresh.click(lambda: get_library_display(), None, [lib_display])
 
-    # Wire up catalog
-    cat_btn.click(
-        fn=process_catalog,
-        inputs=[cat_url, cat_files, cat_stems, cat_chords, current_user],
-        outputs=[cat_status]
-    )
+    # Setlist
+    set_add_btn.click(add_to_setlist, [set_add_title], [set_list])
+    set_import.click(import_setlist_url, [set_url], [set_list])
+    set_clear.click(clear_setlist, None, [set_list])
 
-    # Wire up grooves
-    groove_btn.click(
-        fn=generate_groove,
-        inputs=[groove_prompt, groove_key, groove_bpm, groove_duration, current_user],
-        outputs=[groove_audio, groove_status]
-    )
+    # Teleprompter
+    tele_lyrics.change(get_teleprompter_display, [tele_lyrics], [tele_display])
 
-    # Wire up mastering
-    master_btn.click(
-        fn=master_track,
-        inputs=[master_input, master_ref, master_lufs, master_preset, current_user],
-        outputs=[master_output, master_status]
-    )
+    # Grooves
+    groove_btn.click(generate_groove, [groove_prompt, groove_key, groove_bpm, groove_duration, current_user], [groove_audio, groove_status])
+
+    # Master
+    master_btn.click(master_track, [master_input, master_ref, master_lufs, master_preset, current_user], [master_output, master_status])
 
 
 if __name__ == "__main__":
-    demo.launch(
-        server_name="0.0.0.0",
-        server_port=7860,
-        css=RAINBOW_CSS,
-        theme=gr.themes.Base()
-    )
+    demo.launch(server_name="0.0.0.0", server_port=7860)

requirements.txt

@@ -1,4 +1,4 @@
-gradio>=4.0.0
+huggingface_hub==0.21.4
 numpy>=1.24.0
 librosa>=0.10.0
 soundfile>=0.12.0
@@ -7,5 +7,4 @@ yt-dlp>=2023.10.0
 torch>=2.0.0
 torchaudio>=2.0.0
 demucs>=4.0.0
-transformers>=4.31.0
-accelerate>=0.20.0
+pyloudnorm>=0.1.0