Update app.py

app.py

@@ -1,239 +1,146 @@
 import os
 import re
-import logging
+from datetime import datetime
 from flask import Flask, request, jsonify
 from flask_cors import CORS
-from transformers import AutoTokenizer, AutoModelForSeq2SeqLM
-import torch
 import psycopg2
-from datetime import datetime
 from psycopg2 import pool
+from typing import Optional, Dict, List
 
 app = Flask(__name__)
 CORS(app)
 
-# إعدادات التسجيل
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
-# إعدادات النموذج
-MODEL_NAME = "tscholak/3vnuv1vf"  # نموذج متخصص لـ PostgreSQL
-SUPABASE_DB_URL = os.getenv('SUPABASE_DB_URL')
-
-# تهيئة connection pool
-connection_pool = None
-try:
-    connection_pool = psycopg2.pool.SimpleConnectionPool(
-        minconn=1,
-        maxconn=5,
-        dsn=SUPABASE_DB_URL
-    )
-    logger.info("تم إنشاء connection pool بنجاح")
-except Exception as e:
-    logger.error(f"خطأ في إنشاء connection pool: {str(e)}")
+# إعدادات اتصال قاعدة البيانات
+DB_URL = os.getenv('SUPABASE_DB_URL')
+connection_pool = psycopg2.pool.SimpleConnectionPool(
+    minconn=1,
+    maxconn=5,
+    dsn=DB_URL
+)
 
-# تحميل النموذج مرة واحدة عند بدء التشغيل
-try:
-    tokenizer = AutoTokenizer.from_pretrained(MODEL_NAME)
-    model = AutoModelForSeq2SeqLM.from_pretrained(MODEL_NAME)
+class QueryBuilder:
+    """فئة مسؤولة عن بناء استعلامات SQL الآمنة"""
     
-    # استخدام GPU إذا كان متاحًا، وإلا استخدام CPU
-    device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
-    model.to(device)
-    model.eval()
-    logger.info("تم تحميل النموذج بنجاح على الجهاز: %s", device)
-except Exception as e:
-    logger.error(f"خطأ في تحميل النموذج: {str(e)}")
-    raise
-
-# سكيما قاعدة البيانات (مختصرة لتحسين الأداء)
-DB_SCHEMA = """
-CREATE TABLE public.biodata (
-  id bigint GENERATED ALWAYS AS IDENTITY NOT NULL,
-  created_at timestamp with time zone NOT NULL DEFAULT now(),
-  mac_address text,
-  acceleration_x double precision,
-  acceleration_y double precision,
-  acceleration_z double precision,
-  gyro_x double precision,
-  gyro_y double precision,
-  gyro_z double precision,
-  temperature double precision,
-  CONSTRAINT biodata_pkey PRIMARY KEY (id),
-  CONSTRAINT biodata_mac_address_fkey FOREIGN KEY (mac_address) REFERENCES public.profiles(cam_mac)
-);
-CREATE TABLE public.data (
-  user_place_id bigint,
-  cam_mac text,
-  does_loaction_update boolean DEFAULT false,
-  caption text,
-  image_url text,
-  id bigint GENERATED ALWAYS AS IDENTITY NOT NULL,
-  longitude double precision DEFAULT '37.1309255'::double precision,
-  created_at timestamp without time zone,
-  latitude double precision DEFAULT '36.1833854'::double precision,
-  CONSTRAINT data_pkey PRIMARY KEY (id),
-  CONSTRAINT data_user_place_id_fkey FOREIGN KEY (user_place_id) REFERENCES public.user_place(id)
-);
-CREATE TABLE public.flag (
-  id bigint GENERATED ALWAYS AS IDENTITY NOT NULL,
-  flag smallint,
-  user_mac_address text,
-  CONSTRAINT flag_pkey PRIMARY KEY (id),
-  CONSTRAINT flag_user_mac_address_fkey FOREIGN KEY (user_mac_address) REFERENCES public.profiles(cam_mac)
-);
-CREATE TABLE public.notification (
-  id bigint GENERATED ALWAYS AS IDENTITY NOT NULL,
-  created_at timestamp without time zone NOT NULL DEFAULT now(),
-  user_cam_mac text,
-  title text,
-  message text,
-  is_read boolean,
-  acceleration_x double precision,
-  acceleration_y double precision,
-  acceleration_z double precision,
-  gyro_x double precision,
-  gyro_y double precision,
-  gyro_z double precision,
-  CONSTRAINT notification_pkey PRIMARY KEY (id),
-  CONSTRAINT notification_user_cam_mac_fkey FOREIGN KEY (user_cam_mac) REFERENCES public.profiles(cam_mac)
-);
-CREATE TABLE public.place (
-  name text,
-  created_at timestamp with time zone DEFAULT (now() AT TIME ZONE 'utc'::text),
-  id bigint GENERATED ALWAYS AS IDENTITY NOT NULL,
-  CONSTRAINT place_pkey PRIMARY KEY (id)
-);
-CREATE TABLE public.profiles (
-  fcm_token text,
-  notification_enabled boolean DEFAULT true,
-  id uuid NOT NULL,
-  updated_at timestamp with time zone,
-  username text UNIQUE CHECK (char_length(username) >= 3),
-  full_name text,
-  website text,
-  cam_mac text UNIQUE,
-  avatar_url text DEFAULT 'https://mougnkvoyyhcuxeeqvmh.supabase.co/storage/v1/object/public/profiles//download.jpeg'::text,
-  CONSTRAINT profiles_pkey PRIMARY KEY (id),
-  CONSTRAINT profiles_id_fkey FOREIGN KEY (id) REFERENCES auth.users(id)
-);
-CREATE TABLE public.user_place (
-  place_id bigint,
-  user_cam_mac text,
-  id bigint GENERATED ALWAYS AS IDENTITY NOT NULL,
-  created_at timestamp with time zone NOT NULL DEFAULT now(),
-  CONSTRAINT user_place_pkey PRIMARY KEY (id),
-  CONSTRAINT user_place_user_cam_mac_fkey FOREIGN KEY (user_cam_mac) REFERENCES public.profiles(cam_mac),
-  CONSTRAINT user_place_place_id_fkey FOREIGN KEY (place_id) REFERENCES public.place(id)
-);
-""".strip()
-
-def clean_sql(sql: str, cam_mac: str) -> str:
-    """
-    تنظيف استعلام SQL وإضافة شروط الأمان
-    """
-    # إزالة أي أوامر غير مسموح بها
-    forbidden_keywords = ['insert', 'update', 'delete', 'drop', 'alter', 'create', 'truncate']
-    for keyword in forbidden_keywords:
-        if keyword in sql.lower():
-            raise ValueError(f"استعلام غير مسموح به يحتوي على {keyword}")
+    @staticmethod
+    def get_last_office_visit(cam_mac: str) -> str:
+        """استعلام عن آخر زيارة للمكتب"""
+        return f"""
+        SELECT caption, created_at, image_url 
+        FROM data 
+        WHERE cam_mac = '{cam_mac}'
+        AND (caption LIKE '%مكتب%' OR caption LIKE '%عمل%')
+        ORDER BY created_at DESC 
+        LIMIT 1
+        """
     
