Upload 2 files

src/app.py

@@ -26,7 +26,7 @@ app = FastAPI(title="WheresMyBus v2.0 API")
 # Setup CORS for your React frontend
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["*"], # In production, use your actual React URL
+    allow_origins=["https://wheresmybus.vercel.app"],
     allow_methods=["*"],
     allow_headers=["*"],
 )
@@ -289,48 +289,151 @@ async def get_stop_view(stop_code: str):
 
     from datetime import timezone
     now = datetime.now(timezone.utc).timestamp()
+    service_day_ts = get_service_day_start_ts()
     two_hours_out = now + 7200
-    arrivals = []
-
-    # 3. Search the FULL itineraries for our target_id
+    
+    # 3. Determine today's service_id based on day of week
+    # Service ID 1 = Weekdays (Mon-Fri), 2 = Saturday, 3 = Sunday/Holidays
+    try:
+        from zoneinfo import ZoneInfo
+        eastern_tz = ZoneInfo("America/Toronto")
+    except ImportError:
+        import pytz
+        eastern_tz = pytz.timezone("America/Toronto")
+    
+    now_eastern = datetime.now(timezone.utc).astimezone(eastern_tz)
+    weekday = now_eastern.weekday()  # 0=Monday, 6=Sunday
+    
+    if weekday < 5:  # Monday-Friday
+        today_service_id = 1
+    elif weekday == 5:  # Saturday
+        today_service_id = 2
+    else:  # Sunday
+        today_service_id = 3
+    
+    # 4. Build a map of trip_id -> arrival info for merging
+    arrival_map = {}
+    
+    # 5. Get scheduled arrivals for this stop, filtered by today's service_id
+    schedule_query = """
+        SELECT 
+            CAST(t.trip_id AS VARCHAR) as trip_id,
+            t.trip_headsign,
+            COALESCE(st.departure_time, st.arrival_time) as scheduled_time,
+            r.route_short_name
+        FROM stop_times st
+        JOIN trips t ON CAST(st.trip_id AS VARCHAR) = CAST(t.trip_id AS VARCHAR)
+        JOIN routes r ON t.route_id = r.route_id
+        WHERE CAST(st.stop_id AS VARCHAR) = ?
+          AND CAST(t.service_id AS INTEGER) = ?
+    """
+    schedule_rows = db.execute(schedule_query, [target_id, today_service_id]).fetchall()
+    
+    # Process scheduled arrivals
+    for row in schedule_rows:
+        trip_id = row[0]
+        destination = row[1]
+        scheduled_hms = row[2]
+        route = row[3]
+        
+        # Calculate scheduled timestamp
+        h, m, s = map(int, scheduled_hms.split(':'))
+        extra_days = h // 24
+        scheduled_ts = service_day_ts + (extra_days * 86400) + hms_to_seconds(scheduled_hms)
+        
+        # Only include if within 2 hours and hasn't passed
+        if now <= scheduled_ts <= two_hours_out:
+            arrival_map[trip_id] = {
+                "trip_id": trip_id,
+                "route": route,
+                "destination": destination,
+                "scheduled_ts": scheduled_ts,
+                "pred_time": None,
+                "has_prediction": False
+            }
+    
+    # 5. Now, add/update with real-time predictions (even if not in schedule)
     for trip_id, itinerary in predictions.items():
         if target_id in itinerary:
             pred_time = itinerary[target_id]
             
-            # Only include if the bus hasn't passed the stop yet and is within 2 hours
+            # Only include predictions within 2 hours
             if now <= pred_time <= two_hours_out:
