Update app.py

app.py

@@ -214,110 +214,77 @@ SQL:"""
 # --- نقطة النهاية الرئيسية ---
 @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:
-        data = request.get_json()
-        if not data or 'text' not in data or 'cam_mac' not in data:
-            return jsonify({
-                "status": "error",
-                "message": "Please provide both 'text' and 'cam_mac' in the request body",
-                "data": None
-            }), 400
-
-        natural_query = data['text']
-        cam_mac = data['cam_mac']
-        print(f"Natural query from {cam_mac}: {natural_query}")
+        cursor = conn.cursor()
+        cursor.execute(sql_query)
         
-        # التحقق من صحة cam_mac
-        if not validate_cam_mac(cam_mac):
-            return jsonify({
-                "status": "error",
-                "message": "Invalid camera MAC address",
-                "data": None
-            }), 403
+        # إذا كان الاستعلام لا يعيد أي أعمدة (مثل SELECT COUNT(*))
+        if cursor.description is None:
+            return jsonify({"data": []}), 200
+            
+        columns = [desc[0] for desc in cursor.description]
+        rows = cursor.fetchall()
+        
+        # تحويل النتائج إلى JSON قابل للتسلسل
+        result = []
+        for row in rows:
+            row_dict = {}
+            for i, col in enumerate(columns):
+                # معالجة أنواع البيانات غير القابلة للتسلسل مباشرةً
+                value = row[i]
+                if isinstance(value, (datetime.date, datetime.datetime)):
+                    value = value.isoformat()
+                elif isinstance(value, decimal.Decimal):
+                    value = float(value)
+                row_dict[col] = value
+            result.append(row_dict)
+        
+        # إرجاع الرد مع ضمان تنسيق JSON صحيح
+        response_data = {"data": result}
+        return Response(
+            json.dumps(response_data, ensure_ascii=False),
+            status=200,
+            mimetype='application/json; charset=utf-8'
+        )
         
-        # توليد استعلام SQL
-        sql_query = generate_sql_gemini(natural_query, cam_mac)
-        if not sql_query:
-            return jsonify({
-                "status": "error",
-                "message": "Failed to generate SQL query",
-                "data": None
-            }), 500
-
-        print(f"Generated SQL: {sql_query}")
-
-        # التأكد من أن الاستعلام SELECT فقط
-        if not re.match(r'^\s*SELECT', sql_query, re.IGNORECASE):
-            return jsonify({
-                "status": "error",
-                "message": "Only SELECT queries are allowed",
-                "data": None
-            }), 403
-
-        # تنفيذ الاستعلام
-        conn = get_db_connection()
-        if not conn:
-            return jsonify({
-                "status": "error",
-                "message": "Database connection failed",
-                "data": None
-            }), 500
-
-        try:
-            with conn.cursor() as cursor:
-                cursor.execute(sql_query)
-                
-                # إذا كان الاستعلام لا يعيد بيانات (مثل SELECT COUNT)
-                if cursor.description is None:
-                    return jsonify({
-                        "status": "success",
-                        "message": "Query executed successfully",
-                        "data": []
-                    }), 200
-                
-                columns = [desc[0] for desc in cursor.description]
-                rows = cursor.fetchall()
-                
-                # تحويل النتائج إلى قاموس
-                result_data = []
-                for row in rows:
-                    row_dict = {}
-                    for i, col in enumerate(columns):
-                        # تحويل أنواع البيانات غير القابلة للتسلسل
-                        if isinstance(row[i], (datetime.date, datetime.time, datetime.datetime)):
-                            row_dict[col] = row[i].isoformat()
-                        elif isinstance(row[i], decimal.Decimal):
-                            row_dict[col] = float(row[i])
-                        else:
-                            row_dict[col] = row[i]
-                    result_data.append(row_dict)
-                
-                return jsonify({
-                    "status": "success",
-                    "message": "Query executed successfully",
-                    "data": result_data
-                }), 200
-
-        except Exception as e:
-            print(f"SQL execution error: {e}")
-            return jsonify({
-                "status": "error",
-                "message": f"Database error: {str(e)}",
-                "data": None,
-                "generated_sql": sql_query
-            }), 500
-
-        finally:
-            if conn:
-                conn.close()
-
     except Exception as e:
-        print(f"Unexpected error: {e}")
+        print(f"SQL execution error: {e}")
         return jsonify({
-            "status": "error",
-            "message": f"Internal server error: {str(e)}",
-            "data": None
+            "error": str(e),
+            "generated_sql": sql_query
         }), 500
+    finally:
+        if cursor:
+            cursor.close()
+        if conn:
+            conn.close()
 
 @app.route('/')
 def home():