Enhance app functionality with inactivity monitoring, startup messaging, and improved command responses; update configuration for text and voice replies.

app.py

@@ -5,23 +5,25 @@ import logging
 import queue
 import re
 import json
+import time
 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
+from polLLM import generate_llm
 
 # Configure logging
 logging.basicConfig(level=logging.DEBUG, format="%(asctime)s [%(levelname)s] %(message)s")
 
 # 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_ID_INSTANCE = os.getenv("GREEN_API_ID_INSTANCE")
-WEBHOOK_AUTH_TOKEN  = os.getenv("WEBHOOK_AUTH_TOKEN")
-image_dir           = "/tmp/images"
-audio_dir           = "/tmp/audio"
+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_ID_INSTANCE= os.getenv("GREEN_API_ID_INSTANCE")
+WEBHOOK_AUTH_TOKEN   = os.getenv("WEBHOOK_AUTH_TOKEN")
+BOT_STATUS_CHAT      = "[email protected]"  # Chat ID for system messages
+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")
@@ -33,7 +35,33 @@ polls        = {}   # chat_id → {"question":…, "options":[…], "votes":{1:0
 
 app = FastAPI()
 
-# Background worker
+# Global inactivity tracker
+last_message_time = time.time()
+
+# --- Startup Announcement ---
+def send_startup_message():
+    if BOT_STATUS_CHAT:
+        msg = "🌟 Hi! I'm Eve, your friendly AI assistant. I'm now live and ready to help you with images, voice replies, and more!"
+        # Use a dummy message_id "startup"
+        send_message("startup", BOT_STATUS_CHAT, msg)
+    else:
+        logging.warning("BOT_STATUS_CHAT is not set; startup message not sent.")
+
+# --- Inactivity Monitor ---
+def inactivity_monitor():
+    global last_message_time
+    while True:
+        time.sleep(60)  # check every minute
+        if time.time() - last_message_time >= 300:  # 5 minutes inactivity
+            if BOT_STATUS_CHAT:
+                reminder = "⏰ I haven't heard from you in a while! I'm still here if you need anything."
+                send_message("inactivity", BOT_STATUS_CHAT, reminder)
+            # Reset the timer so we don't spam reminders
+            last_message_time = time.time()
+
+threading.Thread(target=inactivity_monitor, daemon=True).start()
+
+# --- Background Worker ---
 def worker():
     while True:
         task = task_queue.get()
@@ -55,7 +83,7 @@ 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}"
+    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:
@@ -63,21 +91,21 @@ def send_message(message_id, to_number, message, retries=3):
             r.raise_for_status()
             return r.json()
         except requests.RequestException as e:
-            if i == retries-1:
+            if i == retries - 1:
                 return {"error": str(e)}
 
-def send_image(message_id, to_number, image_path, caption = "Here you go!", retries=3):
+def send_image(message_id, to_number, image_path, caption="Here you go!", 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}"
+    url = f"{GREEN_API_MEDIA_URL}/waInstance{GREEN_API_ID_INSTANCE}/sendFileByUpload/{GREEN_API_TOKEN}"
     payload = {"chatId": chat_id, "caption": caption, "quotedMessageId": message_id}
-    files   = [("file", ("image.jpg", open(image_path, "rb"), "image/jpeg"))]
+    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 i == retries-1:
+            if i == retries - 1:
                 return {"error": str(e)}
 
 def send_audio(message_id, to_number, audio_path, retries=3):
@@ -85,7 +113,7 @@ def send_audio(message_id, to_number, audio_path, retries=3):
     chat_id = to_number if to_number.endswith("@g.us") else to_number
     if not os.path.exists(audio_path):
         logging.debug(f"Missing audio: {audio_path}")
-    url     = f"{GREEN_API_MEDIA_URL}/waInstance{GREEN_API_ID_INSTANCE}/sendFileByUpload/{GREEN_API_TOKEN}"
+    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:
@@ -96,17 +124,17 @@ def send_audio(message_id, to_number, audio_path, retries=3):
                     r.raise_for_status()
                     return r.json()
                 except requests.RequestException as e:
