Update app.py (#10)

- Update app.py (6457ba759732ab40cd009ab1047ca9f8e18850fe)

app.py

@@ -5,6 +5,7 @@ from datetime import datetime, timedelta
 import folium
 from streamlit_folium import folium_static
 import groq
+import time
 
 # --- 📂 Load Bus Data ---
 data_path = "pdp.csv"
@@ -27,9 +28,7 @@ groq.api_key = GROQ_API_KEY
 # --- 🔓 Authenticate User ---
 def authenticate(username, password):
     """Authenticate user."""
-    if username in USER_CREDENTIALS and USER_CREDENTIALS[username] == password:
-        return True
-    return False
+    return USER_CREDENTIALS.get(username) == password
 
 
 # --- 🔮 Predict Bus Status using Groq API ---
@@ -51,35 +50,49 @@ def predict_bus_status(bus_number, city, source_area, destination_area):
 def add_random_delay(arrival_time_str):
     """Add 1 to 10 minutes delay to arrival time."""
     try:
-        # Handle 'DD-MM-YYYY HH:MM' format
         arrival_time = datetime.strptime(arrival_time_str, "%d-%m-%Y %H:%M")
     except ValueError:
-        # Fallback to 'YYYY-MM-DD HH:MM:SS' if needed
         arrival_time = datetime.strptime(arrival_time_str, "%Y-%m-%d %H:%M:%S")
 
-    delay_minutes = random.randint(1, 10)  # Add random delay of 1 to 10 minutes
+    delay_minutes = random.randint(1, 10)
     new_arrival_time = arrival_time + timedelta(minutes=delay_minutes)
     return new_arrival_time.strftime("%Y-%m-%d %H:%M:%S")
 
 
-# --- 🚌 Predict Upcoming Bus with Same Route ---
-def predict_upcoming_buses(bus_number, city, area_df):
-    """Predict upcoming buses on the same route."""
-    same_route_df = area_df[area_df["same_route_return"] == bus_number]
-    
+# --- 🚍 Predict Upcoming Buses on Same Route / Nearby Area ---
+def predict_upcoming_buses(bus_number, city, source_area, destination_area, area_df):
+    """Predict upcoming buses on the same route or nearby areas."""
+    # Filter buses on the same route
+    same_route_df = area_df[
+        (area_df["bus_route"] == area_df[area_df["bus_number"] == bus_number]["bus_route"].values[0]) &
+        (area_df["arrival_time"] > datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+    ]
+
     if not same_route_df.empty:
         upcoming_buses = []
         for _, row in same_route_df.iterrows():
-            upcoming_time = row['upcoming_arrival_time']
-            delayed_time = add_random_delay(upcoming_time)
-            upcoming_buses.append(f"🚌 Bus {row['upcoming_bus_number']} → {row['bus_route']} arriving at {delayed_time}")
+            delayed_time = add_random_delay(row['arrival_time'])
+            upcoming_buses.append(f"🚌 Bus {row['bus_number']} → {row['bus_route']} arriving at {delayed_time}")
         return "\n".join(upcoming_buses)
-    return "⚠️ No upcoming buses available on the same route."
+
+    # Fallback: Suggest nearby same-area buses
+    nearby_buses_df = area_df[
+        (area_df["area"] == source_area) | (area_df["area"] == destination_area)
+    ]
+
+    if not nearby_buses_df.empty:
+        nearby_buses = []
+        for _, row in nearby_buses_df.iterrows():
+            delayed_time = add_random_delay(row['arrival_time'])
+            nearby_buses.append(f"🚌 Nearby Bus {row['bus_number']} → {row['bus_route']} arriving at {delayed_time}")
+        return "\n".join(nearby_buses)
+
+    return "⚠️ No upcoming buses available for the same route or nearby areas."
 
 
 # --- 🗺️ Plot Bus Route Map ---
 def plot_bus_route(source_area, destination_area, area_df):
-    """Plot bus route between source and destination with real-time location."""
+    """Plot bus route between source and destination."""
     source_df = area_df[area_df["area"] == source_area]
     dest_df = area_df[area_df["area"] == destination_area]
 
@@ -92,16 +105,28 @@ def plot_bus_route(source_area, destination_area, area_df):
 
     m = folium.Map(location=[(source_lat + dest_lat) / 2, (source_lon + dest_lon) / 2], zoom_start=12)
 
-    # Mark Source & Destination
     folium.Marker([source_lat, source_lon], popup=f"🚌 Source: {source_area}", icon=folium.Icon(color="green")).add_to(m)
     folium.Marker([dest_lat, dest_lon], popup=f"🏁 Destination: {destination_area}", icon=folium.Icon(color="red")).add_to(m)
 
-    # Draw Route Line
     folium.PolyLine([(source_lat, source_lon), (dest_lat, dest_lon)], color="blue", weight=5, opacity=0.8).add_to(m)
 
     folium_static(m)
 
 
+# --- ⏰ Stable Real-Time Clock on Top ---
+def update_clock(clock_placeholder):
+    """Continuously update and display a real-time clock after login."""
+    now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    clock_placeholder.markdown(
+        f"""
+        <h3 style="text-align: center; color: green;">
+        ⏰ Live Time: {now}
+        </h3>
+        """,
+        unsafe_allow_html=True
+    )
+
+
 # --- 🚀 Streamlit App Interface ---
 st.title("🚍 Tamil Nadu Bus Tracking & Prediction System")
 
@@ -122,8 +147,12 @@ if not st.session_state.authenticated:
 
 # --- 🗺️ Main Content after Login ---
 if st.session_state.authenticated:
+    # --- ⏰ Live Clock after Login ---
+    clock_placeholder = st.empty()
+    update_clock(clock_placeholder)
+
     st.sidebar.header("🌆 City, Source & Destination Selection")
-    
+
     city = st.sidebar.selectbox("Select City", df["city"].unique())
     area_df = df[df["city"] == city]
 
@@ -141,15 +170,14 @@ if st.session_state.authenticated:
     plot_bus_route(source_area, destination_area, area_df)
 
     # --- 🔮 Predict Bus and Same Route Buses ---
-    st.subheader("🔮 Bus Prediction & Same Route Upcoming Buses")
+    st.subheader("🔮 Bus Prediction & Same Route/Area Upcoming Buses")
     if not filtered_df.empty:
         for _, row in filtered_df.iterrows():
             bus_number = row['bus_number']
             prediction = predict_bus_status(bus_number, city, source_area, destination_area)
             st.success(f"🔮 Prediction for Bus {bus_number}: {prediction}")
 
-            # Predict upcoming buses for same route
-            upcoming_buses_info = predict_upcoming_buses(bus_number, city, area_df)
+            upcoming_buses_info = predict_upcoming_buses(bus_number, city, source_area, destination_area, area_df)
             st.info(upcoming_buses_info)
 
     # --- 🔓 Logout Option ---