Update app.py

app.py

@@ -21,16 +21,11 @@ except ImportError:
 
 # Define environment variables for PostgreSQL connection
 # These should be set in the environment where you run this script
-#DB_HOST = os.getenv("DB_HOST")
-DB_HOST = "https://wziqfkzaqorzthpoxhjh.supabase.co"
-#DB_NAME = os.getenv("DB_NAME")
-DB_NAME = "postgres"
-#DB_USER = os.getenv("DB_USER")
-DB_USER = "postgres"
-#DB_PASSWORD = os.getenv("DB_PASSWORD")
-DB_PASSWORD = "Me21322972.........."
-#DB_PORT = os.getenv("DB_PORT", "5432") # Default PostgreSQL port
-DB_PORT = "5432"
+DB_HOST = os.getenv("DB_HOST")
+DB_NAME = os.getenv("DB_NAME")
+DB_USER = os.getenv("DB_USER")
+DB_PASSWORD = os.getenv("DB_PASSWORD")
+DB_PORT = os.getenv("DB_PORT", "5432") # Default PostgreSQL port
 
 # Define environment variables for Google Sheets authentication
 GOOGLE_BASE64_CREDENTIALS = os.getenv("GOOGLE_BASE64_CREDENTIALS")
@@ -47,16 +42,32 @@ EMBEDDING_DIM = 384 # Dimension for paraphrase-MiniLM-L6-v2
 def connect_db():
     """Establishes a connection to the PostgreSQL database."""
     print("Attempting to connect to the database...")
-    if not all([DB_HOST, DB_NAME, DB_USER, DB_PASSWORD]):
+    # Retrieve credentials inside the function in case environment variables are set after import
+    db_host = os.getenv("DB_HOST")
+    db_name = os.getenv("DB_NAME")
+    db_user = os.getenv("DB_USER")
+    db_password = os.getenv("DB_PASSWORD")
+    db_port = os.getenv("DB_PORT", "5432") # Default PostgreSQL port
+
+
+    if not all([db_host, db_name, db_user, db_password]):
         print("Error: Database credentials (DB_HOST, DB_NAME, DB_USER, DB_PASSWORD) are not fully set as environment variables.")
         return None
+
+    # *** FIX: Remove http(s):// prefix from host if present ***
+    if db_host.startswith("https://"):
+        db_host = db_host.replace("https://", "")
+    elif db_host.startswith("http://"):
+        db_host = db_host.replace("http://", "")
+    # **********************************************************
+
     try:
         conn = psycopg2.connect(
-            host=DB_HOST,
-            database=DB_NAME,
-            user=DB_USER,
-            password=DB_PASSWORD,
-            port=DB_PORT
+            host=db_host,
+            database=db_name,
+            user=db_user,
+            password=db_password,
+            port=db_port
         )
         print("Database connection successful.")
         return conn