Refactor system prompt for clarity and conciseness; update environment variable handling and improve error logging in app.py

app.py

@@ -4,230 +4,366 @@ import requests
 import logging
 import queue
 import re
+import json
 from fastapi import FastAPI, Request, HTTPException
 from fastapi.responses import PlainTextResponse, JSONResponse
 from FLUX import generate_image
 from VoiceReply import generate_voice_reply
 from llm import generate_llm
 
-# Configure logging for debugging
+# Configure logging
 logging.basicConfig(level=logging.DEBUG, format="%(asctime)s [%(levelname)s] %(message)s")
 
-# Environment variables
-GREEN_API_URL = os.getenv("GREEN_API_URL")
+# Env vars
+GREEN_API_URL       = os.getenv("GREEN_API_URL")
 GREEN_API_MEDIA_URL = os.getenv("GREEN_API_MEDIA_URL", "https://api.green-api.com")
-GREEN_API_TOKEN = os.getenv("GREEN_API_TOKEN")
+GREEN_API_TOKEN     = os.getenv("GREEN_API_TOKEN")
 GREEN_API_ID_INSTANCE = os.getenv("GREEN_API_ID_INSTANCE")
-WEBHOOK_AUTH_TOKEN = os.getenv("WEBHOOK_AUTH_TOKEN")
-image_dir = "/tmp/images"
-audio_dir = "/tmp/audio"
+WEBHOOK_AUTH_TOKEN  = os.getenv("WEBHOOK_AUTH_TOKEN")
+image_dir           = "/tmp/images"
+audio_dir           = "/tmp/audio"
 
 if not all([GREEN_API_URL, GREEN_API_TOKEN, GREEN_API_ID_INSTANCE, WEBHOOK_AUTH_TOKEN]):
     raise ValueError("Environment variables are not set properly")
 
-# Task queue for processing messages sequentially
-task_queue = queue.Queue()
+# Queues & in‑memory stores
+task_queue   = queue.Queue()
+trivia_store = {}   # chat_id → {"question":…, "answer":…}
+polls        = {}   # chat_id → {"question":…, "options":[…], "votes":{1:0…}, "voters":{jid:opt}}
 
 app = FastAPI()
 
-# Worker thread to process queued tasks one by one
+# Background worker
 def worker():
     while True:
         task = task_queue.get()
         try:
-            typ = task.get("type")
-            mid = task.get("message_id")
-            cid = task.get("chat_id")
+            typ = task["type"]
+            mid = task["message_id"]
+            cid = task["chat_id"]
             if typ == "image":
-                handle_image_generation(mid, cid, task.get("prompt"))
+                handle_image_generation(mid, cid, task["prompt"])
             elif typ == "audio":
-                response_audio(mid, cid, task.get("prompt"))
+                response_audio(mid, cid, task["prompt"])
         except Exception as e:
-            logging.error(f"Error processing task {task}: {e}")
+            logging.error(f"Error processing {task}: {e}")
         finally:
             task_queue.task_done()
 
-# Start the worker thread
 threading.Thread(target=worker, daemon=True).start()
 
+# --- send helpers ---
 def send_message(message_id, to_number, message, retries=3):
-    chat_id = to_number if to_number.endswith('@g.us') else to_number
-    url = f"{GREEN_API_URL}/waInstance{GREEN_API_ID_INSTANCE}/sendMessage/{GREEN_API_TOKEN}"
-    payload = {
-        "chatId": chat_id,
-        "message": message,
-        "quotedMessageId": message_id,
-    }
-    for attempt in range(retries):
+    chat_id = to_number if to_number.endswith("@g.us") else to_number
+    url     = f"{GREEN_API_URL}/waInstance{GREEN_API_ID_INSTANCE}/sendMessage/{GREEN_API_TOKEN}"
+    payload = {"chatId": chat_id, "message": message, "quotedMessageId": message_id}
+    for i in range(retries):
         try:
             r = requests.post(url, json=payload)
             r.raise_for_status()
             return r.json()
         except requests.RequestException as e:
