add Community Songs tab: latest gens with tags + audio player, add tags to meta

app.py

@@ -1,8 +1,11 @@
+import html
 import json
 import os
 import random
 import secrets
 import subprocess
+import time
+from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime, timezone
 import spaces
 import gradio as gr
@@ -14,6 +17,11 @@ os.makedirs(OUT, exist_ok=True)
 
 REPO = "m-a-p/YuE2-3B"
 COMMUNITY_REPO = "directedbykobyperez/YuE2-community"
+
+# Community feed cache (avoid hammering the Hub on every click)
+_FEED_CACHE = {"ts": 0.0, "songs": []}
+FEED_TTL = 30  # seconds
+
 pipe = None
 
 
@@ -72,7 +80,6 @@ def derive_title(style, title_input, song_id):
         return t[:120]
     s = (style or "").strip().replace("\n", " ")
     if s:
-        # first ~8 words as title, title-cased
         words = s.split()[:8]
         title = " ".join(words)[:80]
         return title.title() if title else f"YuE2 Song {song_id[:6]}"
@@ -91,7 +98,6 @@ def upload_to_community(wav_path, meta_dict, song_id):
         wav_in_repo = f"songs/{song_id}/{song_id}.wav"
         meta_in_repo = f"songs/{song_id}/meta.json"
 
-        # write meta to a temp file next to OUT
         meta_local = os.path.join(OUT, f"{song_id}_meta.json")
         with open(meta_local, "w", encoding="utf-8") as f:
             json.dump(meta_dict, f, ensure_ascii=False, indent=2)
@@ -111,6 +117,8 @@ def upload_to_community(wav_path, meta_dict, song_id):
             commit_message=f"add meta {song_id}",
         )
         url = f"https://huggingface.co/datasets/{COMMUNITY_REPO}/tree/main/songs/{song_id}"
+        # invalidate feed cache so the new song appears fast
+        _FEED_CACHE["ts"] = 0.0
         return True, f"uploaded to community ✅ {url}"
     except Exception as e:
         print(f"[community-upload] failed: {e}")
@@ -118,7 +126,7 @@ def upload_to_community(wav_path, meta_dict, song_id):
 
 
 @spaces.GPU(duration=120)
-def generate(style, lyrics, cot, seed, cfg_scale, title_input, bpm_input, lang_input):
+def generate(style, lyrics, cot, seed, cfg_scale, title_input, bpm_input, lang_input, tags_input):
     pipeline = get_pipeline()
 
     if seed is None or seed < 1:
