Update app.py

app.py

@@ -1,265 +1,82 @@
-import gradio as gr
 import os
+import time
+import logging
+import gradio as gr
+import modal
 
-# ✅ Updated Modal token config
-if 'MODAL_TOKEN' in os.environ:
-    import modal
-    modal.config.token_id = os.environ['MODAL_TOKEN']
-    print("✅ Modal token configured from HF Secrets")
-else:
-    print("❌ MODAL_TOKEN not found in environment")
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
 
-from typing import Dict
-import re
+logger.info(f"Modal version: {modal.__version__}")
+logger.info("===== Environment Variables =====")
+for k in ["HF_HUB_ENABLE_HF_TRANSFER", "HF_DATASETS_TRUST_REMOTE_CODE", "MODAL_TOKEN"]:
+    logger.info(f"{k}: {os.environ.get(k, '❌ MISSING')}")
 
-# ✅ Updated Modal function lookup using client + stub
-try:
-    import modal
-    client = modal.Client()
-    stub = client.stub("content-creation-agent")
+if os.environ.get("MODAL_TOKEN") is None:
+    raise RuntimeError("❌ MODAL_TOKEN not found in environment!")
 
-    generate_ai_content = stub.function("generate_content_with_llm")
-    generate_template_content = stub.function("generate_fallback_content")
-    MODAL_AVAILABLE = True
-    print("✅ Modal successfully imported and functions loaded")
+# ✅ Modal 1.x style — no modal.configure
+try:
+    generate_content_with_llm = modal.Function.from_name(
+        "mr-law-jason/main/content-creation-agent",  # App path
+        "generate_content_with_llm"                  # Function name
+    )
+    logger.info("✅ Loaded remote Modal function")
 except Exception as e:
-    MODAL_AVAILABLE = False
-    print(f"❌ Modal not available - using fallback. Reason: {e}")
-
-def generate_smart_hashtags(lyrics: str, song_title: str, artist_name: str, mood: str, themes: list, platform: str) -> str:
-    # ... unchanged hashtag logic ...
-    # [omitted for brevity since you asked for full code, it is included below]
-    genre_words = {
-        'rock': ['rock', 'guitar', 'drums', 'energy', 'driving', 'electric'],
-        'acoustic': ['acoustic', 'guitar', 'soft', 'intimate', 'whisper'],
-        'electronic': ['synth', 'beat', 'digital', 'electronic', 'techno'],
-        'pop': ['catchy', 'melody', 'chorus', 'hook', 'radio'],
-        'hiphop': ['rap', 'rhythm', 'flow', 'beats', 'street'],
-        'folk': ['story', 'traditional', 'nature', 'home', 'country'],
-        'dance': ['dance', 'club', 'party', 'move', 'groove', 'floor']
-    }
-
-    detected_genre = 'indie'
-    lyrics_lower = lyrics.lower()
-    for genre, keywords in genre_words.items():
-        if any(keyword in lyrics_lower for keyword in keywords):
-            detected_genre = genre
-            break
-
-    quality_tags = {
-        'youtube': ['newmusic', 'musicvideo', 'viral', 'musician', 'songwriter', 'indie', 'original', 'artist', 'music2025', 'instamusic', 'unsignedartist', 'indiemusic', 'newartist', 'musicproducer', 'musiclover'],
-        'instagram': ['newmusic', 'musicvideo', 'instamusic', 'viral', 'musician', 'songwriter', 'indie', 'artist', 'music2025', 'musiclover', 'unsignedartist', 'indiemusic', 'newartist', 'musicproducer', 'originalmusic'],
-        'twitter': ['newmusic', 'musicvideo', 'nowplaying', 'viral', 'musician', 'songwriter'],
-        'facebook': ['newmusic', 'musicvideo', 'viral', 'musician', 'songwriter', 'indie'],
-        'minds': ['independentmusic', 'newmusic', 'musicvideo', 'artist', 'original'],
-        'gab': ['music', 'independentartist', 'newmusic', 'original', 'viral']
-    }
-
-    mood_hashtags = {
-        'emotional': ['emotional', 'feelings', 'heartfelt', 'deep', 'soulful'],
-        'uplifting': ['uplifting', 'positive', 'inspiring', 'hopeful', 'energetic'],
-        'inspiring': ['inspiring', 'motivational', 'powerful', 'uplifting', 'positive']
-    }
-
-    theme_hashtags = {
-        'love': ['love', 'romance', 'relationship', 'heart', 'passion'],
-        'life': ['life', 'journey', 'experience', 'living', 'reality'],
-        'time': ['time', 'memories', 'moments', 'forever', 'eternal'],
-        'dream': ['dreams', 'aspirations', 'goals', 'future', 'vision'],
-        'night': ['night', 'midnight', 'darkness', 'stars', 'nocturnal'],
-        'freedom': ['freedom', 'liberation', 'independent', 'free', 'escape']
-    }
-
-    hashtags = []
-    base_tags = quality_tags.get(platform, quality_tags['youtube'])
-    hashtags.extend(base_tags[:5])
-    hashtags.append(detected_genre)
-
-    if mood in mood_hashtags:
-        hashtags.extend(mood_hashtags[mood][:2])
-
-    theme_count = 0
-    for theme in themes[:3]:
-        if theme in theme_hashtags and theme_count < 2:
-            hashtags.extend(theme_hashtags[theme][:1])
-            theme_count += 1
-
-    if artist_name.strip() and artist_name.lower() != 'anonymous':
-        artist_tag = artist_name.replace(' ', '').lower()
-        if len(artist_tag) > 2:
-            hashtags.append(artist_tag)
-
-    additional_quality = ['originalmusic', 'newrelease', 'indieartist', 'musicislife', 'goodmusic', 'musicfan', 'playlist', 'spotify', 'musicdiscovery', 'underground']
-
-    seen = set()
-    unique_hashtags = []
-    for tag in hashtags:
-        tag_lower = tag.lower()
-        if tag_lower not in seen and tag_lower not in ['subscribe', 'anonymous', 'trending']:
-            seen.add(tag_lower)
-            unique_hashtags.append(tag)
-
-    for tag in additional_quality:
-        if len(unique_hashtags) >= 15 and platform == 'youtube':
-            break
-        if len(unique_hashtags) >= 5 and platform == 'minds':
-            break
-        if len(unique_hashtags) >= 6 and platform in ['twitter', 'facebook', 'gab']:
-            break
-        if len(unique_hashtags) >= 15 and platform == 'instagram':
-            break
-        if tag not in seen:
-            seen.add(tag)
-            unique_hashtags.append(tag)
-
-    limits = {
-        'youtube': 15,
-        'instagram': 15,
-        'twitter': 6,
-        'facebook': 6,
-        'minds': 5,
-        'gab': 5
-    }
-
-    limit = limits.get(platform, 10)
-    final_hashtags = unique_hashtags[:limit]
-    return ' '.join(f'#{tag}' for tag in final_hashtags)
+    logger.error(f"❌ Failed to load Modal function: {e}")
+    generate_content_with_llm = None
 
-def call_modal_ai_generation(lyrics: str, artist_name: str, song_title: str) -> Dict[str, str]:
-    try:
-        result = generate_ai_content.remote(lyrics, artist_name, song_title)
-        return result
-    except Exception as e:
-        print(f"Modal AI generation failed: {str(e)}")
-        return {"error": f"Modal AI generation failed: {str(e)}"}
-
-def call_modal_template_generation(lyrics: str, artist_name: str, song_title: str) -> Dict[str, str]:
-    try:
-        result = generate_template_content.remote(lyrics, artist_name, song_title)
-        return result
-    except Exception as e:
-        print(f"Modal call failed: {str(e)}")
-        return {"error": f"Modal template generation failed: {str(e)}"}
-
-def local_fallback_content(lyrics: str, artist_name: str, song_title: str) -> Dict[str, str]:
-    # ... unchanged fallback generation logic ...
-    # (You had all platforms covered here in the original. This section remains fully intact.)
 