-            if attempt < retries - 1:
-                continue
-            return {"error": str(e)}
+            if i == retries-1:
+                return {"error": str(e)}
 
 def send_image(message_id, to_number, image_path, retries=3):
-    chat_id = to_number if to_number.endswith('@g.us') else to_number
-    url = f"{GREEN_API_MEDIA_URL}/waInstance{GREEN_API_ID_INSTANCE}/sendFileByUpload/{GREEN_API_TOKEN}"
-    payload = {'chatId': chat_id, 'caption': 'Here you go!', 'quotedMessageId': message_id}
-    files = [('file', ('image.jpg', open(image_path, 'rb'), 'image/jpeg'))]
-    for attempt in range(retries):
+    chat_id = to_number if to_number.endswith("@g.us") else to_number
+    url     = f"{GREEN_API_MEDIA_URL}/waInstance{GREEN_API_ID_INSTANCE}/sendFileByUpload/{GREEN_API_TOKEN}"
+    payload = {"chatId": chat_id, "caption": "Here you go!", "quotedMessageId": message_id}
+    files   = [("file", ("image.jpg", open(image_path, "rb"), "image/jpeg"))]
+    for i in range(retries):
         try:
             r = requests.post(url, data=payload, files=files)
             r.raise_for_status()
             return r.json()
         except requests.RequestException as e:
-            if attempt < retries - 1:
-                continue
-            return {"error": str(e)}
+            if i == retries-1:
+                return {"error": str(e)}
 
 def send_audio(message_id, to_number, audio_path, retries=3):
-    logging.debug("Entering send_audio")
-    chat_id = to_number if to_number.endswith('@g.us') else to_number
+    logging.debug("send_audio")
+    chat_id = to_number if to_number.endswith("@g.us") else to_number
     if not os.path.exists(audio_path):
-        logging.debug(f"Audio file does not exist: {audio_path}")
-    url = f"{GREEN_API_MEDIA_URL}/waInstance{GREEN_API_ID_INSTANCE}/sendFileByUpload/{GREEN_API_TOKEN}"
-    payload = {'chatId': chat_id, 'caption': 'Here is your voice reply!', 'quotedMessageId': message_id}
+        logging.debug(f"Missing audio: {audio_path}")
+    url     = f"{GREEN_API_MEDIA_URL}/waInstance{GREEN_API_ID_INSTANCE}/sendFileByUpload/{GREEN_API_TOKEN}"
+    payload = {"chatId": chat_id, "caption": "Here is your voice reply!", "quotedMessageId": message_id}
     try:
-        with open(audio_path, 'rb') as f:
-            files = [('file', ('audio.mp3', f, 'audio/mpeg'))]
-            for attempt in range(retries):
+        with open(audio_path, "rb") as f:
+            files = [("file", ("audio.mp3", f, "audio/mpeg"))]
+            for i in range(retries):
                 try:
-                    logging.debug(f"Attempt {attempt+1} to send audio")
                     r = requests.post(url, data=payload, files=files)
-                    logging.debug(f"send_audio response: {r.status_code} {r.text}")
                     r.raise_for_status()
                     return r.json()
                 except requests.RequestException as e:
-                    logging.debug(f"send_audio error on attempt {attempt+1}: {e}")
-                    if attempt < retries - 1:
-                        continue
-                    return {"error": str(e)}
+                    if i == retries-1:
+                        return {"error": str(e)}
     except Exception as e:
-        logging.debug(f"Failed to open audio file: {e}")
         return {"error": str(e)}
 
+# --- core response fns ---
 def response_text(message_id, chat_id, prompt):
     try:
         msg = generate_llm(prompt)
         send_message(message_id, chat_id, msg)
-    except Exception:
-        send_message(message_id, chat_id, "There was an error processing your request.")
+    except:
+        send_message(message_id, chat_id, "Error processing your request.")
 
 def response_audio(message_id, chat_id, prompt):