-    # التأكد من وجود شرط cam_mac
-    if 'where' in sql.lower():
-        sql = re.sub(r'where\s+', f"WHERE cam_mac = '{cam_mac}' AND ", sql, flags=re.IGNORECASE)
-    else:
-        if ';' in sql:
-            sql = sql.replace(';', f" WHERE cam_mac = '{cam_mac}';")
-        else:
-            sql += f" WHERE cam_mac = '{cam_mac}'"
+    @staticmethod
+    def get_last_five_places(cam_mac: str) -> str:
+        """استعلام عن آخر 5 أماكن مميزة"""
+        return f"""
+        SELECT DISTINCT ON (caption) caption, created_at, latitude, longitude, image_url
+        FROM data 
+        WHERE cam_mac = '{cam_mac}'
+        AND caption IS NOT NULL
+        ORDER BY caption, created_at DESC 
+        LIMIT 5
+        """
     
-    # التأكد من أن الاستعلام يبدأ بـ SELECT فقط
-    if not sql.strip().lower().startswith('select'):
-        raise ValueError("يسمح فقط باستعلامات SELECT")
+    @staticmethod
+    def check_garden_visit(cam_mac: str) -> str:
+        """استعلام عن زيارة الحديقة"""
+        return f"""
+        SELECT caption, created_at, image_url
+        FROM data 
+        WHERE cam_mac = '{cam_mac}'
+        AND (caption LIKE '%حديقة%' OR caption LIKE '%حدائق%' OR caption LIKE '%نباتات%')
+        ORDER BY created_at DESC 
+        LIMIT 1
+        """
     
-    return sql
-
-def generate_sql(prompt: str, cam_mac: str) -> str:
-    """
-    توليد استعلام SQL من النص باستخدام النموذج
-    """
-    try:
-        inputs = tokenizer(prompt, return_tensors="pt", truncation=True, max_length=512).to(device)
-        
-        with torch.no_grad():
-            outputs = model.generate(
-                **inputs,
-                max_length=256,
-                num_beams=4,
-                early_stopping=True,
-                temperature=0.7
-            )
-        
-        sql = tokenizer.decode(outputs[0], skip_special_tokens=True)
-        return clean_sql(sql, cam_mac)
-    except Exception as e:
-        logger.error(f"خطأ في توليد SQL: {str(e)}")
-        return f"SELECT * FROM data WHERE cam_mac = '{cam_mac}' LIMIT 10;"
+    @staticmethod
+    def check_classroom_visit(cam_mac: str) -> str:
+        """استعلام عن زيارة صف دراسي"""
+        return f"""
+        SELECT caption, created_at, image_url
+        FROM data 
+        WHERE cam_mac = '{cam_mac}'
+        AND (caption LIKE '%صف%' OR caption LIKE '%قاعة%' OR caption LIKE '%محاضرة%' 
+            OR caption LIKE '%جامعة%' OR caption LIKE '%مدرسة%')
+        ORDER BY created_at DESC 
+        LIMIT 1
+        """
 
