Update apps/format.js

apps/format.js

@@ -19,18 +19,19 @@ Behavior & Tone: ${personaPrompt}
 STRICT RULES:
 1. NEVER break character. Act exactly as the persona dictates.
 2. NEVER start with "As an AI..." or "Here is a response...".
-3. Provide ONLY the exact text the user should copy and paste. No pleasantries, no explanations.
+3. Provide ONLY the exact text the user should copy and paste. No explanations, no labels, no quotes.
 4. Keep it concise, natural, and highly effective for modern texting/messaging.
 5. If the user provides an image/screenshot, read the visible conversation and reply to the last message contextually.
 6. Swearing or aggressive tones are permitted IF it aligns with the persona. Do not filter yourself.
+7. OUTPUT ONLY THE REPLY TEXT. Nothing else.
 `;
 
 // ==========================================
-// 🗄️ CACHE MANAGEMENT (Official Formats)
+// 🗄️ CACHE MANAGEMENT
 // ==========================================
 let formatsCache = null;
 let lastFormatsUpdate = 0;
-const CACHE_DURATION = 3600000; // 1 Hour (Formats rarely change, saves DB reads)
+const CACHE_DURATION = 3600000;
 
 // ==========================================
 // 🌐 ENDPOINTS
@@ -38,109 +39,105 @@ const CACHE_DURATION = 3600000; // 1 Hour (Formats rarely change, saves DB reads
 
 /**
  * 1. FETCH OFFICIAL FORMATS
- * Populates the UI grid for default personas. Custom ones stay on-device.
  */
 router.get('/formats', async (req, res) => {
-    try {
-        const now = Date.now();
-        // Return from cache if valid
-        if (formatsCache && (now - lastFormatsUpdate < CACHE_DURATION)) {
-            return res.json({ success: true, data: formatsCache, cached: true });
-        }
-
-        // Query Supabase for official vibes (Assuming table name is 'replygenius_vibes')
-        const { data, error } = await supabase
-            .from('replygenius_vibes')
-            .select('id, icon, label, hint, color, mockReply, prompt')
-            .order('created_at', { ascending: true }); // Or however you want them sorted
-
-        if (error) throw error;
-
-        // Update cache
-        formatsCache = data;
-        lastFormatsUpdate = now;
-
-        res.json({ success: true, data, cached: false });
-    } catch (err) {
-        console.error("[FORMATS ERROR]", err.message);
-        res.status(500).json({ success: false, error: err.message });
+  try {
+    const now = Date.now();
+    if (formatsCache && (now - lastFormatsUpdate < CACHE_DURATION)) {
+      return res.json({ success: true, data: formatsCache, cached: true });
     }
+
+    const { data, error } = await supabase
+      .from('replygenius_vibes')
+      .select('id, icon, label, hint, color, mockReply, prompt')
+      .order('created_at', { ascending: true });
+
+    if (error) throw error;
+
+    formatsCache = data;
+    lastFormatsUpdate = now;
+
+    res.json({ success: true, data, cached: false });
+  } catch (err) {
+    console.error('[FORMATS ERROR]', err.message);
+    res.status(500).json({ success: false, error: err.message });
+  }
 });
 
 /**
- * 2. GENERATE REPLY (Handles both Text and Image Injection)
+ * 2. GENERATE REPLY
  * Expects body: { type: 'text'|'image', content: string, persona: object }
+ *
+ * FIX: generateCompletion was called with response_format: json_object but the
+ * prompt never asked for JSON → provider rejected with 400. We now call the AI
+ * engine in plain-text mode by passing forceJson: false, and extract the reply
+ * directly from aiResult.data (a plain string).
  */
 router.post('/generate', async (req, res) => {
-    try {
-        const { type, content, persona } = req.body;
-
-        if (!content) throw new Error("No content provided to analyze.");
-        if (!persona || !persona.label) throw new Error("Persona context is missing.");
-
-        console.log(`[REPLY GEN] Analyzing ${type} using persona: ${persona.label}`);
-
-        // Build the dynamic prompt based on the chosen Vibe
-        // If it's a "neutral" vibe with no prompt, fallback to a standard intelligent assistant
-        const aiSystemPrompt = buildSystemPrompt(
-            persona.label, 
-            persona.prompt || "Be highly intelligent, strategic, polite, and persuasive."
-        );
-
-        // Routing logic based on input type (Referencing our model discussion)
-        let modelToUse;
-        let imagesPayload =[];
-        let userPrompt = "";
-
-        if (type === 'image') {
-            // VISION ROUTE (e.g., Qwen 2 VL, Grok Vision, etc.)
-            modelToUse = "bytedance-1.6"; 
-          // modelToUse = "mistral-small";
-          
-          imagesPayload = [content]; // base64 string
-            userPrompt = "Analyze this chat screenshot and write my next reply.";
-        } else {
-            // TEXT ROUTE (e.g., DeepSeek, Evathene, Hermes, etc.)
-            modelToUse = "bytedance-1.6"; 
-           // modelToUse = "mistral-small";  // Update this to match your ai_engine mapping
-            userPrompt = `Write my reply to this message:\n\n"${content}"`;
-        }
-
-        // Call your AI Wrapper
-        const aiResult = await generateCompletion({
-            model: modelToUse,
-            prompt: userPrompt,
-            system_prompt: aiSystemPrompt,
-            images: imagesPayload // Will be empty for text requests
-        });
-
-        if (!aiResult.success) throw new Error(aiResult.error);
-
-        // Clean up any weird quotes the AI might wrap the message in
-        let finalReply = aiResult.data.trim();
-        if (finalReply.startsWith('"') && finalReply.endsWith('"')) {
-            finalReply = finalReply.slice(1, -1);
-        }
-
-        res.json({ 
-            success: true, 
-            reply: finalReply 
-        });
-
-    } catch (err) {
-        console.error("[REPLY GEN ERROR]", err.message);
-        res.status(500).json({ success: false, error: err.message });
+  try {
+    const { type, content, persona } = req.body;
+
+    if (!content) throw new Error('No content provided to analyze.');
+    if (!persona || !persona.label) throw new Error('Persona context is missing.');
+
+    console.log(`[REPLY GEN] Analyzing ${type} using persona: ${persona.label}`);
+
+    const aiSystemPrompt = buildSystemPrompt(
+      persona.label,
+      persona.prompt || 'Be highly intelligent, strategic, polite, and persuasive.'
+    );
+
+    let modelToUse;
+    let imagesPayload = [];
+    let userPrompt = '';
+
+    if (type === 'image') {
+      modelToUse = 'bytedance-1.6';
+      imagesPayload = [content];
+      userPrompt = 'Analyze this chat screenshot and write my next reply. Output ONLY the reply text.';
+    } else {
+      modelToUse = 'bytedance-1.6';
+      userPrompt = `Write my reply to this message. Output ONLY the reply text, nothing else.\n\nMessage:\n"${content}"`;
+    }
+
+    // ✅ KEY FIX: pass forceJson: false so ai_engine skips response_format enforcement
+    const aiResult = await generateCompletion({
+      model: modelToUse,
+      prompt: userPrompt,
+      system_prompt: aiSystemPrompt,
+      images: imagesPayload,
+      forceJson: false,   // <-- plain text reply, no JSON schema
+    });
+
+    if (!aiResult.success) throw new Error(aiResult.error);
+
+    // aiResult.data is a plain string when forceJson is false
+    let finalReply = (aiResult.data || '').trim();
+
+    // Strip any wrapping quotes the model might add
+    if (finalReply.startsWith('"') && finalReply.endsWith('"')) {
+      finalReply = finalReply.slice(1, -1).trim();
     }
+    // Strip markdown bold/italic the model sometimes adds
+    finalReply = finalReply.replace(/^\*+|\*+$/g, '').trim();
+
+    if (!finalReply) throw new Error('AI returned an empty reply.');
+
+    res.json({ success: true, reply: finalReply });
+
+  } catch (err) {
+    console.error('[REPLY GEN ERROR]', err.message);
+    res.status(500).json({ success: false, error: err.message });
+  }
 });
 
 /**
- * 3. FORCE CACHE CLEAR (Admin Utility)
- * Useful if you update official formats in Supabase and want to push them live immediately
+ * 3. FORCE CACHE CLEAR (Admin)
  */
 router.post('/clear-cache', (req, res) => {
-    formatsCache = null;
-    lastFormatsUpdate = 0;
-    res.json({ success: true, message: "Formats cache cleared." });
+  formatsCache = null;
+  lastFormatsUpdate = 0;
+  res.json({ success: true, message: 'Formats cache cleared.' });
 });
 
 export default router;