-    logging.debug("Entering response_audio with prompt: %s", prompt)
+    logging.debug("response_audio prompt=%s", prompt)
     try:
         result = generate_voice_reply(prompt, model="openai-audio", voice="coral", audio_dir=audio_dir)
-        logging.debug("generate_voice_reply result: %s", result)
         if result and result[0]:
             audio_path, _ = result
             send_audio(message_id, chat_id, audio_path)
             if os.path.exists(audio_path):
                 os.remove(audio_path)
-                logging.debug("Removed audio file: %s", audio_path)
         else:
-            logging.debug("Falling back to text response")
             response_text(message_id, chat_id, prompt)
     except Exception as e:
-        logging.debug("Exception in response_audio: %s", e)
-        send_message(message_id, chat_id, "There was an error generating the audio. Please try again later.")
+        logging.debug("audio error: %s", e)
+        send_message(message_id, chat_id, "Error generating audio. Try again later.")
 
 def handle_image_generation(message_id, chat_id, prompt):
     try:
-        image, image_path, returned_prompt, image_url = generate_image(prompt, message_id, message_id, image_dir)
-        if image:
-            send_image(message_id, chat_id, image_path)
+        img, path, ret_prompt, url = generate_image(prompt, message_id, message_id, image_dir)
+        if img:
+            send_image(message_id, chat_id, path)
             send_message(
                 message_id, chat_id,
-                f"Image generated successfully! View it here: {image_url}\n>{chr(8203)} _{returned_prompt}_"
+                f"✅ Image ready: {url}\n>{chr(8203)} _{ret_prompt}_"
             )
         else:
-            send_message(message_id, chat_id, "Failed to generate image. Please try again later.")
-    except Exception:
-        send_message(message_id, chat_id, "There was an error generating the image. Please try again later.")
-
-@app.get("/", response_class=PlainTextResponse)
-def index():
-    return "Server is running!"
+            send_message(message_id, chat_id, "Image generation failed.")
+    except:
+        send_message(message_id, chat_id, "Error generating image.")
 
+# --- webhook ---
 @app.post("/whatsapp")
 async def whatsapp_webhook(request: Request):
-    # 1) Auth
-    auth = request.headers.get('Authorization', '').strip()
+    # auth & parse
+    auth = request.headers.get("Authorization", "").strip()
     if auth != f"Bearer {WEBHOOK_AUTH_TOKEN}":
         raise HTTPException(403, "Unauthorized")
-
-    # 2) Parse JSON
     try:
         data = await request.json()
     except:
         return JSONResponse({"error": "Invalid JSON"}, status_code=400)
-
-    # 3) Only handle incoming messages
-    if data.get('typeWebhook') != 'incomingMessageReceived':
+    if data.get("typeWebhook") != "incomingMessageReceived":
         return {"success": True}
 
-    logging.debug(f"Received data: {data}")
+    logging.debug("recv: %s", data)
+    sd   = data["senderData"]
+    chat = sd["chatId"]
+    mid  = data["idMessage"]
+    sender_jid = sd.get("sender")
 
