Update DB to AWS RDS with pymssql

app.py

@@ -1,4 +1,5 @@
 import os
+import pymssql
 import time
 import base64
 import uuid
@@ -52,53 +53,124 @@ if not OPENAI_API_KEY:
 # ------------------------------------------------------------
 # DATABASE CONNECTION (AUTO-DETECTION)
 # ------------------------------------------------------------
-print("🔍 Checking SQL Server connectivity...")
+# print("🔍 Checking SQL Server connectivity...")
+
+# # Try both ODBC Driver 17 and 18
+# possible_drivers = ['{ODBC Driver 18 for SQL Server}', '{ODBC Driver 17 for SQL Server}']
+# driver = None
+# for d in possible_drivers:
+#     try:
+#         if d.strip('{}') in pyodbc.drivers():
+#             driver = d
+#             break
+#     except Exception:
+#         pass
+
+# if not driver:
+#     driver = '{ODBC Driver 17 for SQL Server}'
+#     print("⚠️ Defaulting to ODBC Driver 17 for SQL Server")
+
+# # Candidate SQL Server instances
+# test_servers = [
+#     r'localhost\SQLEXPRESS',
+#     r'localhost\MSSQLSERVER',
+#     r'localhost',
+#     r'127.0.0.1'
+# ]
+
+# database = 'PyDetect'
+
+# def get_db_connection():
+#     """Try multiple connection methods until success."""
+#     for s in test_servers:
+#         try:
+#             conn = pyodbc.connect(
+#                 f'DRIVER={driver};SERVER={s};DATABASE={database};Trusted_Connection=yes;',
+#                 timeout=3
+#             )
+#             print(f"✅ Connected to SQL Server instance: {s}")
+#             return conn
+#         except pyodbc.OperationalError:
+#             continue
+#     raise ConnectionError("❌ Cannot connect to any SQL Server instance. Please ensure SQL Server is running.")
+
+# def create_user_table():
+#     try:
+#         conn = get_db_connection()
+#         cursor = conn.cursor()
+#         cursor.execute('''
+#             IF NOT EXISTS (SELECT * FROM sysobjects WHERE name='Users' AND xtype='U')
+#             CREATE TABLE Users (
+#                 id INT IDENTITY(1,1) PRIMARY KEY,
+#                 name NVARCHAR(120) NOT NULL,
+#                 role NVARCHAR(50) NOT NULL,
+#                 email NVARCHAR(120) UNIQUE NOT NULL,
+#                 password NVARCHAR(255) NOT NULL
+#             )
+#         ''')
+#         conn.commit()
+#         cursor.close()
+#         conn.close()
+#         print("✅ Users table verified/created successfully.")
+#     except Exception as e:
+#         print(f"❌ Database setup failed: {str(e)}")
+
+# create_user_table()
+
+USE_DATABASE = os.getenv("USE_DATABASE", "1") == "1"
+
+DB_HOST = os.getenv("DB_HOST", r"localhost")
+DB_PORT = int(os.getenv("DB_PORT", "1433"))
+DB_NAME = os.getenv("DB_NAME", "PyDetect")
+DB_USER = os.getenv("DB_USER", "")
+DB_PASSWORD = os.getenv("DB_PASSWORD", "")
+
+if USE_DATABASE:
+    print(f"🔍 Database mode enabled. Target SQL Server: {DB_HOST}:{DB_PORT}, db={DB_NAME}")
+else:
+    print("ℹ️ USE_DATABASE=0 - running without database (demo mode).")
 
-# Try both ODBC Driver 17 and 18
-possible_drivers = ['{ODBC Driver 18 for SQL Server}', '{ODBC Driver 17 for SQL Server}']
-driver = None
-for d in possible_drivers:
-    try:
-        if d.strip('{}') in pyodbc.drivers():
-            driver = d
-            break
-    except Exception:
-        pass
 
-if not driver:
-    driver = '{ODBC Driver 17 for SQL Server}'
-    print("⚠️ Defaulting to ODBC Driver 17 for SQL Server")
+def get_db_connection():
+    """Return connection to SQL Server using pymssql.
 
-# Candidate SQL Server instances
-test_servers = [
-    r'localhost\SQLEXPRESS',
-    r'localhost\MSSQLSERVER',
-    r'localhost',
-    r'127.0.0.1'
-]
+    - On local: you can point DB_HOST to your local SQL Server or to AWS.
+    - On Hugging Face: DB_HOST should be your AWS RDS endpoint.
+    """
+    if not USE_DATABASE:
+        return None
 
