Upload 3 files

Dockerfile

@@ -0,0 +1,17 @@
+# Use an official Python runtime as a parent image
+FROM python:3.9-slim
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy the current directory contents into the container
+COPY . .
+
+# Install any needed packages specified in requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Make port 7860 available to the world outside this container
+EXPOSE 7860
+
+# Run app.py when the container launches
+CMD ["python", "app.py"]

app.py

@@ -1,47 +1,22 @@
 import os
 import re
-import logging
-from flask import Flask, request, jsonify, Response
-from flask_cors import CORS
-from transformers import AutoTokenizer, AutoModelForSeq2SeqLM
-import torch
 import psycopg2
+from flask import Flask, request, jsonify
+import google.generativeai as genai
+from flask import Response
 import json
 
+# --- إعدادات Flask ---
 app = Flask(__name__)
-CORS(app)
 
-# --- إعداد السجل ---
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+# --- إعدادات Gemini ---
+GEMINI_API_KEY = "AIzaSyCWukRy76nPgkrMflCTWh_s4gEU--wSVr8"  # يفضل استخدام متغيرات البيئة
+genai.configure(api_key=GEMINI_API_KEY)
+model = genai.GenerativeModel('gemini-2.0-flash')
 
-# --- إعداد النموذج ---
-MODEL_NAME = "tscholak/cxmefzzi"  # نموذج Text-to-SQL بديل
+# --- إعدادات Supabase ---
 SUPABASE_DB_URL = "postgresql://postgres.mougnkvoyyhcuxeeqvmh:Xf5E0DhUvKEHEAqq@aws-0-eu-central-1.pooler.supabase.com:6543/postgres"
 
-tokenizer = None
-model = None
-
-def initialize():
-    global tokenizer, model
-    
-    # تحديد مسار ذاكرة مؤقتة ضمن المساحة المسموح بها
-    cache_dir = os.path.join(os.getcwd(), "model_cache")
-    os.makedirs(cache_dir, exist_ok=True)
-    
-    device = "cuda" if torch.cuda.is_available() else "cpu"
-    logger.info(f"تحميل النموذج على الجهاز: {device}")
-
-    try:
-        tokenizer = AutoTokenizer.from_pretrained(MODEL_NAME, cache_dir=cache_dir)
-        model = AutoModelForSeq2SeqLM.from_pretrained(MODEL_NAME, cache_dir=cache_dir).to(device)
-        logger.info("تم تحميل النموذج بنجاح")
-    except Exception as e:
-        logger.error(f"فشل في تحميل النموذج: {str(e)}")
-        raise
-
-initialize()
-
 # --- سكيمة قاعدة البيانات ---
 DB_SCHEMA = """
 CREATE TABLE public.profiles (
@@ -127,14 +102,15 @@ CREATE TABLE public.flag (
   CONSTRAINT flag_pkey PRIMARY KEY (id),
   CONSTRAINT flag_user_mac_address_fkey FOREIGN KEY (user_mac_address) REFERENCES public.profiles(cam_mac)
 );
-""".strip()
+
+"""
 
 # --- الاتصال بقاعدة البيانات ---
 def get_db_connection():
     try:
         return psycopg2.connect(SUPABASE_DB_URL)
     except Exception as err:
-        logger.error(f"Database connection error: {err}")
+        print(f"Database connection error: {err}")
         return None
 
 # --- التحقق من صحة cam_mac ---
@@ -148,50 +124,76 @@ def validate_cam_mac(cam_mac):
         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}")
+        print(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:
-        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
+# --- توليد SQL باستخدام Gemini مع تخصيص حسب cam_mac ---
+def generate_sql_gemini(natural_language_query, cam_mac):
+    prompt = f"""YYou are a PostgreSQL expert.
+Your job is to convert a natural language query into a SQL SELECT statement, based on the following database schema.
 
-        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
+The query **must always be filtered by the camera MAC address: '{cam_mac}'**, using the appropriate field.
+
+Schema:
+{DB_SCHEMA}
+
+Schema Description:
+
+1. **profiles**
+   - Represents users/devices.
+   - cam_mac (TEXT, UNIQUE) is the MAC address of the camera device.
+   - Linked to most tables using cam_mac.
+
+2. **data**
+   - Stores captured image info (image_url, caption, created_at, etc.).
+   - Linked via cam_mac and user_place_id.
+   - To find places, JOIN with `user_place` → `place`.
 
