Update app.py

app.py

@@ -21,15 +21,13 @@ def get_client():
 
 def generate_meme_content(idea: str):
     """
-    NEW: In a single AI call, choose the best template AND generate the text.
+    In a single AI call, choose the best template AND generate the text.
     Returns: template_name, top_text, bottom_text, error, model_used
     """
     client, error = get_client()
     if error: return None, None, None, error, None
 
-    # We "teach" the AI about our templates
     template_descriptions = "\n".join([f"- {name}: {desc}" for name, desc in TEMPLATE_GUIDANCE.items()])
-
     MODELS_TO_TRY = ["mistralai/Mistral-7B-Instruct-v0.2", "HuggingFaceH4/zephyr-7b-beta"]
     failed_models = []
 
@@ -44,7 +42,7 @@ def generate_meme_content(idea: str):
 
 **3. Generate a funny, two-line caption for the chosen template.**
 
-**4. Format your response as a valid JSON object with three keys: "template", "top_text", "bottom_text".**
+**4. Format your response as a single, valid JSON object with three keys: "template", "top_text", "bottom_text". Do not add any extra text or explanations outside of the JSON object.**
 
 Example Response:
 {{
@@ -61,9 +59,8 @@ Your JSON response:"""
             )
             response_text = response_stream.choices[0].message.content
 
-            # --- Robust JSON Parsing ---
-            # The model might sometimes add extra text or code blocks around the JSON
-            json_match = re.search(r'\{.*\}', response_text, re.DOTALL)
+            # --- FINAL FIX: Use a non-greedy regex to find the first JSON object ---
+            json_match = re.search(r'\{.*?\}', response_text, re.DOTALL)
             if not json_match:
                 failed_models.append(f"{model_id.split('/')[-1]} (bad format)")
                 continue
@@ -73,18 +70,16 @@ Your JSON response:"""
             top_text = parsed_json.get("top_text")
             bottom_text = parsed_json.get("bottom_text")
 
-            # Validate the response
             if not all([template, top_text, bottom_text]) or template not in MEME_TEMPLATES:
                 failed_models.append(f"{model_id.split('/')[-1]} (invalid content)")
                 continue
 
-            # SUCCESS!
             return template, top_text, bottom_text, None, model_id
 
-        except Exception as e:
+        except (Exception, json.JSONDecodeError) as e:
             error_msg = str(e).lower()
             if "404" in error_msg or "503" in error_msg or "is currently loading" in error_msg or "invalid json" in error_msg:
-                failed_models.append(model_id.split('/')[-1])
+                failed_models.append(f"{model_id.split('/')[-1]} ({type(e).__name__})")
                 continue
             else:
                 return None, None, None, f"❌ **AI Error:** {str(e)[:250]}", model_id
@@ -93,20 +88,17 @@ Your JSON response:"""
 
 
 def create_meme(idea: str):
-    """Main function to generate the complete meme, now without a template input."""
+    """Main function to generate the complete meme."""
     if not idea or len(idea.strip()) < 3:
         return None, "❌ Please enter a meme idea (at least 3 characters)!"
 
-    # Check for ImgFlip credentials
     imgflip_user = os.environ.get("IMGFLIP_USERNAME")
     imgflip_pass = os.environ.get("IMGFLIP_PASSWORD")
     if not imgflip_user or not imgflip_pass:
         return None, "❌ **ImgFlip Credentials Required in Secrets**"
 
-    # Call the new intelligent function
     template_name, top, bottom, error, model_used = generate_meme_content(idea)
-    if error:
-        return None, error
+    if error: return None, error
 
     template_id = MEME_TEMPLATES.get(template_name)
     url = "https://api.imgflip.com/caption_image"
@@ -144,16 +136,14 @@ def create_meme(idea: str):
     except Exception as e:
         return None, f"❌ **An unexpected error occurred:** {str(e)}"
 
-# --- CONFIGURATION & UI ---
+# --- CONFIGURATION & UI (No changes needed) ---
 
-# Maps template names to their ImgFlip IDs
 MEME_TEMPLATES = {
     "Drake": "181913649", "Distracted Boyfriend": "112126428", "Two Buttons": "87743020",
     "Expanding Brain": "93895088", "Success Kid": "61544", "Batman Slapping Robin": "438680",
     "Change My Mind": "129242436", "Woman Yelling at a Cat": "188390779", "Surprised Pikachu": "155067746",
 }
 
-# NEW: Guidance for the AI on what each template means
 TEMPLATE_GUIDANCE = {
     "Drake": "Represents choosing one thing (good) over another (bad). Good for showing preference.",
     "Distracted Boyfriend": "Represents being tempted by something new while neglecting something you already have.",
@@ -201,7 +191,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"), ti
     
     gr.Examples(examples=examples, inputs=[idea_input], label="💡 Meme Ideas to Try")
     
-    # UPDATED: The click function no longer needs the template dropdown
     generate_button.click(
         fn=create_meme,
         inputs=[idea_input],