-database = 'PyDetect'
+    try:
+        conn = pymssql.connect(
+            server=DB_HOST,
+            user=DB_USER,
+            password=DB_PASSWORD,
+            database=DB_NAME,
+            port=DB_PORT,
+            login_timeout=10,
+            timeout=30,
+            as_dict=False  # we access rows by index
+        )
+        return conn
+    except Exception as e:
+        print(f"❌ Could not connect to SQL Server at {DB_HOST}:{DB_PORT} - {e}")
+        raise
 
-def get_db_connection():
-    """Try multiple connection methods until success."""
-    for s in test_servers:
-        try:
-            conn = pyodbc.connect(
-                f'DRIVER={driver};SERVER={s};DATABASE={database};Trusted_Connection=yes;',
-                timeout=3
-            )
-            print(f"✅ Connected to SQL Server instance: {s}")
-            return conn
-        except pyodbc.OperationalError:
-            continue
-    raise ConnectionError("❌ Cannot connect to any SQL Server instance. Please ensure SQL Server is running.")
 
 def create_user_table():
+    """Create Users table if it does not exist."""
+    if not USE_DATABASE:
+        print("ℹ️ Skipping user table creation (demo mode, no DB).")
+        return
+
     try:
         conn = get_db_connection()
         cursor = conn.cursor()
