Refactor: Integrate backend API and normalize data
This commit integrates the backend API for fetching and updating report data. It also includes a normalization function to handle data consistency between the API and local storage. Co-authored-by: anthonymuncher <anthonymuncher@gmail.com>
This commit is contained in:
Cursor Agent
64
backend/app/routes/analytics.py
Normal file
64
backend/app/routes/analytics.py
Normal file
@@ -0,0 +1,64 @@
|
||||
# app/routes/analytics.py
|
||||
from fastapi import APIRouter, Depends
|
||||
from sqlalchemy.orm import Session
|
||||
from sqlalchemy import func
|
||||
from app.database import get_db
|
||||
from app.models.ticket_model import Ticket, SeverityLevel, TicketStatus
|
||||
from typing import Dict, Any
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
# ----------------------
|
||||
# GET /analytics
|
||||
# ----------------------
|
||||
@router.get("/analytics", response_model=Dict[str, Any])
|
||||
def analytics(db: Session = Depends(get_db), cluster_size: float = 0.01):
|
||||
"""
|
||||
Returns summary statistics for tickets:
|
||||
- Total tickets
|
||||
- Counts by category
|
||||
- Counts by severity
|
||||
- Counts by status
|
||||
- Optional: location clustering (hotspots) using grid-based approach
|
||||
"""
|
||||
# Total tickets
|
||||
total_tickets = db.query(func.count(Ticket.id)).scalar()
|
||||
|
||||
# Counts by category
|
||||
category_counts = dict(
|
||||
db.query(Ticket.category, func.count(Ticket.id))
|
||||
.group_by(Ticket.category)
|
||||
.all()
|
||||
)
|
||||
|
||||
# Counts by severity
|
||||
severity_counts = dict(
|
||||
db.query(Ticket.severity, func.count(Ticket.id))
|
||||
.group_by(Ticket.severity)
|
||||
.all()
|
||||
)
|
||||
|
||||
# Counts by status
|
||||
status_counts = dict(
|
||||
db.query(Ticket.status, func.count(Ticket.id))
|
||||
.group_by(Ticket.status)
|
||||
.all()
|
||||
)
|
||||
|
||||
# ----------------------
|
||||
# Location Clustering
|
||||
# ----------------------
|
||||
# Simple grid-based clustering: round lat/lon to nearest cluster_size
|
||||
tickets = db.query(Ticket.latitude, Ticket.longitude).all()
|
||||
location_clusters: Dict[str, int] = {}
|
||||
for lat, lon in tickets:
|
||||
key = f"{round(lat/cluster_size)*cluster_size:.4f},{round(lon/cluster_size)*cluster_size:.4f}"
|
||||
location_clusters[key] = location_clusters.get(key, 0) + 1
|
||||
|
||||
return {
|
||||
"total_tickets": total_tickets,
|
||||
"category_counts": category_counts,
|
||||
"severity_counts": {k.value: v for k, v in severity_counts.items()},
|
||||
"status_counts": {k.value: v for k, v in status_counts.items()},
|
||||
"location_clusters": location_clusters # format: "lat,lon": count
|
||||
}
|
||||
100
backend/app/routes/report.py
Normal file
100
backend/app/routes/report.py
Normal file
@@ -0,0 +1,100 @@
|
||||
from fastapi import APIRouter, UploadFile, File, Form, Depends, HTTPException
|
||||
from fastapi.responses import JSONResponse
|
||||
from sqlalchemy.orm import Session
|
||||
from app.database import get_db
|
||||
from app.services.ticket_service import TicketService, SeverityLevel
|
||||
from app.models.ticket_model import User
|
||||
from app.services.global_ai import get_ai_service
|
||||
import os, uuid, logging
|
||||
|
||||
router = APIRouter()
|
||||
logger = logging.getLogger(__name__)
|
||||
logger.setLevel(logging.DEBUG)
|
||||
|
||||
UPLOAD_DIR = "app/static/uploads"
|
||||
os.makedirs(UPLOAD_DIR, exist_ok=True)
|
||||
|
||||
@router.post("/report")
|
||||
async def report_issue(
|
||||
user_id: str = Form(...),
|
||||
latitude: float = Form(...),
|
||||
longitude: float = Form(...),
|
||||
description: str = Form(""),
|
||||
image: UploadFile = File(...),
|
||||
db: Session = Depends(get_db)
|
||||
):
|
||||
logger.debug("Received report request")
|
||||
ticket_service = TicketService(db)
|
||||
|
||||
# Validate user
|
||||
user = db.query(User).filter(User.id == user_id).first()
|
||||
if not user:
|
||||
logger.error(f"User with id {user_id} not found")
|
||||
raise HTTPException(status_code=404, detail=f"User with id {user_id} not found")
|
||||
logger.debug(f"User found: {user.name} ({user.email})")
|
||||
|
||||
# Save uploaded image
|
||||
file_ext = os.path.splitext(image.filename)[1]
|
||||
filename = f"{uuid.uuid4()}{file_ext}"
|
||||
file_path = os.path.join(UPLOAD_DIR, filename)
|
||||
try:
|
||||
content = await image.read()
|
||||
with open(file_path, "wb") as f:
|
||||
f.write(content)
|
||||
logger.debug(f"Saved image to {file_path} ({len(content)} bytes)")
|
||||
except Exception as e:
|
||||
logger.exception("Failed to save uploaded image")
|
||||
raise HTTPException(status_code=500, detail="Failed to save uploaded image")
|
||||
|
||||
# Get initialized AI service
|
||||
ai_service = get_ai_service()
|
||||
logger.debug("AI service ready")
|
||||
|
||||
# Run AI predictions
|
||||
try:
|
||||
category = ai_service.classify_category(file_path)
|
||||
logger.debug(f"Classification: {category}")
|
||||
|
||||
if category.lower() == "pothole":
|
||||
severity_str, annotated_path = ai_service.detect_pothole_severity(file_path)
|
||||
logger.debug(f"Detection: severity={severity_str}, path={annotated_path}")
|
||||
severity = {
|
||||
"High": SeverityLevel.HIGH,
|
||||
"Medium": SeverityLevel.MEDIUM,
|
||||
"Low": SeverityLevel.LOW,
|
||||
"Unknown": SeverityLevel.NA
|
||||
}.get(severity_str, SeverityLevel.NA)
|
||||
else:
|
||||
severity = SeverityLevel.NA
|
||||
logger.debug("No detection needed")
|
||||
except Exception as e:
|
||||
logger.exception("AI prediction failed")
|
||||
category = "Unknown"
|
||||
severity = SeverityLevel.NA
|
||||
|
||||
# Create ticket
|
||||
ticket = ticket_service.create_ticket(
|
||||
user_id=user.id,
|
||||
image_path=file_path,
|
||||
category=category,
|
||||
severity=severity,
|
||||
latitude=latitude,
|
||||
longitude=longitude,
|
||||
description=description
|
||||
)
|
||||
logger.info(f"Ticket created: {ticket.id} for user {user.id}")
|
||||
|
||||
response = {
|
||||
"ticket_id": ticket.id,
|
||||
"user_id": user.id,
|
||||
"user_name": user.name,
|
||||
"user_email": user.email,
|
||||
"category": ticket.category,
|
||||
"severity": ticket.severity.value,
|
||||
"status": ticket.status.value,
|
||||
"description": ticket.description,
|
||||
"image_path": ticket.image_path
|
||||
}
|
||||
|
||||
logger.debug(f"Response: {response}")
|
||||
return JSONResponse(status_code=201, content=response)
|
||||
96
backend/app/routes/tickets.py
Normal file
96
backend/app/routes/tickets.py
Normal file
@@ -0,0 +1,96 @@
|
||||
# app/routes/tickets.py
|
||||
from typing import Optional, List
|
||||
import logging
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from sqlalchemy.orm import Session
|
||||
from app.database import get_db
|
||||
from app.services.ticket_service import TicketService, TicketStatus, SeverityLevel
|
||||
from pydantic import BaseModel
|
||||
|
||||
router = APIRouter()
|
||||
logger = logging.getLogger(__name__)
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
|
||||
class TicketStatusUpdate(BaseModel):
|
||||
new_status: TicketStatus
|
||||
|
||||
# ----------------------
|
||||
# GET /tickets
|
||||
# ----------------------
|
||||
@router.get("/tickets", response_model=List[dict])
|
||||
def list_tickets(
|
||||
user_id: Optional[str] = Query(None, description="Filter by user ID"),
|
||||
category: Optional[str] = Query(None, description="Filter by category"),
|
||||
severity: Optional[SeverityLevel] = Query(None, description="Filter by severity"),
|
||||
status: Optional[TicketStatus] = Query(None, description="Filter by status"),
|
||||
db: Session = Depends(get_db)
|
||||
):
|
||||
service = TicketService(db)
|
||||
tickets = service.list_tickets(user_id=user_id, category=category, severity=severity, status=status)
|
||||
return [
|
||||
{
|
||||
"ticket_id": t.id,
|
||||
"user_id": t.user_id,
|
||||
"category": t.category,
|
||||
"severity": t.severity.value,
|
||||
"status": t.status.value,
|
||||
"description": t.description,
|
||||
"latitude": t.latitude,
|
||||
"longitude": t.longitude,
|
||||
"image_path": t.image_path,
|
||||
"created_at": t.created_at,
|
||||
"updated_at": t.updated_at
|
||||
} for t in tickets
|
||||
]
|
||||
|
||||
# ----------------------
|
||||
# GET /tickets/{ticket_id}
|
||||
# ----------------------
|
||||
@router.get("/tickets/{ticket_id}", response_model=dict)
|
||||
def get_ticket(ticket_id: str, db: Session = Depends(get_db)):
|
||||
service = TicketService(db)
|
||||
ticket = service.get_ticket(ticket_id)
|
||||
if not ticket:
|
||||
raise HTTPException(status_code=404, detail=f"Ticket {ticket_id} not found")
|
||||
return {
|
||||
"ticket_id": ticket.id,
|
||||
"user_id": ticket.user_id,
|
||||
"category": ticket.category,
|
||||
"severity": ticket.severity.value,
|
||||
"status": ticket.status.value,
|
||||
"description": ticket.description,
|
||||
"latitude": ticket.latitude,
|
||||
"longitude": ticket.longitude,
|
||||
"image_path": ticket.image_path,
|
||||
"created_at": ticket.created_at,
|
||||
"updated_at": ticket.updated_at
|
||||
}
|
||||
|
||||
# ----------------------
|
||||
# PATCH /tickets/{ticket_id} - Update status
|
||||
# ----------------------
|
||||
@router.patch("/tickets/{ticket_id}", response_model=dict)
|
||||
def update_ticket_status(
|
||||
ticket_id: str,
|
||||
status_update: TicketStatusUpdate, # JSON body with new_status
|
||||
db: Session = Depends(get_db)
|
||||
):
|
||||
service = TicketService(db)
|
||||
try:
|
||||
ticket = service.update_ticket_status(ticket_id, status_update.new_status)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to update ticket status: {e}")
|
||||
raise HTTPException(status_code=400, detail=str(e))
|
||||
return {
|
||||
"ticket_id": ticket.id,
|
||||
"user_id": ticket.user_id,
|
||||
"category": ticket.category,
|
||||
"severity": ticket.severity.value,
|
||||
"status": ticket.status.value,
|
||||
"description": ticket.description,
|
||||
"latitude": ticket.latitude,
|
||||
"longitude": ticket.longitude,
|
||||
"image_path": ticket.image_path,
|
||||
"created_at": ticket.created_at,
|
||||
"updated_at": ticket.updated_at
|
||||
}
|
||||
18
backend/app/routes/users.py
Normal file
18
backend/app/routes/users.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# app/routes/users.py
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from sqlalchemy.orm import Session
|
||||
from app.database import get_db
|
||||
from app.services.ticket_service import TicketService
|
||||
from app.models.ticket_model import User
|
||||
from app.schemas.user_schema import UserCreate # import schema
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
@router.post("/users")
|
||||
def create_user(user: UserCreate, db: Session = Depends(get_db)):
|
||||
service = TicketService(db)
|
||||
existing_user = db.query(User).filter(User.email == user.email).first()
|
||||
if existing_user:
|
||||
raise HTTPException(status_code=400, detail="User with this email already exists")
|
||||
new_user = service.create_user(user.name, user.email)
|
||||
return {"id": new_user.id, "name": new_user.name, "email": new_user.email}
|
||||
Reference in New Issue
Block a user