Refactor message handling to use _fn_send_text for consistent text and audio responses; update voice reply prompt for a playful tone.

app.py

@@ -86,6 +86,7 @@ class BotClient:
             files = [("file",(os.path.basename(file_path),f,mime))]
             return self.send(endpoint,payload,files=files)
 
+# Validate env
 BotConfig.validate()
 client = BotClient(BotConfig)
 
@@ -115,11 +116,11 @@ for _ in range(4):
 
 def _fn_summarize(mid, cid, text):
     s = generate_llm(f"Summarize:\n\n{text}")
-    client.send_message(mid,cid,s)
+    _fn_send_text(mid, cid, s)
 
 def _fn_translate(mid, cid, lang, text):
     r = generate_llm(f"Translate to {lang}:\n\n{text}")
-    client.send_message(mid,cid,r)
+    _fn_send_text(mid, cid, r)
 
 def _fn_joke(mid, cid):
     try:
@@ -127,82 +128,92 @@ def _fn_joke(mid, cid):
         joke = f"{j['setup']}\n\n{j['punchline']}"
     except:
         joke = generate_llm("Tell me a short joke.")
-    client.send_message(mid,cid,joke)
+    _fn_send_text(mid, cid, joke)
 
-def _fn_weather(mid,cid,loc):
+def _fn_weather(mid, cid, loc):
     raw = requests.get(f"http://sl.wttr.in/{loc}?format=4",timeout=5).text
     r = generate_llm(f"Give a weather report in °C:\n\n{raw}")
-    client.send_message(mid,cid,r)
-    task_queue.put({"type":"audio","message_id":mid,"chat_id":cid,"prompt":r})
+    _fn_send_text(mid, cid, r)
 
-def _fn_inspire(mid,cid):
-    q = generate_llm("Give me a unique random short inspirational quote.")
-    client.send_message(mid,cid,f"✨ {q}")
+def _fn_inspire(mid, cid):
+    q = generate_llm("Give me a unique, random short inspirational quote.")
+    _fn_send_text(mid, cid, f"✨ {q}")
 
-def _fn_meme(mid,cid,txt):
-    client.send_message(mid,cid,"🎨 Generating meme…")
+def _fn_meme(mid, cid, txt):
+    client.send_message(mid, cid, "🎨 Generating meme…")
     task_queue.put({"type":"image","message_id":mid,"chat_id":cid,"prompt":f"meme: {txt}"})
 
-def _fn_poll_create(mid,cid,question,options):
+def _fn_poll_create(mid, cid, question, options):
     votes = {i+1:0 for i in range(len(options))}
     polls[cid] = {"question":question,"options":options,"votes":votes,"voters":{}}
     text = f"📊 *Poll:* {question}\n" + "\n".join(f"{i+1}. {o}" for i,o in enumerate(options))
-    client.send_message(mid,cid,text)
+    _fn_send_text(mid, cid, text)
 
-def _fn_poll_vote(mid,cid,voter,choice):
+def _fn_poll_vote(mid, cid, voter, choice):
     poll = polls.get(cid)
     if not poll or choice<1 or choice>len(poll["options"]): return
     prev = poll["voters"].get(voter)
     if prev: poll["votes"][prev]-=1
     poll["votes"][choice]+=1
     poll["voters"][voter]=choice
-    client.send_message(mid,cid,f"✅ Voted for {poll['options'][choice-1]}")
+    _fn_send_text(mid, cid, f"✅ Voted for {poll['options'][choice-1]}")
 
-def _fn_poll_results(mid,cid):
+def _fn_poll_results(mid, cid):
     poll = polls.get(cid)
     if not poll:
-        client.send_message(mid,cid,"No active poll.")
+        _fn_send_text(mid, cid, "No active poll.")
         return
     txt = f"📊 *Results:* {poll['question']}\n" + "\n".join(
         f"{i}. {o}: {poll['votes'][i]}" for i,o in enumerate(poll["options"],1)
     )
-    client.send_message(mid,cid,txt)
+    _fn_send_text(mid, cid, txt)
 
-def _fn_poll_end(mid,cid):
+def _fn_poll_end(mid, cid):
     poll = polls.pop(cid,None)
     if not poll:
-        client.send_message(mid,cid,"No active poll.")
+        _fn_send_text(mid, cid, "No active poll.")
         return
     txt = f"📊 *Final Results:* {poll['question']}\n" + "\n".join(
         f"{i}. {o}: {poll['votes'][i]}" for i,o in enumerate(poll["options"],1)
     )
-    client.send_message(mid,cid,txt)
+    _fn_send_text(mid, cid, txt)
 
-def _fn_generate_images(mid,cid,prompt,count=1):
+def _fn_generate_images(mid, cid, prompt, count=1):
     for i in range(1,count+1):
         try:
             img,path,ret_p,url = generate_image(prompt,mid,mid,BotConfig.IMAGE_DIR)
             formatted = "\n\n".join(f"_{p.strip()}_" for p in ret_p.split("\n\n") if p.strip())
             cap = f"✨ Image {i}/{count}: {url}\n>{chr(8203)} {formatted}"