-    # Extract key words and themes from lyrics
-    words = re.findall(r'\b[a-zA-Z]{4,}\b', lyrics.lower())
-    common_words = {'love', 'heart', 'time', 'life', 'feel', 'know', 'want', 'need', 'like', 'come', 'back', 'away', 'never', 'always', 'forever', 'dream', 'night', 'freedom'}
-    themes = [word for word in set(words) if word in common_words]
-
-    positive_words = {'love', 'happy', 'joy', 'hope', 'dream', 'light', 'beautiful', 'amazing', 'bright', 'inspiring'}
-    sad_words = {'cry', 'tear', 'pain', 'hurt', 'lost', 'lonely', 'dark', 'goodbye', 'broken'}
-
-    mood = "uplifting"
-    if any(word in lyrics.lower() for word in sad_words):
-        mood = "emotional"
-    elif any(word in lyrics.lower() for word in positive_words):
-        mood = "inspiring"
-
-    artist_display = artist_name if artist_name.strip() else "Anonymous Artist"
-    by_artist = f" - {artist_display}" if artist_name.strip() else ""
-
-    youtube_hashtags = generate_smart_hashtags(lyrics, song_title, artist_name, mood, themes, 'youtube')
-    twitter_hashtags = generate_smart_hashtags(lyrics, song_title, artist_name, mood, themes, 'twitter')
-    facebook_hashtags = generate_smart_hashtags(lyrics, song_title, artist_name, mood, themes, 'facebook')
-    instagram_hashtags = generate_smart_hashtags(lyrics, song_title, artist_name, mood, themes, 'instagram')
-    minds_hashtags = generate_smart_hashtags(lyrics, song_title, artist_name, mood, themes, 'minds')
-    gab_hashtags = generate_smart_hashtags(lyrics, song_title, artist_name, mood, themes, 'gab')
-
-    # (Omitting for brevity: all the platform-specific templates are still included from your original)
-    # Return dictionary for all platforms
+def generate_fallback_content(lyrics, artist, title):
     return {
-        'youtube': f"🎵 {song_title}{by_artist} 🎵\n\nExperience this {mood} track...\n\n📝 LYRICS:\n{lyrics}\n\n{youtube_hashtags}",
-        'twitter': f"🎵 NEW MUSIC VIDEO: '{song_title}'{by_artist}...\n\n🎬 Watch: [Link]\n\n{twitter_hashtags}",
-        'facebook': f"🎵 MUSIC VIDEO PREMIERE 🎵\n\nNew music video for '{song_title}'{by_artist}...\n\n{facebook_hashtags}",
-        'instagram': f"🎵✨ '{song_title}' Official Music Video is LIVE! ✨🎵\n\n{instagram_hashtags}",
-        'minds': f"🎵 New Music Alert!\n\n{song_title}{by_artist}\n\n{minds_hashtags}",
-        'gab': f"New Music Video Drop!\n\n'{song_title}'{by_artist}\n\n{gab_hashtags}"
+        'youtube': f"🎵 {title} by {artist or 'Anonymous'} 🎵\n\n{lyrics[:200]}...\n\n#music #newrelease",
+        'twitter': f"New song: {title} by {artist or 'Anonymous'} is out now! 🎵\n#newmusic #{artist.lower().replace(' ', '') if artist else ''}",
+        'instagram': f"{title} is now available! ✨\nLink in bio\n#music #instamusic",
+        'facebook': f"New music release: {title} by {artist or 'Anonymous'}!\n\n#newmusic #artist",
+        'minds': f"Independent music release: {title}\n\n#independentartist #music",
+        'gab': f"New authentic music: {title}\n\n#realmusic #artist"
     }
 
-def create_content(lyrics: str, artist_name: str, song_title: str, use_ai: bool = True):
-    if not lyrics.strip() or not song_title.strip():
-        return "❌ Please fill in the required fields: lyrics and song title. Artist name is optional."
+outputs = ['youtube', 'twitter', 'instagram', 'facebook', 'minds', 'gab']
 
-    try:
-        content = None
-        generation_method = "Unknown"
+def generate_all_content(lyrics, artist, title):
+    start_time = time.time()
+    status_msg = "⏳ Generating content..."
+    yield {output: "" for output in outputs}, status_msg
 
