Update app.py

app.py

@@ -182,68 +182,54 @@ class MoodTheme(Base):
         self._apply_mood_styling()
     
     def _map_hex_to_gradio_color(self, hex_color: str):
-        """Map hex colors to the closest available Gradio color."""
-        # Convert hex to RGB for better color matching
-        hex_color = hex_color.lstrip('#')
-        try:
-            r, g, b = tuple(int(hex_color[i:i+2], 16) for i in (0, 2, 4))
-            
-            # Enhanced color mapping based on RGB values
-            if r > 200 and g < 100 and b < 100:  # Red family
-                if r > 220 and g < 50:
-                    return colors.red
-                else:
-                    return colors.rose
-            elif r > 150 and g > 100 and b < 100:  # Orange family
-                return colors.orange
-            elif r > 200 and g > 150 and b < 100:  # Yellow family
-                if g > 200:
-                    return colors.yellow
-                else:
-                    return colors.amber
-            elif r < 150 and g > 150 and b < 150:  # Green family
-                if g > 200:
-                    return colors.lime
-                elif r < 100:
-                    return colors.green
-                else:
-                    return colors.emerald
-            elif r < 150 and g > 100 and b > 150:  # Blue-green family
-                if g > b:
-                    return colors.teal
-                else:
-                    return colors.cyan
-            elif r < 150 and g < 150 and b > 150:  # Blue family
-                if b > 200:
-                    return colors.blue
-                elif r < 100 and g < 100:
-                    return colors.indigo
-                else:
-                    return colors.sky
-            elif r > 100 and g < 150 and b > 150:  # Purple family
-                if r > b:
-                    return colors.pink
-                elif b > 150:
-                    return colors.violet
-                else:
-                    return colors.purple
-            elif r > 150 and g < 150 and b > 100:  # Pink/Magenta family
-                return colors.fuchsia
-            elif r < 100 and g < 100 and b < 100:  # Dark colors
-                return colors.gray
-            elif r > 200 and g > 200 and b > 200:  # Light colors
-                return colors.neutral
-            else:
-                # Default fallback based on dominant color
-                if r >= g and r >= b:
-                    return colors.red
-                elif g >= r and g >= b:
-                    return colors.green
-                else:
-                    return colors.blue
-                    
-        except (ValueError, IndexError):
-            return colors.blue
+        """Map hex colors to deliberately different Gradio colors."""
+        # Create a more aggressive mapping to ensure variety
+        color_mapping = {
+            # Reds - map to different red variants
+            "#DC143C": colors.red,     # Crimson
+            "#FF2400": colors.rose,    # Scarlet  
+            "#8B0000": colors.red,     # Dark red
+            
+            # Oranges
+            "#FF7F50": colors.orange,  # Coral
+            "#F28500": colors.amber,   # Tangerine
+            "#FF7518": colors.orange,  # Pumpkin
+            
+            # Yellows/Golds
+            "#FFD700": colors.yellow,  # Gold
+            "#F7E7CE": colors.amber,   # Champagne
+            "#FFFACD": colors.yellow,  # Lemon Chiffon
+            
+            # Greens
+            "#32CD32": colors.lime,    # Lime Green
+            "#228B22": colors.green,   # Forest Green
+            "#50C878": colors.emerald, # Emerald
+            
+            # Blues
+            "#4169E1": colors.blue,    # Royal Blue
+            "#87CEEB": colors.sky,     # Sky Blue
+            "#0F52BA": colors.indigo,  # Sapphire
+            
+            # Purples
+            "#4B0082": colors.indigo,  # Indigo
+            "#800080": colors.purple,  # Purple
+            "#DDA0DD": colors.violet,  # Plum
+            
+            # Pinks
+            "#FF69B4": colors.pink,    # Hot Pink
+            "#FF00FF": colors.fuchsia, # Magenta
+            
+            # Teals/Cyans
+            "#008080": colors.teal,    # Teal
+            "#40E0D0": colors.cyan,    # Turquoise
+            
+            # Grays/Browns
+            "#708090": colors.slate,   # Slate Gray
+            "#36454F": colors.gray,    # Charcoal
+            "#6F4E37": colors.stone,   # Coffee
+        }
+        
+        return color_mapping.get(hex_color, colors.blue)
     
     def _apply_mood_styling(self):
         """Apply additional styling based on mood colors and fonts."""