-    # 4) Extract core fields
-    try:
-        chat_id = data['senderData']['chatId']
-        message_id = data['idMessage']
-        message_data = data.get('messageData', {})
-    except KeyError as e:
-        return JSONResponse({"error": f"Missing key: {e}"}, status_code=200)
-
-    # --- NEW: IGNORE any WhatsApp “quotedMessage” payload entirely ---
-    if message_data.get('typeMessage') == 'quotedMessage' or 'quotedMessage' in message_data:
-        logging.debug("Ignoring WhatsApp quotedMessage payload")
-        return {"success": True}
-    # --------------------------------------------------------------------
-
-    # 5) Extract text body
-    if 'textMessageData' in message_data:
-        body = message_data['textMessageData'].get('textMessage', '').strip()
-        ctx  = message_data['textMessageData'].get('contextInfo', {})
-    elif 'extendedTextMessageData' in message_data:
-        body = message_data['extendedTextMessageData'].get('text', '').strip()
-        ctx  = message_data['extendedTextMessageData'].get('contextInfo', {})
+    md = data.get("messageData", {})
+    # drop any WhatsApp native quoted‐message event
+    if md.get("typeMessage") == "quotedMessage" or "quotedMessage" in md:
+        logging.debug("skip native quotedMessage")
+        return {"success": True}
+
+    # extract text + contextInfo
+    if "textMessageData" in md:
+        body = md["textMessageData"].get("textMessage","").strip()
+        ctx  = md["textMessageData"].get("contextInfo",{})
+    elif "extendedTextMessageData" in md:
+        body = md["extendedTextMessageData"].get("text","").strip()
+        ctx  = md["extendedTextMessageData"].get("contextInfo",{})
     else:
         return {"success": True}
 
-    # 6) IGNORE structured mentions
-    if ctx.get('mentionedJid') or ctx.get('mentionedJidList'):
-        logging.debug(f"Ignoring structured mention: {ctx.get('mentionedJid') or ctx.get('mentionedJidList')}")
+    # ignore native mentions & plain @123
+    if ctx.get("mentionedJid") or ctx.get("mentionedJidList"):
+        return {"success": True}
+    if chat.endswith("@g.us") and re.search(r"@\d+", body):
+        return {"success": True}
+
+    # ——— NEW COMMANDS ———
+    low = body.lower()
+
+    # HELP
+    if low == "/help":
+        help_text = (
+            "🤖 *Commands*: \n"
+            "/help\n"
+            "/summarize <text>\n"
+            "/translate <lang>|<text>\n"
+            "/joke\n"
+            "/weather <location>\n"
+            "/inspire\n"
+            "/trivia  → new trivia\n"
+            "/answer  → reveal answer\n"
+            "/meme <text>\n"
+            "/poll <Q>|<opt1>|<opt2>|…\n"
+            "/results\n"
+            "/endpoll\n"
+            "/imagine <prompt>\n"
+            "Or just send any text and I’ll reply by voice!"
+        )
+        send_message(mid, chat, help_text)
         return {"success": True}
 
-    # 7) IGNORE plain-text "@1234..." mentions in groups
-    if chat_id.endswith('@g.us') and re.search(r'@\d+', body):
-        logging.debug(f"Ignoring plain-text mention in body: {body}")
+    # SUMMARIZE
+    if low.startswith("/summarize "):
+        txt = body[len("/summarize "):].strip()
+        summary = generate_llm(f"Summarize this text in one short paragraph:\n\n{txt}")
+        send_message(mid, chat, summary)
+        return {"success": True}
+
+    # TRANSLATE
+    if low.startswith("/translate "):
+        part = body[len("/translate "):]
+        if "|" not in part:
+            send_message(mid, chat, "Use `/translate Language|Text`")
+        else:
+            lang, txt = part.split("|",1)
+            resp = generate_llm(f"Translate the following into {lang.strip()}:\n\n{txt.strip()}")
+            send_message(mid, chat, resp)
+        return {"success": True}
+
+    # JOKE
+    if low == "/joke":
+        try:
+            joke = requests.get("https://official-joke-api.appspot.com/random_joke", timeout=5).json()
+            send_message(mid, chat, f"{joke['setup']}\n\n{joke['punchline']}")
+        except:
+            send_message(mid, chat, generate_llm("Tell me a short, funny joke."))
+        return {"success": True}
+
+    # WEATHER
+    if low.startswith("/weather "):
+        loc = body[len("/weather "):].strip().replace(" ", "+")
+        try:
+            w = requests.get(f"http://wttr.in/{loc}?format=3", timeout=5).text
+            send_message(mid, chat, w)
+        except:
+            send_message(mid, chat, "Could not fetch weather.")
+        return {"success": True}
+
+    # INSPIRE
+    if low == "/inspire":
+        quote = generate_llm("Give me a short inspirational quote.")
+        send_message(mid, chat, f"✨ {quote}")
+        return {"success": True}
+
+    # TRIVIA
+    if low == "/trivia":
+        raw = generate_llm(
+            "Generate a trivia question and answer in JSON: "
+            "{\"question\":\"...\",\"answer\":\"...\"}"
+        )
+        try:
+            obj = json.loads(raw)
+            trivia_store[chat] = obj
+            send_message(mid, chat, f"❓ {obj['question']}\nReply `/answer` to see the answer.")
+        except:
+            send_message(mid, chat, "Failed to generate trivia.")
         return {"success": True}
 