-        if use_ai and MODAL_AVAILABLE:
-            content = call_modal_ai_generation(lyrics, artist_name, song_title)
-            if "error" not in content:
-                generation_method = "🤖 AI Generation (Modal GPU)"
-            else:
-                content = call_modal_template_generation(lyrics, artist_name, song_title)
-                generation_method = "📝 Template Generation (Modal)" if "error" not in content else "📝 Local Template Generation (Modal Failed)"
-        elif MODAL_AVAILABLE:
-            content = call_modal_template_generation(lyrics, artist_name, song_title)
-            generation_method = "📝 Template Generation (Modal)" if "error" not in content else "📝 Local Template Generation (Modal Failed)"
+    try:
+        if generate_content_with_llm:
+            result = generate_content_with_llm.remote(lyrics, artist, title)
+            content = result
+            status_msg = f"✅ Generated with Modal in {time.time() - start_time:.2f}s"
         else:
-            content = local_fallback_content(lyrics, artist_name, song_title)
-            generation_method = "📝 Local Template Generation (Modal Unavailable)"
-
-        artist_display = artist_name if artist_name.strip() else "Anonymous"
-        output = f"""
-# 🎵 Content Generated for '{song_title}' by {artist_display}
-*Generated using: {generation_method}*
-
-## 📺 YouTube Description:
-{content.get('youtube', 'Generation failed')}
-
----
-
-## 🐦 Twitter/X Post:
-{content.get('twitter', 'Generation failed')}
-
----
-
-## 📘 Facebook Post:
-{content.get('facebook', 'Generation failed')}
-
----
-
-## 📸 Instagram Caption:
-{content.get('instagram', 'Generation failed')}
+            raise RuntimeError("Modal function not available.")
+    except Exception as e:
+        logger.warning(f"⚠️ Modal generation failed: {e}")
+        content = generate_fallback_content(lyrics, artist, title)
+        status_msg = f"⚠️ Fallback used. Generated locally in {time.time() - start_time:.2f}s"
 
----
+    yield content, status_msg
 
-## 🧠 Minds Post:
-{content.get('minds', 'Generation failed')}
 
----
+with gr.Blocks() as demo:
+    gr.Markdown("🎶 **AI Content Generator for Musicians**")
 
-## 💬 Gab Post:
-{content.get('gab', 'Generation failed')}
-"""
-        return output
-    except Exception as e:
-        return f"❌ Error generating content: {str(e)}"
+    with gr.Row():
+        lyrics_input = gr.Textbox(lines=5, label="Lyrics")
+    with gr.Row():
+        artist_input = gr.Textbox(label="Artist Name")
+        title_input = gr.Textbox(label="Song Title")
 
-interface = gr.Interface(
-    fn=create_content,
-    inputs=[
-        gr.Textbox(lines=10, placeholder="Paste your song lyrics here...", label="🎵 Song Lyrics"),
-        gr.Textbox(placeholder="Artist Name (Optional)", label="🎤 Artist Name"),
-        gr.Textbox(placeholder="Song Title", label="🎵 Song Title"),
-        gr.Checkbox(label="🤖 Use AI Generation", value=True)
-    ],
-    outputs=gr.Markdown(label="📱 Generated Social Media Content"),
-    title="🎵 YouTube Music Video Content Creator Agent 🎬",
-    description=f"""
-    **Transform your song lyrics into compelling social media content using AI agents!**
+    run_button = gr.Button("Generate Content")
 
-    This autonomous AI agent creates:
-    - ✅ YouTube video descriptions with hashtags
-    - ✅ Platform-optimized content
-    - ✅ Optional AI generation via Modal
+    output_boxes = {platform: gr.Textbox(label=platform.title()) for platform in outputs}
+    status = gr.Markdown("")
 
-    **💻 Modal Status:** {"✅ Connected" if MODAL_AVAILABLE else "❌ Unavailable (using fallback)"}
-    """
-)
+    run_button.click(
+        fn=generate_all_content,
+        inputs=[lyrics_input, artist_input, title_input],
+        outputs=[output_boxes[p] for p in outputs] + [status]
+    )
 
-if __name__ == "__main__":
-    interface.launch()
+demo.launch()