Update app.py

app.py

@@ -6,81 +6,53 @@ import gradio as gr
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-# Robust Modal authentication setup
-def setup_modal_authentication():
-    """Configure Modal authentication properly"""
-    modal_token = os.environ.get("MODAL_TOKEN")
-    
-    if not modal_token:
-        logger.warning("⚠️ MODAL_TOKEN environment variable not found")
-        return False
-    
-    # Set multiple environment variables that Modal might check
-    try:
-        # Method 1: Set MODAL_TOKEN_ID (most common)
-        os.environ["MODAL_TOKEN_ID"] = modal_token
-        
-        # Method 2: Set MODAL_TOKEN_SECRET (alternative)  
-        os.environ["MODAL_TOKEN_SECRET"] = modal_token
-        
-        # Method 3: Set the base MODAL_TOKEN (redundant but safe)
-        os.environ["MODAL_TOKEN"] = modal_token
-        
-        logger.info("✅ Modal environment variables configured")
-        return True
-        
-    except Exception as e:
-        logger.error(f"❌ Failed to configure Modal environment: {e}")
-        return False
-
-# Check Modal availability with robust authentication
+# Simplified Modal authentication - no complex setup needed
 MODAL_AVAILABLE = False
 generate_content_with_llm = None
 
-if setup_modal_authentication():
-    try:
-        import modal
-        logger.info(f"Modal version: {modal.__version__}")
-        
-        # Try to authenticate and connect
+try:
+    import modal
+    logger.info(f"Modal version: {modal.__version__}")
+    
+    # Check for Modal token in environment (set by HuggingFace)
+    if os.environ.get("MODAL_TOKEN"):
         try:
-            # Test 1: Try direct function lookup
+            # Try to connect to your Modal functions
             generate_content_with_llm = modal.Function.from_name(
                 "content-creation-agent",
                 "generate_content_with_llm"
             )
             
-            # Test 2: Try a simple health check to verify authentication
+            # Test connection with health check
             health_check_func = modal.Function.from_name(
                 "content-creation-agent", 
                 "health_check"
             )
             
-            # Attempt a test call to verify authentication works
+            # Test if Modal is working
             test_result = health_check_func.remote()
-            logger.info(f"✅ Modal authentication test passed: {test_result}")
+            logger.info(f"✅ Modal health check passed: {test_result}")
             
             MODAL_AVAILABLE = True
-            logger.info("✅ Modal successfully connected and authenticated")
-            
-        except Exception as auth_error:
-            logger.warning(f"⚠️ Modal authentication failed: {auth_error}")
+            logger.info("✅ Modal successfully connected")
             
-            # Try fallback function
+        except Exception as e:
+            logger.warning(f"⚠️ Modal connection failed: {e}")
+            # Try fallback function instead
             try:
                 generate_content_with_llm = modal.Function.from_name(
                     "content-creation-agent",
-                    "generate_fallback_content"  # Use fallback function instead
+                    "generate_fallback_content"
                 )
                 MODAL_AVAILABLE = True
                 logger.info("✅ Modal connected using fallback function")
-            except Exception as fallback_error:
-                logger.error(f"❌ Modal fallback connection failed: {fallback_error}")
-                
-    except ImportError:
-        logger.warning("⚠️ Modal package not available")
-else:
-    logger.error("❌ Modal authentication setup failed")
+            except Exception as e2:
+                logger.warning(f"⚠️ Modal fallback also failed: {e2}")
+    else:
+        logger.warning("⚠️ MODAL_TOKEN not found in environment")
+        
+except ImportError:
+    logger.warning("⚠️ Modal package not available")
 
 logger.info(f"Modal Status: {'✅ Available' if MODAL_AVAILABLE else '❌ Unavailable'}")
 
@@ -90,49 +62,69 @@ def generate_fallback_content(lyrics, artist, title):
     # Analyze lyrics for themes and mood
     lyrics_lower = lyrics.lower()
     
-    # Detect mood
+    # Advanced mood detection
     mood = "uplifting"
-    if any(word in lyrics_lower for word in ['cry', 'tear', 'pain', 'hurt', 'lost', 'broken', 'sad']):
+    if any(word in lyrics_lower for word in ['cry', 'tear', 'pain', 'hurt', 'lost', 'broken', 'sad', 'lonely', 'dark']):
         mood = "emotional"
-    elif any(word in lyrics_lower for word in ['energy', 'power', 'fire', 'strong', 'fight', 'drive']):
+    elif any(word in lyrics_lower for word in ['energy', 'power', 'fire', 'strong', 'fight', 'drive', 'force', 'intense']):
         mood = "energetic"