-        cursor.execute('''
-            IF NOT EXISTS (SELECT * FROM sysobjects WHERE name='Users' AND xtype='U')
+        cursor.execute("""
+            IF NOT EXISTS (
+                SELECT * FROM sysobjects
+                WHERE name = 'Users' AND xtype = 'U'
+            )
             CREATE TABLE Users (
                 id INT IDENTITY(1,1) PRIMARY KEY,
                 name NVARCHAR(120) NOT NULL,
@@ -106,7 +178,7 @@ def create_user_table():
                 email NVARCHAR(120) UNIQUE NOT NULL,
                 password NVARCHAR(255) NOT NULL
             )
-        ''')
+        """)
         conn.commit()
         cursor.close()
         conn.close()
@@ -114,8 +186,10 @@ def create_user_table():
     except Exception as e:
         print(f"❌ Database setup failed: {str(e)}")
 
+
 create_user_table()
 
+
 # ------------------------------------------------------------
 # LOAD VECTOR INDEX AND CHUNKS
 # ------------------------------------------------------------
@@ -642,44 +716,138 @@ def detect_crime_type(brief_description: str):
 # ------------------------------------------------------------
 # AUTH ROUTES
 # ------------------------------------------------------------
+# @app.route('/sign-in', methods=['POST'])
+# def sign_in():
+#     data = request.json
+#     email = data.get('email')
+#     password = data.get('password')
+#     conn = get_db_connection()
+#     cursor = conn.cursor()
+#     cursor.execute('SELECT * FROM Users WHERE email = ?', (email,))
+#     user = cursor.fetchone()
+#     cursor.close()
+#     conn.close()
+#     if user and check_password_hash(user[4], password):
+#         return jsonify({"message": "Login successful", "user": {
+#             "id": user[0], "name": user[1], "role": user[2], "email": user[3]
+#         }}), 200
+#     elif user:
+#         return jsonify({"message": "Invalid password"}), 401
+#     else:
+#         return jsonify({"message": "Email not found"}), 404
+
+# @app.route('/sign-up', methods=['POST'])
+# def sign_up():
+#     data = request.json
+#     name, role, email, password = data.get('name'), data.get('role'), data.get('email'), data.get('password')
+#     if not email or not password:
+#         return jsonify({"message": "Email and password are required"}), 400
+#     conn = get_db_connection()
+#     cursor = conn.cursor()
+#     cursor.execute('SELECT * FROM Users WHERE email = ?', (email,))
+#     if cursor.fetchone():
+#         return jsonify({"message": "Email already exists"}), 400
+#     hashed_password = generate_password_hash(password)
+#     cursor.execute('INSERT INTO Users (name, role, email, password) VALUES (?, ?, ?, ?)',
+#                    (name, role, email, hashed_password))
+#     conn.commit()
+#     cursor.close()
+#     conn.close()
+#     return jsonify({"message": "User created successfully"}), 201
+
 @app.route('/sign-in', methods=['POST'])
 def sign_in():
-    data = request.json
+    data = request.get_json() or {}
     email = data.get('email')
     password = data.get('password')
-    conn = get_db_connection()
-    cursor = conn.cursor()
-    cursor.execute('SELECT * FROM Users WHERE email = ?', (email,))
-    user = cursor.fetchone()
-    cursor.close()
-    conn.close()
+
+    if not email or not password:
+        return jsonify({"message": "Email and password are required"}), 400
+
+    # Optional: if you kept USE_DATABASE from earlier
+    if USE_DATABASE is False:
+        return jsonify({"message": "Database is disabled (USE_DATABASE=0)."}), 503
+
+    try:
+        conn = get_db_connection()
+        cursor = conn.cursor()
+
+        # IMPORTANT: pymssql uses %s, not ?
+        cursor.execute(
+            "SELECT id, name, role, email, password FROM Users WHERE email = %s",
+            (email,)
+        )
+        user = cursor.fetchone()
+
+        cursor.close()
+        conn.close()
+    except Exception as e:
+        print(f"❌ Sign-in DB error: {e}")
+        return jsonify({"message": "Login service unavailable"}), 503
+
     if user and check_password_hash(user[4], password):
-        return jsonify({"message": "Login successful", "user": {
-            "id": user[0], "name": user[1], "role": user[2], "email": user[3]
-        }}), 200
+        return jsonify({
+            "message": "Login successful",
+            "user": {
+                "id": user[0],
+                "name": user[1],
+                "role": user[2],
+                "email": user[3]
+            }
+        }), 200
     elif user:
         return jsonify({"message": "Invalid password"}), 401
     else:
         return jsonify({"message": "Email not found"}), 404
 
+
 @app.route('/sign-up', methods=['POST'])
 def sign_up():
-    data = request.json
-    name, role, email, password = data.get('name'), data.get('role'), data.get('email'), data.get('password')
+    data = request.get_json() or {}
+    name = data.get('name')
+    role = data.get('role')
+    email = data.get('email')
+    password = data.get('password')
+
     if not email or not password:
         return jsonify({"message": "Email and password are required"}), 400
-    conn = get_db_connection()
-    cursor = conn.cursor()
-    cursor.execute('SELECT * FROM Users WHERE email = ?', (email,))
-    if cursor.fetchone():
-        return jsonify({"message": "Email already exists"}), 400
-    hashed_password = generate_password_hash(password)
-    cursor.execute('INSERT INTO Users (name, role, email, password) VALUES (?, ?, ?, ?)',
-                   (name, role, email, hashed_password))
-    conn.commit()
-    cursor.close()
-    conn.close()
-    return jsonify({"message": "User created successfully"}), 201
+
+    # Optional: if you kept USE_DATABASE from earlier
+    if USE_DATABASE is False:
+        return jsonify({"message": "Sign-up is disabled because the database is not enabled (USE_DATABASE=0)."}), 503
+
+    try:
+        conn = get_db_connection()
+        cursor = conn.cursor()
+
+        # Check if email already exists
+        cursor.execute(
+            "SELECT id FROM Users WHERE email = %s",
+            (email,)
+        )
+        if cursor.fetchone():
+            cursor.close()
+            conn.close()
+            return jsonify({"message": "Email already exists"}), 400
+
+        hashed_password = generate_password_hash(password)
+
+        # Insert new user
+        cursor.execute(
+            "INSERT INTO Users (name, role, email, password) VALUES (%s, %s, %s, %s)",
+            (name, role, email, hashed_password)
+        )
+        conn.commit()
+        cursor.close()
+        conn.close()
+
+        return jsonify({"message": "User created successfully"}), 201
+
+    except Exception as e:
+        print(f"❌ Sign-up DB error: {e}")
+        return jsonify({"message": "Sign-up service unavailable"}), 503
+
+
 
 # ------------------------------------------------------------
 # CORE LOGIC

requirements.txt

@@ -13,6 +13,8 @@ requests
 sentence-transformers
 tf-keras
 torch
+pymssql
+
 
 
 # If using SQL Server ODBC driver, install it separately (not via pip)