-                    if i == retries-1:
+                    if i == retries - 1:
                         return {"error": str(e)}
     except Exception as e:
         return {"error": str(e)}
 
-# --- core response fns ---
+# --- core response functions ---
 def response_text(message_id, chat_id, prompt):
     try:
         msg = generate_llm(prompt)
         send_message(message_id, chat_id, msg)
-    except:
+    except Exception:
         send_message(message_id, chat_id, "Error processing your request.")
 
 def response_audio(message_id, chat_id, prompt):
@@ -128,7 +156,7 @@ def handle_image_generation(message_id, chat_id, prompt):
     try:
         img, path, ret_prompt, url = generate_image(prompt, message_id, message_id, image_dir)
         if img:
-            # Split the ret_prompt into paragraphs and wrap each in underscores for italics.
+            # Split ret_prompt into paragraphs and italicize each
             formatted_ret_prompt = "\n\n".join(
                 f"_{paragraph.strip()}_" for paragraph in ret_prompt.split("\n\n") if paragraph.strip()
             )
@@ -144,10 +172,13 @@ def handle_image_generation(message_id, chat_id, prompt):
         logging.error("Error in handle_image_generation: %s", e)
         send_message(message_id, chat_id, "Error generating image.")
 
-# --- webhook ---
+# --- Webhook ---
 @app.post("/whatsapp")
 async def whatsapp_webhook(request: Request):
-    # auth & parse
+    global last_message_time
+    # Update last_message_time for each incoming message
+    last_message_time = time.time()
+
     auth = request.headers.get("Authorization", "").strip()
     if auth != f"Bearer {WEBHOOK_AUTH_TOKEN}":
         raise HTTPException(403, "Unauthorized")
@@ -159,77 +190,70 @@ async def whatsapp_webhook(request: Request):
         return {"success": True}
 
     logging.debug("recv: %s", data)
-    sd   = data["senderData"]
+    sd = data["senderData"]
     chat = sd["chatId"]
-    mid  = data["idMessage"]
+    mid = data["idMessage"]
     sender_jid = sd.get("sender")
 
     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",{})
+        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",{})
+        body = md["extendedTextMessageData"].get("text", "").strip()
+        ctx = md["extendedTextMessageData"].get("contextInfo", {})
     else:
         return {"success": True}
 
-    # 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
+    # --- New Commands ---
     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!"
+            "🤖 *Hi there, I'm Eve!* Here are the commands you can use:\n\n"
+            "• `/help` – Show this help message.\n"
+            "• `/summarize <text>` – Get a quick summary of your text.\n"
+            "• `/translate <language>|<text>` – Translate text to your chosen language.\n"
+            "• `/joke` – Enjoy a random, funny joke.\n"
+            "• `/weather <location>` – Get the current weather for a location.\n"
+            "• `/inspire` – Receive a short inspirational quote.\n"
+            "• `/trivia` – Start a new trivia question.\n"
+            "• `/answer` – Reveal the answer to the trivia.\n"
+            "• `/meme <text>` – Generate a fun meme image.\n"
+            "• `/poll <Question>|<Option1>|<Option2>|…` – Create a poll.\n"
+            "• `/results` – See current poll results.\n"
+            "• `/endpoll` – End the poll and show final results.\n"
+            "• `/imagine <prompt>` – Generate an image from your prompt.\n\n"
+            "If you send any other text, I'll reply with a voice message. I'm here to help, so don't hesitate to ask!"
         )
         send_message(mid, chat, help_text)
         return {"success": True}
 
-    # 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`")
+            send_message(mid, chat, "Please use `/translate <language>|<text>`")
         else:
-            lang, txt = part.split("|",1)
+            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()
@@ -238,7 +262,6 @@ async def whatsapp_webhook(request: Request):
             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:
@@ -248,13 +271,11 @@ async def whatsapp_webhook(request: Request):
             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: "
@@ -263,21 +284,19 @@ async def whatsapp_webhook(request: Request):
         try:
             obj = json.loads(raw)
             trivia_store[chat] = obj
-            send_message(mid, chat, f"❓ {obj['question']}\nReply `/answer` to see the answer.")
+            send_message(mid, chat, f"❓ {obj['question']}\nReply with `/answer` to see the answer.")
         except:
             send_message(mid, chat, "Failed to generate trivia.")
         return {"success": True}
 
-    # 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`.")
+            send_message(mid, chat, "No active trivia. Send `/trivia` to start one.")
         return {"success": True}
 
-    # MEME
     if low.startswith("/meme "):
         txt = body[len("/meme "):].strip()
         send_message(mid, chat, "🎨 Generating your meme...")
@@ -289,23 +308,21 @@ async def whatsapp_webhook(request: Request):
         })
         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[...]`")
+            send_message(mid, chat, "Please 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)
+                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]
@@ -318,37 +335,34 @@ async def whatsapp_webhook(request: Request):
             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
+                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
+                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(mid, chat, "Use `/imagine <prompt>`")
+            send_message(mid, chat, "Please use `/imagine <prompt>` to generate an image.")
         else:
-            send_message(mid, chat, "✨ Your image is being generated. \nPlease wait...")
+            send_message(mid, chat, "✨ Your image is being generated. Please wait...")
             task_queue.put({
                 "type": "image",
                 "message_id": mid,
@@ -357,7 +371,7 @@ async def whatsapp_webhook(request: Request):
             })
         return {"success": True}
 
-    # fallback → voice reply
+    # Fallback: voice reply for any other text
     task_queue.put({
         "type": "audio",
         "message_id": mid,
@@ -371,5 +385,7 @@ def index():
     return "Server is running!"
 
 if __name__ == "__main__":
+    # Send startup message on launch
+    send_startup_message()
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)

config.yaml

@@ -3,7 +3,7 @@ config:
     model: koboldcpp/HF_SPACE_Tiefighter-13B
     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:
+      You generate images and voice, text replies, and support these commands:
       • /help — list all commands  
       • /imagine <prompt> — generate an image  
       • /summarize <text>  
@@ -17,7 +17,7 @@ config:
       • /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.  
+      Use a concise, friendly tone. If a command is malformed, gently ask the user to correct it. For any other message, respond via voice or text.  
     char: Eve
 
   SD:

polLLM.py

@@ -0,0 +1,37 @@
+import os
+import requests
+import urllib.parse
+from dotenv import load_dotenv
+from utils import read_config
+import random
+
+load_dotenv()
+
+def pre_process():
+    # Read the configuration and substitute the character placeholder
+    config = read_config()
+    system_prompt = config['llm']['system_prompt']
+    char = config['llm']['char']
+    return system_prompt.replace("{char}", char)
+
+def generate_llm(prompt):
+    system_prompt = pre_process()
+    # Encode the user prompt and system prompt for URL safety
+    encoded_prompt = urllib.parse.quote(prompt)
+    encoded_system = urllib.parse.quote(system_prompt)
+    # Build the GET request URL for Pollinations' text API
+    randomSeed = random.randint(0, 999999)
+    url = f"https://text.pollinations.ai/{encoded_prompt}?model=openai&private=true&seed={randomSeed}&system={encoded_system}"
+    
+    try:
+        response = requests.get(url, timeout=30)
+        response.raise_for_status()
+        # Return the generated text (stripping any extra whitespace)
+        return response.text.strip()
+    except Exception as e:
+        return f"Error: {str(e)}"
+
+# Example usage (can be removed or commented out in production):
+if __name__ == "__main__":
+    sample_prompt = "What is the capital of France?"
+    print("Response:", generate_llm(sample_prompt))