-    elif any(word in lyrics_lower for word in ['love', 'happy', 'joy', 'hope', 'dream', 'light']):
+    elif any(word in lyrics_lower for word in ['love', 'happy', 'joy', 'hope', 'dream', 'light', 'beautiful', 'amazing']):
         mood = "inspiring"
     
-    # Extract themes
+    # Extract themes with better detection
     theme_words = []
-    if any(word in lyrics_lower for word in ['love', 'heart', 'romance']):
+    if any(word in lyrics_lower for word in ['love', 'heart', 'romance', 'kiss', 'together']):
         theme_words.append('love')
-    if any(word in lyrics_lower for word in ['dream', 'hope', 'future']):
+    if any(word in lyrics_lower for word in ['dream', 'hope', 'future', 'tomorrow', 'vision']):
         theme_words.append('dreams')
-    if any(word in lyrics_lower for word in ['night', 'dark', 'star']):
+    if any(word in lyrics_lower for word in ['night', 'dark', 'star', 'moon', 'midnight']):
         theme_words.append('night')
-    if any(word in lyrics_lower for word in ['life', 'living', 'journey']):
+    if any(word in lyrics_lower for word in ['life', 'living', 'journey', 'path', 'way']):
         theme_words.append('life')
+    if any(word in lyrics_lower for word in ['freedom', 'free', 'escape', 'break', 'liberation']):
+        theme_words.append('freedom')
+    if any(word in lyrics_lower for word in ['time', 'moment', 'forever', 'always', 'memory']):
+        theme_words.append('time')
     
     themes_text = ', '.join(theme_words[:3]) if theme_words else 'deep emotions'
     
-    # Detect genre for hashtags
+    # Advanced genre detection
     genre = 'indie'
-    if any(word in lyrics_lower for word in ['rock', 'guitar', 'band', 'drums']):
+    if any(word in lyrics_lower for word in ['rock', 'guitar', 'band', 'drums', 'electric', 'amp']):
         genre = 'rock'
-    elif any(word in lyrics_lower for word in ['pop', 'radio', 'catchy', 'dance']):
+    elif any(word in lyrics_lower for word in ['pop', 'radio', 'catchy', 'dance', 'party', 'club']):
         genre = 'pop'
-    elif any(word in lyrics_lower for word in ['rap', 'flow', 'beats', 'hip']):
+    elif any(word in lyrics_lower for word in ['rap', 'flow', 'beats', 'hip', 'street', 'rhyme']):
         genre = 'hiphop'
-    elif any(word in lyrics_lower for word in ['electronic', 'synth', 'edm']):
+    elif any(word in lyrics_lower for word in ['electronic', 'synth', 'edm', 'techno', 'digital']):
         genre = 'electronic'
+    elif any(word in lyrics_lower for word in ['acoustic', 'folk', 'country', 'traditional']):
+        genre = 'acoustic'
     
-    # Generate platform-specific hashtags
-    hashtags = {
-        'youtube': f"#{genre}music #newmusic #musicvideo #{mood}music #originalmusic #independentartist #songwriter #musicdiscovery #viral #subscribe #newrelease #musicproducer #instamusic #unsignedartist #emergingartist",
-        'twitter': f"#{genre} #newmusic #nowplaying #{mood} #musicvideo #viral",
-        'instagram': f"#{genre}vibes #newmusic #instamusic #{mood} #musicpost #originalmusic #artist #viral #trending #musiclover #songwriter #independentartist #newrelease #musicdiscovery #vibes",
-        'facebook': f"#{genre}music #newmusic #originalmusic #{mood} #musicvideo #viral",
-        'minds': f"#independentmusic #originalmusic #newmusic #creative #authentic",
-        'gab': f"#originalmusic #independent #authentic #realmusic #newmusic"
+    # Premium hashtag generation
+    base_hashtags = {
+        'youtube': [f'{genre}music', 'newmusic', 'musicvideo', f'{mood}music', 'originalmusic', 'independentartist', 'songwriter', 'musicdiscovery', 'viral', 'subscribe', 'newrelease', 'musicproducer', 'instamusic', 'unsignedartist', 'emergingartist'],
+        'twitter': [f'{genre}', 'newmusic', 'nowplaying', f'{mood}', 'musicvideo', 'viral'],
+        'instagram': [f'{genre}vibes', 'newmusic', 'instamusic', f'{mood}', 'musicpost', 'originalmusic', 'artist', 'viral', 'trending', 'musiclover', 'songwriter', 'independentartist', 'newrelease', 'musicdiscovery', 'vibes'],
+        'facebook': [f'{genre}music', 'newmusic', 'originalmusic', f'{mood}', 'musicvideo', 'viral'],
+        'minds': ['independentmusic', 'originalmusic', 'newmusic', 'creative', 'authentic'],
+        'gab': ['originalmusic', 'independent', 'authentic', 'realmusic', 'newmusic']
     }
     
+    # Add theme-based hashtags
+    for platform in base_hashtags:
+        for theme in theme_words[:2]:  # Add top 2 themes
+            base_hashtags[platform].append(f'{theme}music')
+    
+    # Format hashtags with proper limits
+    hashtags = {}
+    limits = {'youtube': 15, 'instagram': 15, 'twitter': 6, 'facebook': 6, 'minds': 5, 'gab': 5}
+    
+    for platform, tags in base_hashtags.items():
+        limit = limits.get(platform, 10)
+        formatted_tags = ' '.join(f'#{tag}' for tag in tags[:limit])
+        hashtags[platform] = formatted_tags
+    
     artist_display = artist if artist.strip() else "Anonymous Artist"
     by_artist = f" - {artist_display}" if artist.strip() else ""
     
@@ -197,7 +189,7 @@ Give it a listen and support independent creators!
 {hashtags['gab']}"""
         }
     else:
-        # Anonymous content (same structure, different text)
+        # Anonymous content
         return {
             'youtube': f"""🎵 {title} 🎵
 
@@ -258,7 +250,7 @@ Give it a listen and support independent creators!
         }
 
 def generate_all_content(lyrics, artist, title, use_modal):
