Refactor prepare_tables function to use psycopg2 for PostgreSQL connection and table creation

app.py

@@ -7,6 +7,8 @@ import queue
 import re
 import json
 import requests
+import psycopg2
+from urllib.parse import urlparse
 
 from fastapi import FastAPI, Request, HTTPException
 from fastapi.responses import PlainTextResponse, JSONResponse
@@ -25,18 +27,21 @@ GREEN_API_MEDIA_URL   = os.getenv("GREEN_API_MEDIA_URL", "https://api.green-api.
 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_GROUP_CHAT        = os.getenv("BOT_GROUP_CHAT")  # must be a group chat ID
+BOT_GROUP_CHAT        = os.getenv("BOT_GROUP_CHAT")   # must be a group chat ID
 IMAGE_DIR             = "/tmp/images"
 AUDIO_DIR             = "/tmp/audio"
 
-# Supabase
+# Supabase client (for data ops)
 SUPABASE_URL    = os.getenv("SUPABASE_URL")
 SUPABASE_KEY    = os.getenv("SUPABASE_KEY")
 supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
 
+# Postgres URL for psycopg2 (same as SUPABASE_URL)
+DATABASE_URL = os.getenv("DATABASE_URL") or SUPABASE_URL
+
 if not all([GREEN_API_URL, GREEN_API_TOKEN, GREEN_API_ID_INSTANCE,
             WEBHOOK_AUTH_TOKEN, BOT_GROUP_CHAT,
-            SUPABASE_URL, SUPABASE_KEY]):
+            SUPABASE_URL, SUPABASE_KEY, DATABASE_URL]):
     raise ValueError("One or more environment variables are not set properly")
 
 # Queues & stores
@@ -47,20 +52,30 @@ last_message_time = time.time()
 
 app = FastAPI()
 
-# ————— Supabase Schema Prep —————
+# ————— Schema Provisioning via psycopg2 —————
 def prepare_tables():
     """
-    Ensure 'users' and 'images' tables exist. Creates them if they don't.
-    Uses postgrest.raw() to execute raw SQL.
+    Connect via psycopg2 and ensure the 'users' and 'images' tables exist.
     """
-    users_sql = """
+    # Parse DATABASE_URL
+    result = urlparse(DATABASE_URL)
+    conn = psycopg2.connect(
+        dbname=result.path.lstrip("/"),
+        user=result.username,
+        password=result.password,
+        host=result.hostname,
+        port=result.port
+    )
+    conn.autocommit = True
+    cur = conn.cursor()
+    cur.execute("""
       CREATE TABLE IF NOT EXISTS users (
         id SERIAL PRIMARY KEY,
         chat_id TEXT UNIQUE NOT NULL,
         created_at BIGINT NOT NULL
       );
-    """
-    images_sql = """
+    """)
+    cur.execute("""
       CREATE TABLE IF NOT EXISTS images (
         id SERIAL PRIMARY KEY,
         chat_id TEXT NOT NULL,
@@ -68,9 +83,9 @@ def prepare_tables():
         url TEXT NOT NULL,
         created_at BIGINT NOT NULL
       );
-    """
-    supabase.postgrest.raw(users_sql).execute()
-    supabase.postgrest.raw(images_sql).execute()
+    """)
+    cur.close()
+    conn.close()
 
 # ————— Inactivity Monitor —————
 def inactivity_monitor():
@@ -316,8 +331,7 @@ async def whatsapp_webhook(request: Request):
         send_message(mid, chat_id, f"✨ {generate_llm('Give me an inspirational quote.')}")
         return {"success": True}
 
-    # trivia, answer, meme, poll, results, endpoll omitted for brevity—
-    # just queue tasks as before
+    # … trivia, polls omitted for brevity …
 
     if low.startswith("/meme "):
         prompt = body[len("/meme "):].strip()
@@ -340,7 +354,7 @@ def index():
     return "Eve is running! 💖"
 
 if __name__ == "__main__":
-    # 1) prepare Supabase schema
+    # 1) provision schema
     prepare_tables()
 
     # 2) start background threads