-        prompt = f"""
-        ### Postgres SQL table definitions
-        {DB_SCHEMA}
+3. **biodata**
+   - Contains sensor readings (acceleration, gyro, temp).
+   - Linked via mac_address to profiles.cam_mac.
 
-        ### 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
+4. **notification**
+   - Stores alerts/messages for the user.
+   - Linked via user_cam_mac to profiles.cam_mac.
 
-        ### User question: {natural_query}
+5. **flag**
+   - Represents boolean flags (e.g. status).
+   - Linked via user_mac_address to profiles.cam_mac.
 
-        ### SQL query:
-        SELECT
-        """.strip()
+6. **user_place**
+   - Connects a user_cam_mac to a place_id.
+   - JOIN with `place` to get the name.
 
-        inputs = tokenizer(prompt, return_tensors="pt").to(model.device)
-        outputs = model.generate(**inputs, max_length=256)
-        sql = tokenizer.decode(outputs[0], skip_special_tokens=True)
+7. **place**
+   - List of place names.
+
+Rules:
+- If the question is about number of visits, frequency, or attendance to a specific place, use the `data` table.
+- Use **only SELECT** statements.
+- Use only the provided schema.
+- Use **camel_mac** filter in WHERE clause.
+- Use proper JOINs (no subqueries unless necessary).
+- Always match table relationships correctly:
+    data.user_place_id = user_place.id
+    user_place.place_id = place.id
+    user_place.user_cam_mac = profiles.cam_mac
+- Use table aliases (like d, p, up, pl) when helpful.
+- The output must contain only the SQL query, no comments or explanations.
+- Add a semicolon at the end.
+
+
+Question: "{natural_language_query}"
+
+
+SQL:"""
+
+    try:
+        response = model.generate_content(prompt)
+        sql = response.text.strip()
 
         # تنظيف الناتج
         sql = re.sub(r"^```sql\s*", "", sql, flags=re.IGNORECASE)
@@ -204,54 +206,75 @@ def handle_query():
         if not sql.endswith(";"):
             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()
+        return sql
+    except Exception as e:
+        print(f"Gemini error: {e}")
+        return None
+
+# --- نقطة النهاية الرئيسية ---
+@app.route('/api/query', methods=['POST'])
+def handle_query():
+    data = request.get_json()
+    if not data or 'text' not in data or 'cam_mac' not in data:
+        return jsonify({"error": "Please send 'text' and 'cam_mac' in the request body"}), 400
+
+    natural_query = data['text']
+    cam_mac = data['cam_mac']
+    print(f"Natural query from {cam_mac}: {natural_query}")
+    
+    # التحقق من صحة cam_mac
+    if not validate_cam_mac(cam_mac):
+        return jsonify({"error": "Invalid cam_mac address"}), 403
+    
+    sql_query = generate_sql_gemini(natural_query, cam_mac)
+
+    if not sql_query:
+        return jsonify({"error": "Failed to generate SQL query"}), 500
+
+    print(f"Generated SQL: {sql_query}")
+
+    if not sql_query.upper().strip().startswith("SELECT"):
+        return jsonify({"error": "Only SELECT queries are allowed"}), 403
 
+    conn = get_db_connection()
+    if not conn:
+        return jsonify({"error": "Database connection failed"}), 500
+
+    cursor = None
+    try:
+        cursor = conn.cursor()
+        cursor.execute(sql_query)
+        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"خطأ في التوليد: {str(e)}")
-        return jsonify({"error": "فشل في توليد الاستعلام"}), 500
+        print(f"SQL execution error: {e}")
+        return jsonify({"error": str(e), "generated_sql": sql_query}), 500
+    finally:
+        if cursor:
+            cursor.close()
+        if conn:
+            conn.close()
 
 @app.route('/')
 def home():
     return """
-    <h1>Text2SQL API</h1>
+    <h1>Natural Language to SQL API (Gemini)</h1>
     <p>Use <code>/api/query</code> with POST {"text": "your question", "cam_mac": "device_mac_address"}.</p>
     """
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=7860)
+    app.run(host='0.0.0.0', port=7860) 

requirements.txt

@@ -1,5 +1,4 @@
 flask==2.3.2
-flask-cors==3.0.10
-torch==2.0.1
-transformers==4.30.2
-psycopg2-binary==2.9.7
+psycopg2-binary==2.9.7
+google-generativeai==0.3.2
+python-dotenv==1.0.0