Up

app.py

@@ -1,110 +1,102 @@
-from fastapi import FastAPI, HTTPException, Depends, Request
+from fastapi import FastAPI, HTTPException, Request, Form
 from fastapi.responses import HTMLResponse
 from fastapi.templating import Jinja2Templates
-from sqlalchemy.orm import Session
-from sqlalchemy import create_engine, Column, Integer, Float, String, DateTime
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker
 from datetime import datetime, timedelta
 import random
 import folium
 from folium.plugins import MarkerCluster
+import csv
 import os
 
-# Sử dụng thư mục /tmp để lưu trữ cơ sở dữ liệu SQLite
-DATABASE_URL = "sqlite:///./database.db"
-
-engine = create_engine(DATABASE_URL, connect_args={"check_same_thread": False})
-SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-
-Base = declarative_base()
-
-class WifiSignal(Base):
-    __tablename__ = "wifi_signal"
-    id = Column(Integer, primary_key=True, index=True)
-    latitude = Column(Float, index=True)
-    longitude = Column(Float, index=True)
-    timestamp = Column(DateTime, index=True)
-    signal_strength = Column(Integer)
-
-# Tạo tất cả các bảng
-if not os.path.exists('/app/database.db'):
-    Base.metadata.create_all(bind=engine)
-
 app = FastAPI()
 templates = Jinja2Templates(directory="templates")
 
-def get_db():
-    db = SessionLocal()
-    try:
-        yield db
-    finally:
-        db.close()
+CSV_FILE = "wifi_signals.csv"
 
 @app.post("/api/generate-data")
-def generate_data(db: Session = Depends(get_db)):
+def generate_data():
     base_latitude = 35.6837
     base_longitude = 139.6805
     start_date = datetime(2024, 8, 1)
     end_date = datetime(2024, 8, 7)
     delta = end_date - start_date
 
-    for _ in range(100):
-        random_days = random.randint(0, delta.days)
-        random_seconds = random.randint(0, 86400)
-        random_time = start_date + timedelta(days=random_days, seconds=random_seconds)
+    with open(CSV_FILE, mode='w', newline='') as file:
+        writer = csv.writer(file)
+        writer.writerow(['latitude', 'longitude', 'timestamp', 'signal_strength'])
 
-        random_latitude = base_latitude + random.uniform(-0.01, 0.01)
-        random_longitude = base_longitude + random.uniform(-0.01, 0.01)
-        random_signal_strength = random.randint(10, 50)
+        for _ in range(100):
+            random_days = random.randint(0, delta.days)
+            random_seconds = random.randint(0, 86400)
+            random_time = start_date + timedelta(days=random_days, seconds=random_seconds)
 
-        wifi_signal = WifiSignal(
-            latitude=random_latitude,
-            longitude=random_longitude,
-            timestamp=random_time,
-            signal_strength=random_signal_strength
-        )
+            random_latitude = base_latitude + random.uniform(-0.01, 0.01)
+            random_longitude = base_longitude + random.uniform(-0.01, 0.01)
+            random_signal_strength = random.randint(0, 4)
 
-        db.add(wifi_signal)
+            writer.writerow([
+                random_latitude,
+                random_longitude,
+                random_time.strftime('%Y-%m-%d %H:%M:%S'),
+                random_signal_strength
+            ])
 
-    db.commit()
     return {"message": "Demo data generated successfully"}
 
 @app.delete("/api/delete-data")
-def delete_data(db: Session = Depends(get_db)):
+def delete_data():
     try:
-        num_rows_deleted = db.query(WifiSignal).delete()
-        db.commit()
-        return {"message": f"Deleted {num_rows_deleted} rows from the database."}
+        if os.path.exists(CSV_FILE):
+            os.remove(CSV_FILE)
+        
+        # Create a new empty CSV file with headers
+        with open(CSV_FILE, mode='w', newline='') as file:
+            writer = csv.writer(file)
+            writer.writerow(['latitude', 'longitude', 'timestamp', 'signal_strength'])
+        
+        return {"message": "Data file deleted and reset successfully"}
     except Exception as e:
-        db.rollback()
         raise HTTPException(status_code=500, detail=f"An error occurred: {str(e)}")
 
 @app.post("/api/upload")
-def upload_data(request: Request, db: Session = Depends(get_db)):
-    data = request.json()
-    latitude = data.get('latitude')
-    longitude = data.get('longitude')
-    timestamp = datetime.strptime(data.get('timestamp'), '%Y-%m-%d %H:%M:%S')
-    signal_strength = data.get('signal_strength')
-    
-    wifi_signal = WifiSignal(latitude=latitude, longitude=longitude, timestamp=timestamp, signal_strength=signal_strength)
-    db.add(wifi_signal)
-    db.commit()
-    
-    return {"message": "Data uploaded successfully"}
+async def upload_data(
+    latitude: float = Form(...),
+    longitude: float = Form(...),
+    timestamp: str = Form(...),
+    signal_strength: int = Form(...)
+):
+    try:
+        # Validate timestamp format
+        datetime.strptime(timestamp, '%Y-%m-%d %H:%M:%S')
+        
+        with open(CSV_FILE, mode='a', newline='') as file:
+            writer = csv.writer(file)
+            writer.writerow([latitude, longitude, timestamp, signal_strength])
+        
+        return {"message": "Data uploaded successfully"}
+    except ValueError:
+        raise HTTPException(status_code=400, detail="Invalid timestamp format. Use 'YYYY-MM-DD HH:MM:SS'")
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"An error occurred: {str(e)}")
 
 @app.get("/", response_class=HTMLResponse)
-def show_map(request: Request, start_date: str = None, end_date: str = None, db: Session = Depends(get_db)):
-    query = db.query(WifiSignal)
-
-    if start_date and end_date:
-        start_datetime = datetime.strptime(start_date, '%Y-%m-%d')
-        end_datetime = datetime.strptime(end_date, '%Y-%m-%d')
-        query = query.filter(WifiSignal.timestamp >= start_datetime, WifiSignal.timestamp <= end_datetime)
-
-    signals = query.all()
-    signal_data = [(signal.latitude, signal.longitude, signal.signal_strength) for signal in signals]
+def show_map(request: Request, start_date: str = None, end_date: str = None):
+    signal_data = []
+
+    if os.path.exists(CSV_FILE):
+        with open(CSV_FILE, mode='r') as file:
+            reader = csv.reader(file)
+            next(reader)  # Skip header row
+            for row in reader:
+                lat, lon, timestamp, strength = row
+                timestamp = datetime.strptime(timestamp, '%Y-%m-%d %H:%M:%S')
+                if start_date and end_date:
+                    start_datetime = datetime.strptime(start_date, '%Y-%m-%d')
+                    end_datetime = datetime.strptime(end_date, '%Y-%m-%d')
+                    if start_datetime <= timestamp <= end_datetime:
+                        signal_data.append((float(lat), float(lon), int(strength)))
+                else:
+                    signal_data.append((float(lat), float(lon), int(strength)))
 
     if signal_data:
         min_signal = min(s[2] for s in signal_data)
@@ -131,3 +123,9 @@ def show_map(request: Request, start_date: str = None, end_date: str = None, db:
     
     map_html = m._repr_html_()
     return templates.TemplateResponse("map.html", {"request": request, "map_html": map_html, "start_date": start_date, "end_date": end_date})
+
+
+if __name__ == "__main__":
+    import uvicorn
+    uvicorn.run(app, host="0.0.0.0", port=5000)
+

requirements.txt

@@ -1,5 +1,6 @@
 fastapi==0.95.1
 uvicorn==0.22.0
-sqlalchemy==1.4.22
+sqlalchemy==2.0.16
 folium==0.13.0
 jinja2==3.1.2
+python-multipart

wifi_signals.csv

@@ -0,0 +1,2 @@
+latitude,longitude,timestamp,signal_strength
+35.6895,139.6917,2024-08-29 14:30:00,4