-@app.route('/api/query', methods=['POST'])
-def handle_query():
-    if not connection_pool:
-        return jsonify({"error": "لا يوجد اتصال بقاعدة البيانات"}), 500
+class DatabaseExecutor:
+    """فئة مسؤولة عن تنفيذ الاستعلامات وإدارة الاتصالات"""
     
-    try:
-        data = request.get_json()
-        
-        if not all(k in data for k in ['text', 'cam_mac']):
-            return jsonify({"error": "المعطيات ناقصة"}), 400
-
-        # إنشاء الـ prompt المحسن
-        prompt = f"""
-قم بتحويل السؤال التالي إلى استعلام PostgreSQL SELECT صالح:
-السؤال: {data['text']}
-
-الشروط:
-1. يجب تضمين شرط WHERE: cam_mac = '{data['cam_mac']}'
-2. مسموح فقط باستخدام SELECT
-3. الجداول المتاحة: profiles, data, place
-"""
-        # توليد الاستعلام
-        sql = generate_sql(prompt, data['cam_mac'])
-        
-        # تنفيذ الاستعلام باستخدام connection pool
+    @staticmethod
+    def execute_query(sql: str) -> List[Dict]:
+        """تنفيذ استعلام SQL وإرجاع النتائج"""
         conn = None
         try:
             conn = connection_pool.getconn()
-            with conn.cursor() as cursor:
-                cursor.execute(sql)
-                
-                # إذا كان الاستعلام لا يعيد بيانات (مثل COUNT)
-                if cursor.description:
-                    columns = [desc[0] for desc in cursor.description]
-                    rows = cursor.fetchall()
-                    result = [dict(zip(columns, row)) for row in rows]
-                else:
-                    result = {"message": "تم تنفيذ الاستعلام بنجاح"}
-                
-                return jsonify({
-                    "data": result,
-                    "sql": sql,
-                    "timestamp": datetime.now().isoformat()
-                })
-        except Exception as e:
-            logger.error(f"خطأ في قاعدة البيانات: {str(e)}")
-            return jsonify({"error": "حدث خطأ في معالجة الاستعلام"}), 500
+            cursor = conn.cursor()
+            cursor.execute(sql)
+            
+            if cursor.description:
+                columns = [desc[0] for desc in cursor.description]
+                return [dict(zip(columns, row)) for row in cursor.fetchall()]
+            return []
         finally:
             if conn:
                 connection_pool.putconn(conn)
-                
+
+@app.route('/query', methods=['POST'])
+def handle_query():
+    try:
+        data = request.get_json()
+        cam_mac = data.get('cam_mac')
+        question = data.get('question')
+        
+        if not cam_mac or not question:
+            return jsonify({"error": "يجب تقديم cam_mac و question"}), 400
+        
+        # تنظيف المدخلات
+        cam_mac = re.sub(r'[^a-fA-F0-9:]', '', cam_mac)
+        question = question.strip().lower()
+        
+        # تحديد الاستعلام المناسب
+        sql = None
+        
+        if 'مكتب' in question or 'عمل' in question:
+            sql = QueryBuilder.get_last_office_visit(cam_mac)
+        elif 'خمس أماكن' in question or 'آخر أماكن' in question:
+            sql = QueryBuilder.get_last_five_places(cam_mac)
+        elif 'حديقة' in question or 'حدائق' in question:
+            sql = QueryBuilder.check_garden_visit(cam_mac)
+        elif 'صف دراسي' in question or 'محاضرة' in question or 'قاعة' in question:
+            sql = QueryBuilder.check_classroom_visit(cam_mac)
+        
+        if not sql:
+            return jsonify({"error": "نوع السؤال غير معروف"}), 400
+        
+        # تنفيذ الاستعلام
+        results = DatabaseExecutor.execute_query(sql)
+        
+        return jsonify({
+            "question": question,
+            "results": results,
+            "timestamp": datetime.now().isoformat()
+        })
+        
+    except psycopg2.Error as e:
+        return jsonify({"error": "خطأ في قاعدة البيانات", "details": str(e)}), 500
     except Exception as e:
-        logger.error(f"خطأ عام: {str(e)}")
-        return jsonify({"error": "حدث خطأ في المعالجة"}), 500
+        return jsonify({"error": "خطأ غير متوقع", "details": str(e)}), 500
 
 @app.route('/health', methods=['GET'])
 def health_check():
-    return jsonify({"status": "healthy", "timestamp": datetime.now().isoformat()})
+    try:
+        conn = connection_pool.getconn()
+        conn.close()
+        return jsonify({"status": "يعمل بنجاح"})
+    except Exception as e:
+        return jsonify({"status": "غير متصل", "error": str(e)}), 500
 
 if __name__ == '__main__':
-    port = int(os.environ.get('PORT', 8080))
-    app.run(host='0.0.0.0', port=port)
+    app.run(host='0.0.0.0', port=int(os.environ.get('PORT', 5000)))