-    """Generate content with Modal toggle and robust error handling"""
+    """Generate content with Modal toggle"""
     if not lyrics.strip() or not title.strip():
         error_msg = "❌ Please provide both lyrics and song title"
         return [""] * 6 + [error_msg]
@@ -275,12 +267,12 @@ def generate_all_content(lyrics, artist, title, use_modal):
     
     try:
         if use_modal and MODAL_AVAILABLE and generate_content_with_llm:
-            # Try Modal generation with additional error handling
+            # Try Modal AI generation
             try:
                 logger.info("🔄 Attempting Modal AI generation...")
                 result = generate_content_with_llm.remote(lyrics, artist, title)
                 
-                # Validate the result
+                # Validate result
                 if isinstance(result, dict) and len(result) > 0:
                     content = result
                     status_msg = f"✅ Generated with Modal AI in {time.time() - start_time:.2f}s"
@@ -347,13 +339,13 @@ with gr.Blocks(theme=gr.themes.Soft(), title="🎵 Music Content Creator") as de
                 info="The title of your song"
             )
             
-            # Modal toggle with clear labeling
+            # Modal toggle
             modal_toggle = gr.Radio(
                 choices=[
                     ("🤖 AI Generation (Modal)", True),
                     ("📝 Local Templates", False)
                 ],
-                value=False,  # Default to Local to avoid authentication issues
+                value=MODAL_AVAILABLE,  # Default to Modal if available, otherwise local
                 label="Generation Method",
                 info="Choose between AI-powered generation or local templates"
             )
@@ -388,13 +380,13 @@ with gr.Blocks(theme=gr.themes.Soft(), title="🎵 Music Content Creator") as de
                 "Here's an example with some sample lyrics\nAbout dreams and aspirations\nReaching for the stars tonight\nNothing's gonna stop this fight\nWe'll keep on climbing higher\nUntil we touch the sky",
                 "",  # Empty artist name
                 "Dreams Tonight",
-                False  # Default to local generation
+                MODAL_AVAILABLE  # Use Modal if available
             ],
             [
                 "Love is in the air tonight\nHearts beating as one\nDancing under moonlight\nUntil the morning sun\nThis feeling never ends\nLove conquers all",
                 "Romantic Vibes",
                 "Moonlight Dance",
-                True  # Try Modal if available
+                False  # Use local generation
             ]
         ],
         inputs=[lyrics_input, artist_input, title_input, modal_toggle],
@@ -405,12 +397,12 @@ with gr.Blocks(theme=gr.themes.Soft(), title="🎵 Music Content Creator") as de
     gr.Markdown(f"""
     ---
     **💡 Tips:**
-    - **AI Generation:** Uses GPT-2 on Modal for creative, context-aware content {"(Currently experiencing authentication issues)" if not MODAL_AVAILABLE else ""}
+    - **AI Generation:** Uses GPT-2 on Modal for creative, context-aware content
     - **Local Templates:** Fast, rule-based generation that always works
     - **Modal Credits:** Can be used for LLM inference and GPU-intensive functions ([Modal Docs](https://modal.com/docs))
     - **Best Results:** Include rich, descriptive lyrics for better theme detection
     
-    **🔧 Current Status:** Modal connection {"✅ Working" if MODAL_AVAILABLE else "❌ Authentication Issue - Using Local Generation"}
+    **🔧 Status:** {"✅ Modal Working" if MODAL_AVAILABLE else "🟡 Local Mode Only"}
     """)
 
 if __name__ == "__main__":