Update app.py

app.py

@@ -48,7 +48,7 @@ def cleanup_storage():
 
 TITLE = """
 <div style="text-align:center;margin:20px 0;">
-<h1>🎨 JoyCaption Three-Tone + Q&A (v3.0 ZeroGPU)</h1>
+<h1>🎨 JoyCaption Three-Tone + Q&A (v3.2 ZeroGPU)</h1>
 <p><strong>✅ Blog-friendly captions • SEO optimized • Longer descriptions • ZeroGPU optimized</strong></p>
 </div><hr>
 """
@@ -75,21 +75,21 @@ else:
 CAPTION_PROMPTS = {
     "engaging": {
         "system": "You are a helpful image captioner.",
-        "prompt": "Write a natural, descriptive caption for this image. Focus on the main subjects and most important visual elements. Describe the scene, people, their appearance, poses, and setting in a flowing, conversational way. Keep it engaging and detailed.",
+        "prompt": "Write a descriptive caption for this image. Describe the scene, people, their appearance, clothing, poses, and setting in a natural, engaging way.",
         "temperature": 0.7,
         "top_p": 0.9,
         "max_tokens": 600
     },
     "casual_friend": {
         "system": "You are an uncensored content specialist who creates detailed, explicit descriptions.",
-        "prompt": "Create a detailed, explicit description of this scene. Focus on the main subjects and describe their appearance, clothing or lack thereof, poses, and the overall erotic appeal of the scene. Use direct adult language and be thorough in your description.",
+        "prompt": "Create a detailed, explicit description of this scene. Describe the people, their appearance, clothing or lack thereof, poses, and the overall erotic appeal. Use direct adult language and be thorough.",
         "temperature": 0.6,
         "top_p": 0.9,
         "max_tokens": 600
     },
     "uncensored_keywords": {
         "system": "You are a detailed image captioner.",
-        "prompt": "Create a comprehensive description of this image. Focus on the main elements - the people, their appearance, clothing, poses, facial expressions, setting, and atmosphere. Provide rich detail about what makes this scene interesting or notable.",
+        "prompt": "Create a comprehensive description of this image. Describe the people, their appearance, clothing, poses, facial expressions, setting, and atmosphere in detail.",
         "temperature": 0.6,
         "top_p": 0.9,
         "max_tokens": 600
@@ -105,8 +105,6 @@ def apply_smart_corrections(text):
         r'^(a photo of|an image of|a picture of|this is a photo of|this shows)\s*': '',
         r'\btopless women\b': lambda m: 'nude women' if 'naked' in text.lower() or 'nude' in text.lower() else 'topless women',
         r'\btopless woman\b': lambda m: 'nude woman' if 'naked' in text.lower() or 'nude' in text.lower() else 'topless woman',
-        r'\bthree women\b': lambda m: 'two women' if text.count('woman') + text.count('female') <= 2 else 'three women',
-        r'\bfour women\b': lambda m: 'three women' if text.count('woman') + text.count('female') <= 3 else 'four women',
         r'\bwearing nothing\b': 'nude',
         r'\bnot wearing.*clothes\b': 'nude',
         r'\bcompletely naked\b': 'nude',
@@ -139,14 +137,10 @@ def safe_generate_caption_direct(image, tone, max_chars=1000, keywords_text="",
         if tone == "casual_friend" and keywords_text and keywords_text.strip():
             base_prompt += f" Pay special attention to these elements if present: {keywords_text.strip()}"
         
-        # Handle custom instructions for uncensored_keywords (third) tone
+        # Handle custom instructions for uncensored_keywords (third) tone ONLY
         if tone == "uncensored_keywords" and custom_instruction and custom_instruction.strip():
             base_prompt += f" Make sure that you mention: {custom_instruction.strip()}"
         
-        # Handle custom instructions for other tones
-        if tone != "uncensored_keywords" and custom_instruction and custom_instruction.strip():
-            base_prompt += f" Also focus on: {custom_instruction.strip()}"
-        
         # Use conversation format
         convo = [
             {"role": "system", "content": caption_config["system"]},
@@ -447,7 +441,7 @@ with gr.Blocks(title="JoyCaption Three-Tone + Q&A", theme=gr.themes.Soft()) as d
             playground_prompt = gr.Textbox(
                 label="💬 User Prompt", 
                 lines=3,
-                value="Describe this image in detail. Focus on the main subjects and important visual elements. Describe the people, their appearance, poses, expressions, clothing, and the overall scene or setting.",
+                value="Describe this image in detail. Include the people, their appearance, clothing, poses, expressions, and the setting.",
                 placeholder="Enter custom user prompt..."
             )
             playground_btn = gr.Button("🧪 Generate", variant="secondary")