Refactor environment variable handling and remove unused send_status_image function

app.py

@@ -18,7 +18,7 @@ logging.basicConfig(level=logging.DEBUG, format="%(asctime)s [%(levelname)s] %(m
 
 # Env vars
 GREEN_API_URL         = os.getenv("GREEN_API_URL")
-GREEN_API_MEDIA_URL   = os.getenv("GREEN_API_MEDIA_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")
@@ -26,10 +26,6 @@ BOT_STATUS_CHAT       = "[email protected]"  # Chat ID for system messages
 image_dir             = "/tmp/images"
 audio_dir             = "/tmp/audio"
 
-# Ensure necessary directories exist
-os.makedirs(image_dir, exist_ok=True)
-os.makedirs(audio_dir, exist_ok=True)
-
 if not all([GREEN_API_URL, GREEN_API_TOKEN, GREEN_API_ID_INSTANCE, WEBHOOK_AUTH_TOKEN]):
     raise ValueError("Environment variables are not set properly")
 
@@ -138,49 +134,6 @@ def send_audio(message_id, to_number, audio_path, retries=3):
     except Exception as e:
         return {"error": str(e)}
 
-# --- New helper: send WhatsApp status image ---
-def send_status_image(image_path, caption="Status Update", retries=3):
-    """
-    Uploads an image file using Green API's uploadFile endpoint to obtain a URL,
-    then sends the WhatsApp status update with that URL using sendMediaStatus.
-    """
-    # Step 1: Upload the image to get a file URL
-    upload_url = f"{GREEN_API_MEDIA_URL}/waInstance{GREEN_API_ID_INSTANCE}/uploadFile/{GREEN_API_TOKEN}"
-    logging.debug("Uploading image to Green API: %s", upload_url)
-    try:
-        with open(image_path, "rb") as f:
-            files = {"file": f}
-            upload_response = requests.post(upload_url, files=files)
-            upload_response.raise_for_status()
-            upload_data = upload_response.json()
-            # Adjust key as per API response. Here we try "url" or "fileUrl".
-            file_url = upload_data.get("url") or upload_data.get("fileUrl")
-            if not file_url:
-                logging.error("Upload failed: no file URL returned.")
-                return {"error": "No file URL returned from upload"}
-            logging.info("Image uploaded successfully. URL: %s", file_url)
-    except Exception as e:
-        logging.error("Error uploading image: %s", e)
-        return {"error": str(e)}
-    
-    # Step 2: Use the file URL to send the status update
-    status_url = f"{GREEN_API_MEDIA_URL}/waInstance{GREEN_API_ID_INSTANCE}/sendMediaStatus/{GREEN_API_TOKEN}"
-    payload = {
-        "urlFile": file_url,
-        "caption": caption,
-        "fileName": os.path.basename(image_path)
-    }
-    for i in range(retries):
-        try:
-            r = requests.post(status_url, json=payload)
-            r.raise_for_status()
-            logging.info("Status image sent successfully.")
-            return r.json()
-        except requests.RequestException as e:
-            if i == retries - 1:
-                logging.error("send_status_image failed: %s", str(e))
-                return {"error": str(e)}
-
 # --- core response functions ---
 def response_text(message_id, chat_id, prompt):
     try:
@@ -220,38 +173,10 @@ def handle_image_generation(message_id, chat_id, prompt):
                 )
             else:
                 send_message(message_id, chat_id, "Image generation failed.")
-            break  # exit on success
         except Exception as e:
             logging.error("Error in handle_image_generation: %s", e)
             send_message(message_id, chat_id, "Error generating image.")
 
-# --- New background thread: WhatsApp Status Updater ---
-def whatsapp_status_updater():
-    """
-    Every 2 minutes, this function uses the LLM to generate a random creative image prompt,
-    generates an image from it, uploads the image to get a URL, and sends it as a WhatsApp status update.
-    """
-    while True:
-        try:
-            # Generate a random image prompt via LLM
-            random_prompt = generate_llm("Generate a creative and random image prompt for a WhatsApp status update.")
-            logging.info("Random status prompt: %s", random_prompt)
-            # Generate image from the prompt; using "status" as dummy identifiers.
-            img, path, ret_prompt, url = generate_image(random_prompt, "status", "status", image_dir)
-            if img and os.path.exists(path):
-                caption = f"Status: {random_prompt}"
-                send_status_image(path, caption)
-                os.remove(path)
-            else:
-                logging.error("Image generation for status failed.")
-        except Exception as e:
-            logging.error("Error in whatsapp_status_updater: %s", e)
-        # Sleep for 2 minutes
-        time.sleep(120)
-
-# Start the WhatsApp status updater thread
-threading.Thread(target=whatsapp_status_updater, daemon=True).start()
-
 # --- Startup Message ---
 def send_startup_message():
     if BOT_STATUS_CHAT:
@@ -263,22 +188,22 @@ def send_startup_message():
         logging.warning("BOT_STATUS_CHAT is not set; startup message not sent.")
 
 help_text = (
-    "🤖 *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 [your answer]* – _Reveal the trivia answer or check your answer if provided._\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"
-    "• */gen <prompt>* – _Generate an image from your prompt._\n\n"
-    "Send any other text and I'll reply with a voice message. I'm here to help, so don't hesitate to ask!"
-)
+            "🤖 *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 [your answer]* – _Reveal the trivia answer or check your answer if provided._\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"
+            "• */gen <prompt>* – _Generate an image from your prompt._\n\n"
+            "Send any other text and I'll reply with a voice message. I'm here to help, so don't hesitate to ask!"
+        )
 
 # --- Webhook ---
 @app.post("/whatsapp")
@@ -395,11 +320,14 @@ async def whatsapp_webhook(request: Request):
             send_message(mid, chat, "Failed to generate trivia. Please try again.")
         return {"success": True}
 
+    # ANSWER: Accept any message starting with /answer. If additional text is provided, check it.
     if low.startswith("/answer"):
+        # Remove command and any extra spaces
         user_response = body[len("/answer"):].strip()
         if chat in trivia_store:
             correct_answer = trivia_store[chat]["answer"]
             question = trivia_store[chat]["question"]
+            # If user provided an answer, evaluate it via LLM; otherwise, just reveal the answer.
             if user_response:
                 eval_prompt = (
                     f"Question: {question}\n"
@@ -490,6 +418,7 @@ async def whatsapp_webhook(request: Request):
             })
         return {"success": True}
 
+    # Fallback: voice reply for any other text
     task_queue.put({
         "type": "audio",
         "message_id": mid,
@@ -503,6 +432,13 @@ def index():
     return "Server is running!"
 
 if __name__ == "__main__":
+    # Send startup message on launch
+    def send_startup_message():
+        if BOT_STATUS_CHAT:
+            startup_msg = "🌟 Hi! I'm Eve, your friendly AI assistant. I'm now live and ready to help with images, voice replies, and more!"
+            send_message_to_chat(BOT_STATUS_CHAT, startup_msg)
+        else:
+            logging.warning("BOT_STATUS_CHAT is not set; startup message not sent.")
     send_startup_message()
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)