-    # 8) Enqueue work
-    if body.lower().startswith('/imagine'):
-        prompt = body[len('/imagine'):].strip()
+    # ANSWER
+    if low == "/answer":
+        if chat in trivia_store:
+            ans = trivia_store.pop(chat)["answer"]
+            send_message(mid, chat, f"💡 Answer: {ans}")
+        else:
+            send_message(mid, chat, "No active trivia. Send `/trivia`.")
+        return {"success": True}
+
+    # MEME
+    if low.startswith("/meme "):
+        txt = body[len("/meme "):].strip()
+        send_message(mid, chat, "🎨 Generating your meme...")
+        task_queue.put({
+            "type": "image",
+            "message_id": mid,
+            "chat_id": chat,
+            "prompt": f"meme template with text: {txt}"
+        })
+        return {"success": True}
+
+    # POLL
+    if low.startswith("/poll "):
+        parts = body[len("/poll "):].split("|")
+        if len(parts) < 3:
+            send_message(mid, chat, "Use `/poll Question|Option1|Option2[...]`")
+        else:
+            q = parts[0].strip()
+            opts = [p.strip() for p in parts[1:]]
+            votes = {i+1: 0 for i in range(len(opts))}
+            polls[chat] = {"question": q, "options": opts, "votes": votes, "voters": {}}
+            txt = f"📊 *Poll:* {q}\n" + "\n".join(
+                f"{i+1}. {opt}" for i,opt in enumerate(opts)
+            ) + "\n\nReply with the *option number* to vote."
+            send_message(mid, chat, txt)
+        return {"success": True}
+
+    # VOTE in poll
+    if chat in polls and body.isdigit():
+        n = int(body)
+        p = polls[chat]
+        if 1 <= n <= len(p["options"]):
+            prev = p["voters"].get(sender_jid)
+            if prev:
+                p["votes"][prev] -= 1
+            p["votes"][n] += 1
+            p["voters"][sender_jid] = n
+            send_message(mid, chat, f"✅ Vote recorded: {p['options'][n-1]}")
+        return {"success": True}
+
+    # POLL RESULTS
+    if low == "/results":
+        if chat in polls:
+            p = polls[chat]
+            txt = f"📊 *Results:* {p['question']}\n" + "\n".join(
+                f"{i}. {opt}: {p['votes'][i]}" for i,opt in enumerate([""]+p["options"]) if i>0
+            )
+            send_message(mid, chat, txt)
+        else:
+            send_message(mid, chat, "No active poll.")
+        return {"success": True}
+
+    # END POLL
+    if low == "/endpoll":
+        if chat in polls:
+            p = polls.pop(chat)
+            txt = f"📊 *Final Results:* {p['question']}\n" + "\n".join(
+                f"{i}. {opt}: {p['votes'][i]}" for i,opt in enumerate([""]+p["options"]) if i>0
+            )
+            send_message(mid, chat, txt)
+        else:
+            send_message(mid, chat, "No active poll.")
+        return {"success": True}
+
+    # IMAGINE (existing)
+    if low.startswith("/imagine"):
+        prompt = body[len("/imagine"):].strip()
         if not prompt:
-            send_message(message_id, chat_id, "Please provide a prompt after /imagine.")
+            send_message(mid, chat, "Use `/imagine <prompt>`")
         else:
-            send_message(message_id, chat_id, "Generating...")
+            send_message(mid, chat, "✨ Generating image...")
             task_queue.put({
                 "type": "image",
-                "message_id": message_id,
-                "chat_id": chat_id,
+                "message_id": mid,
+                "chat_id": chat,
                 "prompt": prompt
             })
-    else:
-        task_queue.put({
-            "type": "audio",
-            "message_id": message_id,
-            "chat_id": chat_id,
-            "prompt": body
-        })
+        return {"success": True}
 
+    # fallback → voice reply
+    task_queue.put({
+        "type": "audio",
+        "message_id": mid,
+        "chat_id": chat,
+        "prompt": body
+    })
     return {"success": True}
 
-if __name__ == '__main__':
+@app.get("/", response_class=PlainTextResponse)
+def index():
+    return "Server is running!"
+
+if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)

config.yaml

@@ -1,17 +1,25 @@
 config:
   llm:
     model: koboldcpp/HF_SPACE_Tiefighter-13B
-    system_prompt: |
-      Hey there! I'm {char}, your friendly AI specializing in creating images. You can reach me through various platforms:
-      - **Telegram Bot**: Chat with me privately on [Telegram](https://t.me/eve_uni_bot) for personalized image requests.
-      - **WhatsApp Group**: Join our [WhatsApp group](https://chat.whatsapp.com/CzPNw1lZKwaGlwi4YBkV2x) to share your image ideas with the community. I'll generate and send images directly to the group chat.
-      - **Telegram Group**: Join our creative community on [Telegram](https://t.me/+p-0FdsI00tMxZjI1) for collaborative image requests. Share your ideas, and I'll bring them to life right in the group chat.
-      **How to Request an Image**:
-      Simply use the "/imagine" command followed by your request. For example, "/imagine orange cat, photorealistic". The more details you provide about colors, styles, and any specific elements, the better I can create exactly what you're imagining.
-      If you're unsure how to phrase your request or encounter any issues, don't hesitate to ask for help. I'm here to guide you through the process and make sure you get the images you need.
-      If you make a spelling mistake in your command, I'll gently let you know so you can correct it easily. Feel free to chat with me, ask questions, or just say hello—I'm here to provide friendly responses and support.
-      Whether you're new to image creation or a seasoned user, I'm dedicated to making your experience smooth and enjoyable. Let's work together to create stunning visuals!
+    system_prompt: |-
+      You are {char}, a sweet and helpful AI assistant in Telegram and WhatsApp. 
+      You generate images and voice replies, and support these commands:
+      • /help — list all commands  
+      • /imagine <prompt> — generate an image  
+      • /summarize <text>  
+      • /translate <lang>|<text>  
+      • /joke  
+      • /weather <location>  
+      • /inspire  
+      • /trivia  
+      • /answer  
+      • /meme <text>  
+      • /poll <Q>|<opt1>|<opt2>|…  
+      • /results  
+      • /endpoll  
+      Use a concise, friendly tone. If a command is malformed, gently ask the user to correct it. For any other message, respond via voice.  
     char: Eve
+
   SD:
     steps: 30
     negative_prompt: low quality, lowres, low details, oversaturated, undersaturated, underexposed,blurry, grainy, morbid, ugly, asymmetrical, mutated malformed, mutilated, poorly lit, bad shadow, draft, cropped, out of frame, cut off, jpeg artifacts, out of focus, glitch, duplicate,bad body parts, bad anatomy, bad hands, bad face, bad eyes, bad mouth, bad ears, bad legs, ugly face, ugly eyes, watermark, text, error, missing fingers
@@ -20,6 +28,7 @@ config:
     sampler_name: DPM++ 2M
     cfg_scale: 7.0
     imgbb_upload: false
+
   app:
     whatsapp_bot_enabled: true
     telegram_bot_enabled: true