-                
-                # 4. Handshake with DB for destination and schedule
-                query = """
-                    SELECT t.trip_headsign, st.arrival_time as scheduled_time, r.route_short_name
-                    FROM trips t
-                    JOIN stop_times st ON CAST(t.trip_id AS VARCHAR) = CAST(st.trip_id AS VARCHAR)
-                    JOIN routes r ON t.route_id = r.route_id
-                    WHERE CAST(t.trip_id AS VARCHAR) = ? AND CAST(st.stop_id AS VARCHAR) = ?
-                    LIMIT 1
-                """
-                row = db.execute(query, [trip_id, target_id]).fetchone()
-
-                if row:
-                    # Find the actual bus for fullness (if it's on the road)
-                    bus = vehicles.get(trip_id)
+                # If we already have this trip from schedule, update it
+                if trip_id in arrival_map:
+                    arrival_map[trip_id]["pred_time"] = pred_time
+                    arrival_map[trip_id]["has_prediction"] = True
+                else:
+                    # This is a real-time-only prediction (not in static schedule)
+                    # Try to get route/destination from database
+                    query = """
+                        SELECT t.trip_headsign, r.route_short_name
+                        FROM trips t
+                        JOIN routes r ON t.route_id = r.route_id
+                        WHERE CAST(t.trip_id AS VARCHAR) = ?
+                        LIMIT 1
+                    """
+                    row = db.execute(query, [trip_id]).fetchone()
+                    
+                    if row:
+                        destination = row[0]
+                        route = row[1]
+                    else:
+                        destination = "Unknown"
+                        route = "Unknown"
+                    
+                    # Try to get scheduled time if available
+                    scheduled_query = """
+                        SELECT COALESCE(st.departure_time, st.arrival_time) as scheduled_time
+                        FROM stop_times st
+                        WHERE CAST(st.trip_id AS VARCHAR) = ? AND CAST(st.stop_id AS VARCHAR) = ?
+                        LIMIT 1
+                    """
+                    sched_row = db.execute(scheduled_query, [trip_id, target_id]).fetchone()
                     
-                    # DELAY = SCHEDULED - PREDICTED (negative = late, positive = early)
-                    service_day_ts = get_service_day_start_ts()
-                    scheduled_hms = row[1]
-                    # Handle GTFS times >= 24 hours (next day)
-                    h, m, s = map(int, scheduled_hms.split(':'))
-                    extra_days = h // 24
-                    plan_ts = service_day_ts + (extra_days * 86400) + hms_to_seconds(scheduled_hms)
+                    if sched_row:
+                        scheduled_hms = sched_row[0]
+                        h, m, s = map(int, scheduled_hms.split(':'))
+                        extra_days = h // 24
+                        scheduled_ts = service_day_ts + (extra_days * 86400) + hms_to_seconds(scheduled_hms)
+                    else:
+                        scheduled_ts = pred_time  # Use prediction as fallback
                     
-                    arrivals.append({
-                        "route": row[2],
-                        "destination": row[0],
-                        "eta_mins": round((pred_time - now) / 60),
-                        "delay_mins": round((plan_ts - pred_time) / 60),
-                        "fullness": translate_occupancy(bus['occupancy']) if bus else "Unknown",
-                        "vehicle_id": bus['id'] if bus else "In Transit"
-                    })
+                    arrival_map[trip_id] = {
+                        "trip_id": trip_id,
+                        "route": route,
+                        "destination": destination,
+                        "scheduled_ts": scheduled_ts,
+                        "pred_time": pred_time,
+                        "has_prediction": True
+                    }
+    
+    # 6. Build final arrivals list
+    arrivals = []
+    for trip_id, info in arrival_map.items():
+        # Use prediction if available, otherwise use scheduled
+        if info["has_prediction"] and info["pred_time"]:
+            eta_mins = round((info["pred_time"] - now) / 60)
+            delay_mins = round((info["scheduled_ts"] - info["pred_time"]) / 60)
+        else:
+            eta_mins = round((info["scheduled_ts"] - now) / 60)
+            delay_mins = 0
+        
+        # Skip entries with Unknown route
+        if info["route"] == "Unknown":
+            continue
+        
+        # Find the actual bus for fullness (if it's on the road)
+        bus = vehicles.get(trip_id)
+        
+        arrivals.append({
+            "route": info["route"],
+            "destination": info["destination"],
+            "eta_mins": eta_mins,
+            "delay_mins": delay_mins,
+            "fullness": translate_occupancy(bus['occupancy']) if bus else "Unknown",
+            "vehicle_id": bus['id'] if bus else None
+        })
 
     arrivals.sort(key=lambda x: x['eta_mins'])
     return {