@@ -537,56 +523,50 @@ class MoodThemeGenerator:
     def publish_theme(self, theme_name: str, version: str = "1.0.0") -> str:
         """Publish the current theme to HuggingFace Hub."""
         if not self.current_theme_data:
-            return "❌ No theme data available. Please generate a theme first."
+            return "No theme data available. Please generate a theme first."
         
         if not self.config.HF_TOKEN:
-            return "❌ HuggingFace token not found. Please set HF_TOKEN environment variable."
+            return "HuggingFace token not found. Please set HF_TOKEN environment variable."
+        
+        # DEBUG: Print what we're actually working with
+        print("=== DEBUG INFO ===")
+        print(f"Colors: {[(c['name'], c['hex']) for c in self.current_theme_data['colors'][:3]]}")
+        print(f"Fonts: {[f['name'] for f in self.current_theme_data['fonts'][:2]]}")
         
         try:
-            # Debug: Print current theme data
-            colors_info = [f"{c['name']} ({c['hex']})" for c in self.current_theme_data['colors']]
-            fonts_info = [f['name'] for f in self.current_theme_data['fonts']]
-            
-            debug_info = f"Creating theme with:\n"
-            debug_info += f"Colors: {', '.join(colors_info[:3])}\n"
-            debug_info += f"Fonts: {', '.join(fonts_info[:2])}\n"
-            
-            # Create a proper theme instance with debug info
+            # Create theme with more distinct differentiation
             mood_theme = MoodTheme(
-                mood_colors=self.current_theme_data['colors'][:3],  # Use only first 3 colors
-                mood_fonts=self.current_theme_data['fonts'][:2],   # Use only first 2 fonts
-                theme_name=theme_name.replace('-', '_').replace(' ', '_')  # Clean theme name
+                mood_colors=self.current_theme_data['colors'][:3],
+                mood_fonts=self.current_theme_data['fonts'][:2],
+                theme_name=theme_name.replace('-', '_').replace(' ', '_')
             )
             
-            # Create a unique repo name with timestamp
+            # Additional forced differentiation based on first color
+            first_color = self.current_theme_data['colors'][0]['hex']
+            if first_color in ['#DC143C', '#FF2400', '#8B0000']:  # Red family
+                mood_theme.set(button_primary_background_fill="#8B0000")
+            elif first_color in ['#FFD700', '#F7E7CE', '#FFFACD']:  # Yellow/Gold family  
+                mood_theme.set(button_primary_background_fill="#DAA520")
+            elif first_color in ['#228B22', '#32CD32', '#50C878']:  # Green family
+                mood_theme.set(button_primary_background_fill="#006400")
+            elif first_color in ['#4169E1', '#87CEEB', '#0F52BA']:  # Blue family
+                mood_theme.set(button_primary_background_fill="#000080")
+            else:
+                mood_theme.set(button_primary_background_fill=first_color)
+            
             clean_name = theme_name.lower().replace(' ', '-').replace('_', '-')
             repo_name = f"{clean_name}-{int(time.time())}"
             
-            # Push to hub with error handling
-            result = mood_theme.push_to_hub(
+            mood_theme.push_to_hub(
                 repo_name=repo_name,
                 version=version,
                 hf_token=self.config.HF_TOKEN
             )
             
-            success_msg = f"✅ Theme successfully published!\n\n"
-            success_msg += debug_info
-            success_msg += f"\n📍 Repository: {repo_name}\n"
-            success_msg += f"🔗 Use with: gr.Theme.from_hub('{repo_name}')\n"
-            success_msg += f"🌐 Preview: https://huggingface.co/spaces/{repo_name}"
-            
-            return success_msg
+            return f"Theme published: {repo_name}\nFirst color: {first_color}\nFirst font: {self.current_theme_data['fonts'][0]['name']}"
             
         except Exception as e:
-            error_msg = f"❌ Error publishing theme: {str(e)}\n\n"
-            if "colors" in str(e).lower():
-                error_msg += "💡 This might be a color formatting issue. "
-            elif "font" in str(e).lower():
-                error_msg += "💡 This might be a font loading issue. "
-            else:
-                error_msg += "💡 Check your HuggingFace token and internet connection. "
-            
-            return error_msg
+            return f"Error publishing theme: {str(e)}"
 
     def clear_theme(self) -> tuple[str, str, str]:
         """Clear the current theme."""