Update app.py

app.py

@@ -132,7 +132,7 @@ def validate_cam_mac(cam_mac):
 
 # --- توليد SQL باستخدام Gemini مع تخصيص حسب cam_mac ---
 def generate_sql_gemini(natural_language_query, cam_mac):
-    prompt = f"""YYou are a PostgreSQL expert.
+    prompt = f"""You are a PostgreSQL expert.
 Your job is to convert a natural language query into a SQL SELECT statement, based on the following database schema.
 
 The query **must always be filtered by the camera MAC address: '{cam_mac}'**, using the appropriate field.
@@ -246,23 +246,35 @@ def handle_query():
         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)
+        # تحويل النتائج إلى قائمة من القواميس
+        result_data = []
+        for row in rows:
+            row_dict = {}
+            for i, col in enumerate(columns):
+                # تحويل أنواع البيانات غير القابلة للتسلسل JSON
+                if isinstance(row[i], (datetime.date, datetime.time, datetime.datetime)):
+                    row_dict[col] = str(row[i])
+                else:
+                    row_dict[col] = row[i]
+            result_data.append(row_dict)
+        
+        response = {
+            "status": "success",
+            "data": result_data,
+            "query": natural_query,
+            "sql_query": sql_query
+        }
         
-        return Response(
-            response_json,
-            status=200,
-            mimetype='application/json; charset=utf-8'
-        )
+        return jsonify(response)
         
     except Exception as e:
         print(f"SQL execution error: {e}")
-        return jsonify({"error": str(e), "generated_sql": sql_query}), 500
+        return jsonify({
+            "status": "error",
+            "message": str(e),
+            "generated_sql": sql_query
+        }), 500
     finally:
         if cursor:
             cursor.close()
@@ -277,4 +289,4 @@ def home():
     """
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=7860) 
+    app.run(host='0.0.0.0', port=7860)