@@ -153,11 +161,13 @@ def generate(style, lyrics, cot, seed, cfg_scale, title_input, bpm_input, lang_i
     language = (lang_input or "en").strip() or "en"
     title = derive_title(style, title_input, song_id)
     created_at = datetime.now(timezone.utc).isoformat()
+    tags = (tags_input or "").strip()
 
     meta = {
         "id": song_id,
         "title": title,
         "description": (style or "").strip(),
+        "tags": tags,
         "lyrics": lyrics or "",
         "caption": (style or "").strip(),
         "bpm": bpm,
@@ -179,6 +189,149 @@ def generate(style, lyrics, cot, seed, cfg_scale, title_input, bpm_input, lang_i
     return flac_path, mp3_path, info
 
 
+# ---------------- Community feed ----------------
+
+def _fetch_one_meta(path, token):
+    """Download + parse one meta.json. Returns dict or None."""
+    try:
+        from huggingface_hub import hf_hub_download
+        local = hf_hub_download(
+            repo_id=COMMUNITY_REPO, repo_type="dataset",
+            filename=path, token=token,
+        )
+        with open(local, "r", encoding="utf-8") as f:
+            m = json.load(f)
+        if isinstance(m, dict) and m.get("id"):
+            return m
+    except Exception as e:
+        print(f"[feed] skip {path}: {e}")
+    return None
+
+
+def _load_feed_songs():
+    """List all songs/*/meta.json, download, sort newest first. Cached."""
+    now = time.time()
+    if now - _FEED_CACHE["ts"] < FEED_TTL and _FEED_CACHE["songs"]:
+        return _FEED_CACHE["songs"], True
+
+    token = os.environ.get("HF_TOKEN") or os.environ.get("HUGGINGFACE_TOKEN")
+    try:
+        from huggingface_hub import HfApi
+        api = HfApi(token=token) if token else HfApi()
+        files = api.list_repo_files(repo_id=COMMUNITY_REPO, repo_type="dataset")
+        meta_paths = [f for f in files if f.startswith("songs/") and f.endswith("/meta.json")]
+    except Exception as e:
+        print(f"[feed] list failed: {e}")
+        # serve stale cache if we have it
+        if _FEED_CACHE["songs"]:
+            return _FEED_CACHE["songs"], True
+        return [], False
+
+    # cap to keep the tab fast (newest unknown until we read created_at,
+    # so take a slice; 300 metas ≈ a few MB max)
+    meta_paths = sorted(meta_paths)[-300:]
+
+    songs = []
+    with ThreadPoolExecutor(max_workers=8) as ex:
+        for m in ex.map(lambda p: _fetch_one_meta(p, token), meta_paths):
+            if m:
+                songs.append(m)
+
+    def _key(m):
+        try:
+            return m.get("created_at", "")
+        except Exception:
+            return ""
+    songs.sort(key=_key, reverse=True)
+
+    _FEED_CACHE["ts"] = time.time()
+    _FEED_CACHE["songs"] = songs
+    return songs, False
+
+
+def _tags_html(tags_raw):
+    tags_raw = (tags_raw or "").strip()
+    if not tags_raw:
+        return '<span class="no-tags">no tags</span>'
+    parts = [t.strip() for t in tags_raw.replace(";", ",").split(",") if t.strip()][:10]
+    if not parts:
+        return '<span class="no-tags">no tags</span>'
+    return "".join(f'<span class="tag-pill">{html.escape(t)}</span>' for t in parts)
+
+
+def render_feed_html(songs):
+    if not songs:
+        return """
+        <div class="empty-feed">
+          <p style="font-size:1.2rem;">🎶 No songs yet — be the first!</p>
+          <p style="color:#64748b;">Generate a song in the Generate tab and it will appear here automatically.</p>
+        </div>
+        """
+    cards = []
+    for m in songs:
+        sid = html.escape(str(m.get("id", "?")))
+        title = html.escape(str(m.get("title", sid)))
+        caption = html.escape(str(m.get("caption", m.get("description", ""))))
+        lyrics = str(m.get("lyrics", ""))
+        bpm = html.escape(str(m.get("bpm", "?")))
+        lang = html.escape(str(m.get("language", "?")))
+        seed = html.escape(str(m.get("seed", "?")))
+        created = html.escape(str(m.get("created_at", ""))[:19].replace("T", " "))
+        try:
+            dur = float(m.get("duration", 0) or 0)
+            dur_s = f"{dur:.1f}s"
+        except Exception:
+            dur_s = "?"
+        audio_url = f"https://huggingface.co/datasets/{COMMUNITY_REPO}/resolve/main/songs/{m.get('id')}/{m.get('id')}.wav"
+        audio_url_e = html.escape(audio_url, quote=True)
+        lyrics_e = html.escape(lyrics[:2000])
+        cards.append(f"""
+        <div class="song-card">
+          <div class="song-head">
+            <div>
+              <div class="song-title">🎵 {title}</div>
+              <div class="song-sub">ID <code>{sid}</code> · {created} UTC · BPM {bpm} · {lang} · ⏱ {dur_s} · seed {seed}</div>
+            </div>
+          </div>
+          <audio controls preload="none" src="{audio_url_e}" style="width:100%;margin:8px 0;"></audio>
+          <div class="song-tags">{_tags_html(m.get("tags", ""))}</div>
+          <div class="song-prompt"><b>Prompt:</b> {caption or "—"}</div>
+          <details class="song-lyrics"><summary>📜 Lyrics</summary><pre>{lyrics_e or "—"}</pre></details>
+          <div class="song-links"><a href="{audio_url_e}" target="_blank">⬇ Download WAV</a> · <a href="https://huggingface.co/datasets/{COMMUNITY_REPO}/tree/main/songs/{sid}" target="_blank">View in dataset</a></div>
+        </div>
+        """)
+    return "\n".join(cards)
+
+
+def refresh_feed(search, limit):
+    """Gradio handler: returns (html, status). Never raises."""
+    try:
+        limit = int(limit) if limit else 20
+    except Exception:
+        limit = 20
+    limit = max(1, min(int(limit), 60))
+    try:
+        songs, cached = _load_feed_songs()
+        total = len(songs)
+        q = (search or "").strip().lower()
+        if q:
+            def _match(m):
+                blob = " ".join([
+                    str(m.get("title", "")), str(m.get("caption", "")),
+                    str(m.get("description", "")), str(m.get("lyrics", "")),
+                    str(m.get("tags", "")), str(m.get("id", "")),
+                ]).lower()
+                return q in blob
+            songs = [m for m in songs if _match(m)]
+        shown = songs[:limit]
+        html_out = render_feed_html(shown)
+        status = f"Showing {len(shown)}/{total} songs" + (" • cached" if cached else " • live") + (f" • filter: '{search}'" if q else "")
+        return html_out, status
+    except Exception as e:
+        print(f"[feed] refresh failed: {e}")
+        return render_feed_html([]), f"Failed to load feed: {e}"
+
+
 # CSS לעיצוב יוקרתי בסגנון Dark Theme
 custom_css = """
 body {
@@ -215,6 +368,33 @@ body {
     transform: translateY(-2px);
     box-shadow: 0 6px 20px rgba(255, 75, 75, 0.5) !important;
 }
+.song-card {
+    background: #111827;
+    border: 1px solid #1f2937;
+    border-radius: 14px;
+    padding: 16px;
+    margin-bottom: 14px;
+}
+.song-title { font-size: 1.15rem; font-weight: 700; color: #f1f5f9; }
+.song-sub { font-size: 0.78rem; color: #64748b; margin-top: 2px; }
+.song-sub code { color: #a855f7; }
+.song-tags { margin: 6px 0; display: flex; flex-wrap: wrap; gap: 6px; }
+.tag-pill {
+    background: #1e1b4b; color: #c4b5fd; border: 1px solid #4c1d95;
+    font-size: 0.75rem; padding: 2px 10px; border-radius: 999px;
+}
+.no-tags { color: #475569; font-size: 0.78rem; }
+.song-prompt { font-size: 0.88rem; color: #cbd5e1; margin: 6px 0; }
+.song-lyrics { margin-top: 6px; }
+.song-lyrics summary { cursor: pointer; color: #94a3b8; font-size: 0.85rem; }
+.song-lyrics pre {
+    white-space: pre-wrap; font-size: 0.82rem; color: #94a3b8;
+    background: #0b0f19; padding: 10px; border-radius: 8px; max-height: 220px; overflow: auto;
+}
+.song-links { margin-top: 8px; font-size: 0.82rem; }
+.song-links a { color: #a855f7; text-decoration: none; margin-right: 8px; }
+.empty-feed { text-align: center; padding: 40px 10px; color: #94a3b8; }
+audio::-webkit-media-controls-panel { background: #1f2937; }
 """
 
 with gr.Blocks(css=custom_css, title="YuE2-3B Music Generator") as demo:
@@ -228,44 +408,71 @@ with gr.Blocks(css=custom_css, title="YuE2-3B Music Generator") as demo:
         """
     )
 
-    with gr.Row():
-        with gr.Column(scale=5):
-            title_input = gr.Textbox(
-                label="🏷️ Title (optional — auto from style if empty)",
-                value="",
-                placeholder="e.g. Reggaeton Latin Spanish Old",
-                lines=1,
-            )
-            style = gr.Textbox(
-                label="🎨 Style Prompt",
-                value="Cyber metal, English, aggressive male vocals, distorted guitars, double-kick drums",
-                lines=3
+    with gr.Tabs():
+        with gr.Tab("🎵 Generate"):
+            with gr.Row():
+                with gr.Column(scale=5):
+                    title_input = gr.Textbox(
+                        label="🏷️ Title (optional — auto from style if empty)",
+                        value="",
+                        placeholder="e.g. Reggaeton Latin Spanish Old",
+                        lines=1,
+                    )
+                    style = gr.Textbox(
+                        label="🎨 Style Prompt",
+                        value="Cyber metal, English, aggressive male vocals, distorted guitars, double-kick drums",
+                        lines=3
+                    )
+                    tags_input = gr.Textbox(
+                        label="🏷️ Tags (comma separated, shown in community feed)",
+                        value="",
+                        placeholder="e.g. pop, melodic, cinematic",
+                        lines=1,
+                    )
+                    lyrics = gr.Textbox(
+                        label="📜 Lyrics ([verse] / [chorus] structure)",
+                        value="[verse]\nnothing here but static skies\nwe ride the current till it dies",
+                        lines=8
+                    )
+                    with gr.Row():
+                        cot = gr.Radio(["full", "melody", "off"], value="full", label="CoT Mode")
+                        seed = gr.Number(label="Seed (0 for Random)", value=0, precision=0)
+                        cfg = gr.Number(label="CFG Scale", value=1.0, precision=2)
+                    with gr.Row():
+                        bpm_input = gr.Number(label="BPM", value=120, precision=0)
+                        lang_input = gr.Textbox(label="Language", value="en", lines=1)
+
+                    btn = gr.Button("🚀 Generate Song", elem_classes=["generate-btn"])
+
+                with gr.Column(scale=5):
+                    audio = gr.Audio(label="🎧 Generated Song Player", type="filepath")
+                    mp3_file = gr.File(label="📥 Download MP3 (320kbps)")
+                    info = gr.Textbox(label="ℹ️ Generation Info", interactive=False)
+
+            btn.click(
+                fn=generate,
+                inputs=[style, lyrics, cot, seed, cfg, title_input, bpm_input, lang_input, tags_input],
+                outputs=[audio, mp3_file, info],
+                queue=True
             )
-            lyrics = gr.Textbox(
-                label="📜 Lyrics ([verse] / [chorus] structure)",
-                value="[verse]\nnothing here but static skies\nwe ride the current till it dies",
-                lines=8
+
+        with gr.Tab("🌍 Community Songs"):
+            gr.Markdown(
+                "Latest songs generated by users — auto-shared to the "
+                "[YuE2-community dataset](https://huggingface.co/datasets/directedbykobyperez/YuE2-community). "
+                "Press **🔄 Refresh** to load the newest."
             )
             with gr.Row():
-                cot = gr.Radio(["full", "melody", "off"], value="full", label="CoT Mode")
-                seed = gr.Number(label="Seed (0 for Random)", value=0, precision=0)
-                cfg = gr.Number(label="CFG Scale", value=1.0, precision=2)
-            with gr.Row():
-                bpm_input = gr.Number(label="BPM", value=120, precision=0)
-                lang_input = gr.Textbox(label="Language", value="en", lines=1)
-
-            btn = gr.Button("🚀 Generate Song", elem_classes=["generate-btn"])
-
-        with gr.Column(scale=5):
-            audio = gr.Audio(label="🎧 Generated Song Player", type="filepath")
-            mp3_file = gr.File(label="📥 Download MP3 (320kbps)")
-            info = gr.Textbox(label="ℹ️ Generation Info", interactive=False)
-
-    btn.click(
-        fn=generate,
-        inputs=[style, lyrics, cot, seed, cfg, title_input, bpm_input, lang_input],
-        outputs=[audio, mp3_file, info],
-        queue=True
-    )
+                search_box = gr.Textbox(label="🔍 Search (title / prompt / lyrics / tags / id)", value="", lines=1, scale=4)
+                limit_slider = gr.Slider(5, 60, value=20, step=5, label="How many")
+                refresh_btn = gr.Button("🔄 Refresh", scale=1)
+            feed_status = gr.Textbox(label="Status", interactive=False, value="Press Refresh to load songs.")
+            feed_html = gr.HTML("<div class='empty-feed'>Press 🔄 Refresh to load the latest community songs.</div>")
+
+            refresh_btn.click(
+                fn=refresh_feed,
+                inputs=[search_box, limit_slider],
+                outputs=[feed_html, feed_status],
+            )
 
 demo.queue().launch()