Upload 2 files

app.py

@@ -1,9 +1,12 @@
 import os
+import re
 import logging
-from flask import Flask, request, jsonify
+from flask import Flask, request, jsonify, Response
 from flask_cors import CORS
 from transformers import AutoTokenizer, AutoModelForSeq2SeqLM
 import torch
+import psycopg2
+import json
 
 app = Flask(__name__)
 CORS(app)
@@ -14,6 +17,7 @@ logger = logging.getLogger(__name__)
 
 # --- إعداد النموذج ---
 MODEL_NAME = "tscholak/cxmefzzi"  # نموذج Text-to-SQL بديل
+SUPABASE_DB_URL = "postgresql://postgres.mougnkvoyyhcuxeeqvmh:Xf5E0DhUvKEHEAqq@aws-0-eu-central-1.pooler.supabase.com:6543/postgres"
 
 tokenizer = None
 model = None
@@ -125,26 +129,63 @@ CREATE TABLE public.flag (
 );
 """.strip()
 
-@app.route('/generate-sql', methods=['POST'])
-def generate_sql():
+# --- الاتصال بقاعدة البيانات ---
+def get_db_connection():
+    try:
+        return psycopg2.connect(SUPABASE_DB_URL)
+    except Exception as err:
+        logger.error(f"Database connection error: {err}")
+        return None
+
+# --- التحقق من صحة cam_mac ---
+def validate_cam_mac(cam_mac):
+    conn = get_db_connection()
+    if not conn:
+        return False
+        
+    try:
+        cursor = conn.cursor()
+        cursor.execute("SELECT 1 FROM profiles WHERE cam_mac = %s;", (cam_mac,))
+        return cursor.fetchone() is not None
+    except Exception as e:
+        logger.error(f"Validation error: {e}")
+        return False
+    finally:
+        if conn:
+            conn.close()
+
+@app.route('/api/query', methods=['POST'])
+def handle_query():
     if tokenizer is None or model is None:
         return jsonify({"error": "النموذج غير محمل، يرجى المحاولة لاحقاً"}), 503
         
     try:
-        body = request.get_json()
-        user_text = body.get("text", "").strip()
-        cam_mac = body.get("cam_mac", "").strip()
-
-        if not user_text or not cam_mac:
+        data = request.get_json()
+        if not data or 'text' not in data or 'cam_mac' not in data:
             return jsonify({"error": "يرجى إرسال 'text' و 'cam_mac'"}), 400
 
+        natural_query = data['text']
+        cam_mac = data['cam_mac']
+        logger.info(f"استعلام من {cam_mac}: {natural_query}")
+        
+        # التحقق من صحة cam_mac
+        if not validate_cam_mac(cam_mac):
+            return jsonify({"error": "عنوان MAC غير صالح"}), 403
+
         prompt = f"""
         ### Postgres SQL table definitions
         {DB_SCHEMA}
 
-        ### User question: {user_text}
+        ### Rules:
+        - Always filter by cam_mac = '{cam_mac}'
+        - Use only SELECT statements
+        - Use proper JOINs
+        - Use table aliases when helpful
+        - The output must contain only the SQL query
+
+        ### User question: {natural_query}
 
-        ### SQL query to answer the question filtered by cam_mac = '{cam_mac}':
+        ### SQL query:
         SELECT
         """.strip()
 
@@ -153,12 +194,53 @@ def generate_sql():
         sql = tokenizer.decode(outputs[0], skip_special_tokens=True)
 
         # تنظيف الناتج
-        if not sql.lower().startswith("select"):
-            sql = "SELECT " + sql
+        sql = re.sub(r"^```sql\s*", "", sql, flags=re.IGNORECASE)
+        sql = re.sub(r"\s*```$", "", sql)
+        sql = re.sub(r"^SQL:\s*", "", sql, flags=re.IGNORECASE)
+
+        if not sql.upper().startswith("SELECT"):
+            sql = "SELECT " + sql.split("SELECT")[-1] if "SELECT" in sql else f"SELECT * FROM ({sql}) AS subquery"
+
         if not sql.endswith(";"):
             sql += ";"
 
-        return jsonify({"sql": sql})
+        logger.info(f"استعلام SQL المولد: {sql}")
+
+        if not sql.upper().strip().startswith("SELECT"):
+            return jsonify({"error": "يُسمح فقط باستعلامات SELECT"}), 403
+
+        conn = get_db_connection()
+        if not conn:
+            return jsonify({"error": "فشل الاتصال بقاعدة البيانات"}), 500
+
+        cursor = None
+        try:
+            cursor = conn.cursor()
+            cursor.execute(sql)
+            columns = [desc[0] for desc in cursor.description]
+            rows = cursor.fetchall()
+            data = [dict(zip(columns, row)) for row in rows]
+
+            response_data = {
+                "data": data,
+            }
+            
+            response_json = json.dumps(response_data, ensure_ascii=False)
+            
+            return Response(
+                response_json,
+                status=200,
+                mimetype='application/json; charset=utf-8'
+            )
+            
+        except Exception as e:
+            logger.error(f"خطأ في تنفيذ SQL: {e}")
+            return jsonify({"error": str(e), "generated_sql": sql}), 500
+        finally:
+            if cursor:
+                cursor.close()
+            if conn:
+                conn.close()
 
     except Exception as e:
         logger.error(f"خطأ في التوليد: {str(e)}")
@@ -168,8 +250,8 @@ def generate_sql():
 def home():
     return """
     <h1>Text2SQL API</h1>
-    <p>Send a POST request to <code>/generate-sql</code> with JSON: {"text": "سؤالك", "cam_mac": "عنوان MAC"}</p>
+    <p>Use <code>/api/query</code> with POST {"text": "your question", "cam_mac": "device_mac_address"}.</p>
     """
 
 if __name__ == '__main__':
-    app.run()
+    app.run(host='0.0.0.0', port=7860)

requirements.txt

@@ -1,7 +1,5 @@
-flask>=2.0.0
-flask-cors>=3.0.0
-torch>=2.0.0
-transformers>=4.30.0
-accelerate
-huggingface-hub>=0.15.0
-gunicorn>=20.1.0
+flask==2.3.2
+flask-cors==3.0.10
+torch==2.0.1
+transformers==4.30.2
+psycopg2-binary==2.9.7