Tolerate copy-paste mistakes in DATABASE_URL

platform_app/core.py

@@ -2,6 +2,7 @@
 import json
 import logging
 import os
+import re
 import threading
 import time
 from typing import Any, Dict, List, Optional
@@ -14,7 +15,22 @@ logger = logging.getLogger("evalbot.platform")
 # --------------------------------------------------------------------------------------
 # Settings (all from environment / Space secrets)
 # --------------------------------------------------------------------------------------
-DATABASE_URL = os.getenv("DATABASE_URL", "")
+def _normalize_db_url(raw: str) -> str:
+    """Forgive common copy-paste mistakes in the DATABASE_URL secret: stray spaces or newlines,
+    the [ ] placeholder brackets left around the password, and unescaped symbols in the password."""
+    from urllib.parse import quote, unquote
+
+    url = re.sub(r"\s+", "", raw or "")
+    m = re.match(r"^(postgres(?:ql)?://)([^:/@]+):(.*)@([^@]+)$", url)
+    if not m:
+        return url
+    scheme, user, password, rest = m.groups()
+    if password.startswith("[") and password.endswith("]"):
+        password = password[1:-1]
+    return f"{scheme}{user}:{quote(unquote(password), safe='')}@{rest}"
+
+
+DATABASE_URL = _normalize_db_url(os.getenv("DATABASE_URL", ""))
 SUPABASE_URL = os.getenv("SUPABASE_URL", "").rstrip("/")
 SUPABASE_ANON_KEY = os.getenv("SUPABASE_ANON_KEY", "")
 SUPABASE_SERVICE_ROLE_KEY = os.getenv("SUPABASE_SERVICE_ROLE_KEY", "")