-            client.send_media(mid,cid,path,cap,media_type="image")
+            client.send_media(mid, cid, path, cap, media_type="image")
             os.remove(path)
         except Exception as e:
             logging.warning(f"Img {i}/{count} failed: {e}")
-            client.send_message(mid,cid,f"😢 Failed to gen image {i}/{count}.")
-
-def _fn_send_text(mid,cid,message):
-    client.send_message(mid,cid,message)
-
-def _fn_voice_reply(mid,cid,prompt):
-    proccessed_prompt = f"Just say this dialog eaxcatly as it is in a flirty, frinedly, playful, happy and helpful but little bit clumsy in a cute way manner as a cute secretary: {prompt}"
-    res = generate_voice_reply(proccessed_prompt,model="openai-audio",voice="coral",audio_dir=BotConfig.AUDIO_DIR)
+            _fn_send_text(mid, cid, f"😢 Failed to generate image {i}/{count}.")
+
+def _fn_send_text(mid, cid, message):
+    # send text...
+    client.send_message(mid, cid, message)
+    # ...and queue voice with the same content
+    task_queue.put({
+        "type": "audio",
+        "message_id": mid,
+        "chat_id": cid,
+        "prompt": message
+    })
+
+def _fn_voice_reply(mid, cid, prompt):
+    processed = (
+        f"Just say this exactly as written in a flirty, friendly, playful, "
+        f"happy and helpful but a little bit clumsy-cute way: {prompt}"
+    )
+    res = generate_voice_reply(processed,model="openai-audio",voice="coral",audio_dir=BotConfig.AUDIO_DIR)
     if res and res[0]:
         path,_ = res
-        client.send_media(mid,cid,path,"",media_type="audio")
+        client.send_media(mid, cid, path, "", media_type="audio")
         os.remove(path)
     else:
-        txt = generate_llm(prompt)
-        client.send_message(mid,cid,txt)
+        # fallback to text+voice
+        _fn_send_text(mid, cid, prompt)
 
 # --- Function schema & router ---
 
@@ -210,8 +221,7 @@ FUNCTION_SCHEMA = {
     "summarize":     {"description":"Summarize text","params":["text"]},
     "translate":     {"description":"Translate text","params":["lang","text"]},
     "joke":          {"description":"Tell a joke","params":[]},
-    "weather":       {"description":"Creative weather","params":["location"]},
-    "weather_poem":  {"description":"Poetic weather","params":["location"]},
+    "weather":       {"description":"Weather report","params":["location"]},
     "inspire":       {"description":"Inspirational quote","params":[]},
     "meme":          {"description":"Generate meme","params":["text"]},
     "poll_create":   {"description":"Create poll","params":["question","options"]},
@@ -246,13 +256,11 @@ help_text = (
     "• /translate <lang>|<text>\n"
     "• /joke\n"
     "• /weather <loc>\n"
-    "• /weatherpoem <loc>\n"
     "• /inspire\n"
-    "• /trivia / /answer\n"
     "• /meme <text>\n"
     "• /poll <Q>|… / /results / /endpoll\n"
     "• /gen <prompt>|<count>\n"
-    "Otherwise chat freely or reply to one of my messages to invoke tools."
+    "Otherwise chat or reply to my message to invoke tools."
 )
 
 @app.post("/whatsapp")
@@ -276,7 +284,7 @@ async def whatsapp_webhook(request: Request):
     # Slash commands
     low = body.lower()
     if low=="/help":
-        client.send_message(mid,chat_id,help_text); return {"success":True}
+        _fn_send_text(mid,chat_id,help_text); return {"success":True}
     if low.startswith("/summarize "):
         _fn_summarize(mid,chat_id,body[11:].strip()); return {"success":True}
     if low.startswith("/translate "):
@@ -344,10 +352,8 @@ async def whatsapp_webhook(request: Request):
     if action in dispatch:
         dispatch[action]()
     else:
-        # fallback chat
-        txt = intent.get("message","Sorry, I didn't get that.")
-        _fn_send_text(mid,chat_id,txt)
-        task_queue.put({"type":"audio","message_id":mid,"chat_id":chat_id,"prompt":txt})
+        # fallback to send_text (which also queues voice)
+        _fn_send_text(mid,chat_id,intent.get("message","Sorry, I didn't get that."))
 
     return {"success":True}
 
@@ -356,7 +362,9 @@ def index():
     return "Server is running!"
 
 if __name__=="__main__":
-    client.send_message_to(BotConfig.BOT_GROUP_CHAT,
-        "🌟 Eve is online! Type /help to see commands.")
+    client.send_message_to(
+        BotConfig.BOT_GROUP_CHAT,
+        "🌟 Eve is online! Type /help to see commands."
+    )
     import uvicorn
     uvicorn.run(app,host="0.0.0.0",port=7860)