Update app.py

Fixed timing thing

app.py

@@ -2,20 +2,22 @@ from flask import Flask, request, jsonify,render_template
 from flask_cors import CORS
 import requests
 import json
-from datetime import datetime , timedelta
+from datetime import datetime, timedelta, timezone, time as dt_time
 import math
-import os
 import time
-import csv
 import sqlite3
 from bs4 import BeautifulSoup
 
-
-ORS_API_KEY=os.getenv('OSI_API_KEY')
+ORS_API_KEY=os.getenv('ORS_API_KEY')
 Base_url="https://api.openrouteservice.org"
 
 
 app=Flask(__name__)
+IST = timezone(timedelta(hours=5, minutes=30))
+
+
+def now_ist_naive():
+    return datetime.now(IST).replace(tzinfo=None)
 
 APSRTC_HEADERS = {
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36",
@@ -83,19 +85,19 @@ class TNSTCSessionManager:
             
             self.session.get("https://www.tnstc.in/OTRSOnline/jqreq.do?hiddenAction=SearchService", timeout=10)
             
-            self.last_refresh_time = datetime.now().timestamp()
+            self.last_refresh_time = now_ist_naive().timestamp()
         except Exception as e:
             print(f"Failed to refresh session: {e}")
 
     def get_valid_session(self):
-        current_time = datetime.now().timestamp()
+        current_time = now_ist_naive().timestamp()
         if (current_time - self.last_refresh_time) > self.refresh_interval:
             self.refresh_session()    
         return self.session
 
 
 class BusCache:
-    def __init__(self, db_path='/tmp/bus_cache.db'):
+    def __init__(self, db_path='bus_cache.db'):
         self.db_path = db_path
         self.init_db()
     
@@ -129,8 +131,8 @@ class BusCache:
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
         
-        today = datetime.now().strftime("%Y-%m-%d")
-        cutoff_time = datetime.now() - timedelta(hours=max_age_hours)
+        today = now_ist_naive().strftime("%Y-%m-%d")
+        cutoff_time = now_ist_naive() - timedelta(hours=max_age_hours)
         
         cursor.execute('''
             SELECT buses_data, created_at, hit_count, id
@@ -175,7 +177,7 @@ class BusCache:
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
         
-        today = datetime.now().strftime("%Y-%m-%d")
+        today = now_ist_naive().strftime("%Y-%m-%d")
         
         cursor.execute('''
             SELECT id FROM bus_searches
@@ -211,7 +213,7 @@ class BusCache:
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
         
-        cutoff_date = (datetime.now() - timedelta(days=days_old)).strftime("%Y-%m-%d")
+        cutoff_date = (now_ist_naive() - timedelta(days=days_old)).strftime("%Y-%m-%d")
         
         cursor.execute('''
             DELETE FROM bus_searches
@@ -233,7 +235,7 @@ TNSTC_PLACE_CODES = {}
 TNSTC_JSON_MAP = {}
 
 try:
-    
+    import csv
     with open('SETC_tn.csv', 'r', encoding='utf-8') as f:
         reader = csv.DictReader(f)
         for row in reader:
@@ -263,9 +265,9 @@ def sunposition(lat,lon,timestamp):
 	long_rad=math.radians(lon)
 	day_of_year=timestamp.timetuple().tm_yday
 	hour=timestamp.hour+timestamp.minute/60.0
-	declination=23.45 *math.sin(math.radians(360 * (day_of_year)/365))  
+	declination=23.45 *math.sin(math.radians(360 * (day_of_year)/365)) # yes that is 23.45 since day is not like 24 hours rather 1/4 less 24
 	dec_rad=math.radians(declination)
-	hour_angle=15*(hour-12) 
+	hour_angle=15*(hour-12) # 15 degree per hour 
 
 	ha_rad=math.radians(hour_angle)
 
@@ -298,82 +300,116 @@ def bearing_calculation(lat1,long1,lat2,long2):
 	return bearing
 
 
-def shade_finder(coordinates,start_time_str,duration_min):
-
-	hour,minute=map(int,start_time_str.split(':'))
-
-	start_time=datetime.now().replace(hour=hour,minute=minute,second=0,microsecond=0)
-
-	shade_data=[]
+def shade_finder(coordinates, start_time_str, duration_min, journey_date_str=None):
+    try:
+        time_parts = start_time_str.split(':')
+        hour = int(time_parts[0])
+        minute = int(time_parts[1]) if len(time_parts) > 1 else 0
+    except Exception:
+        now = now_ist_naive()
+        hour = now.hour
+        minute = now.minute
+
+    if journey_date_str:
+        try:
+            journey_date = datetime.strptime(journey_date_str, "%Y-%m-%d").date()
+        except ValueError:
+            journey_date = now_ist_naive().date()
+    else:
+        journey_date = now_ist_naive().date()
 
-	total_segments=len(coordinates)-1
+    start_time = datetime.combine(journey_date, dt_time(hour=hour, minute=minute))
 
-	left_side_time=0
-	right_side_time=0
-	if hour >= 18 or hour <6:
-		return{
-		'preferred_side': 'N/A',
-            'preferred_window': 'Night journey - shade analysis not applicable',
+    shade_data = []
+    total_segments = len(coordinates) - 1
+    if total_segments <= 0 or duration_min <= 0:
+        return {
+            'preferred_side': 'N/A',
+            'preferred_window': 'Insufficient route data for shade analysis',
             'left_shade_minutes': 0,
             'right_shade_minutes': 0,
             'shade_percentage': 0,
             'total_duration': duration_min,
-            'is_night': True,
+            'is_night': False,
             'segments': []
-		}
+        }
+
+    left_side_time = 0
+    right_side_time = 0
+    sunlit_segments = 0
 
-	for i in range(total_segments):
+    for i in range(total_segments):
+        lat1, long1 = coordinates[i][1], coordinates[i][0]
+        lat2, long2 = coordinates[i + 1][1], coordinates[i + 1][0]
 
-		lat1,long1=coordinates[i][1],coordinates[i][0]
-		lat2,long2=coordinates[i+1][1],coordinates[i+1][0]
+        segment_time = start_time.timestamp() + (duration_min * 60 * i / total_segments)
+        current_time = datetime.fromtimestamp(segment_time)
 
-		segment_time=start_time.timestamp() + (duration_min * 60 * i/total_segments)
-		current_time=datetime.fromtimestamp(segment_time)
+        bearing = bearing_calculation(lat1, long1, lat2, long2)
+        sun_azimuth, sun_altitude = sunposition(lat1, long1, current_time)
 
-		bearing= bearing_calculation(lat1,long1,lat2,long2)
+        if sun_altitude < 0:
+            continue
+
+        sunlit_segments += 1
+        # Signed angle: +ve means sun on bus right side (clockwise from heading),
+        # so LEFT side seats get better shade.
+        relative_angle = ((sun_azimuth - bearing + 540) % 360) - 180
+
+        # If sun is almost directly ahead/behind, side-window shade is ambiguous.
+        if abs(relative_angle) < 15 or abs(relative_angle) > 165:
+            shade_side = "NONE"
+        elif relative_angle > 0:
+            shade_side = "LEFT"
+            left_side_time += (duration_min / total_segments)
+        else:
+            shade_side = "RIGHT"
+            right_side_time += (duration_min / total_segments)
+
+        shade_data.append({
+            'segment': i,
+            'bearing': round(bearing, 2),
+            'sun_azimuth': round(sun_azimuth, 2),
+            'sun_altitude': round(sun_altitude, 2),
+            'shade_side': shade_side,
+            'time': current_time.strftime('%H:%M')
+        })
 
-		sun_azimuth,sun_altitude=sunposition(lat1,long1,current_time)
+    if sunlit_segments == 0:
+        return {
+            'preferred_side': 'N/A',
+            'preferred_window': 'Night journey - shade analysis not applicable',
+            'left_shade_minutes': 0,
+            'right_shade_minutes': 0,
+            'shade_percentage': 0,
+            'total_duration': duration_min,
+            'is_night': True,
+            'segments': []
+        }
 
-		if sun_altitude <0:
-			continue
-		relative_angle=(sun_azimuth - bearing + 360) % 360
+    if left_side_time >= right_side_time:
+        preferred_side = "LEFT"
+        preferred_window = "Windows on the left side"
+        shade_percentage = round((left_side_time / duration_min) * 100, 1)
+    else:
+        preferred_side = "RIGHT"
+        preferred_window = "Windows on the right side"
+        shade_percentage = round((right_side_time / duration_min) * 100, 1)
 
-		if 90 <= relative_angle <=270:
-			shade_side="Right"
-			left_side_time +=(duration_min/total_segments)
-		else:
-			shade_side="LEFT"
-			right_side_time+=(duration_min/total_segments)
-		shade_data.append({
-			'segment':i,
-			'bearing':round(bearing,2),
-			'sun_azimuth': round(sun_azimuth,2),
-			'sun_altitude':round(sun_altitude,2),
-			'shade_side':shade_side,
-			'time':current_time.strftime('%H:%M')
-
-			})	
-	if left_side_time > right_side_time:
-		preferred_side="LEFT"
-		preferred_window="Windows on the left side"
-		shade_percentage=round((left_side_time/duration_min)*100,1)
-	else:
-		preferred_side="Right"
-		preferred_window="Windows on the Right"
-		shade_percentage=round((right_side_time/duration_min)*100,1)
-	return {
+    return {
         'preferred_side': preferred_side,
         'preferred_window': preferred_window,
         'left_shade_minutes': round(left_side_time, 1),
         'right_shade_minutes': round(right_side_time, 1),
         'shade_percentage': shade_percentage,
         'total_duration': duration_min,
+        'is_night': False,
         'segments': shade_data[:5]
     }
 
 def scrape_fare_only(from_id, to_id):
     
-    today_str = datetime.now().strftime("%d/%m/%Y")
+    today_str = now_ist_naive().strftime("%d/%m/%Y")
     web_url = "https://www.apsrtconline.in/oprs-web/forward/booking/avail/services.do"
     
     headers = {
@@ -397,13 +433,16 @@ def scrape_fare_only(from_id, to_id):
             soup = BeautifulSoup(response.text, 'html.parser')
             fare_map = {}
             
+            # Find all bus services
             services = soup.find_all('div', class_='rSetForward')
             
             for service in services:
                 try:
+                    # Get bus number
                     bus_no_tag = service.find('div', class_='srvceNO')
                     bus_no = bus_no_tag.get_text(strip=True) if bus_no_tag else None
                     
+                    # Get fare (THIS IS THE KEY PART)
                     fare_tag = service.find('span', class_='TickRate')
                     fare = fare_tag.get_text(strip=True) if fare_tag else "N/A"
                     
@@ -452,7 +491,7 @@ def detect_state_from_label(label):
                       'ERODE', 'VELLORE', 'THOOTHUKUDI', 'THANJAVUR',
                       'DINDIGUL', 'CUDDALORE', 'KANCHIPURAM', 'TIRUPPUR',
                       'KARUR', 'RAJAPALAYAM', 'SIVAKASI', 'NAGERCOIL',
-                      'KUMBAKONAM', 'PUDUKKOTTAI', 'HOSUR','TN','CHENNAI']
+                      'KUMBAKONAM', 'PUDUKKOTTAI', 'HOSUR','TN']
 
     karnataka_keywords = ['KARNATAKA', 'BENGALURU', 'BANGALORE', 'MANGALORE', 'MYSURU', 'MYSORE', 'HUBLI', 'BELGAUM', 'SHIVAMOGGA', 'HASSAN', 'UDUPI','KR','KA']
     tg_cities = ['HYDERABAD', 'WARANGAL', 'NIZAMABAD', 'KARIMNAGAR', 'KHAMMAM', 'SECUNDERABAD', 'KUKATPALLY', 'DILSUKHNAGAR', 'MIYAPUR', 'GACHIBOWLI','TG','TS']
@@ -473,6 +512,7 @@ def detect_state_from_label(label):
         if kcity in city:
             return 'KSRTC'
     
+    # Check Andhra Pradesh
     for acity in andhra_keywords:
         if acity in city:
             return 'APSRTC'
@@ -486,7 +526,6 @@ def get_route():
 
     start_coords = req_data.get('start', [77.2090, 28.6139])
     end_coords = req_data.get('end', [78.0081, 27.1767]) 
-    start_time_input = req_data.get('startTime')
 
     url = f"{Base_url}/v2/directions/driving-hgv/geojson"
     params = {
@@ -512,14 +551,20 @@ def get_route():
         duration_sec=summary['duration']
         duration_minutes = int(duration_sec / 60)
         hours=int(duration_sec//3600)
-        
-        current_time_str = start_time_input if start_time_input else datetime.now().strftime("%H:%M")
-        
-        shade_info = shade_finder(r_coordinate, current_time_str, duration_minutes)
+        client_local_time = req_data.get('clientLocalTime')
+        client_local_date = req_data.get('clientLocalDate')
+        if not client_local_time:
+            client_local_time = now_ist_naive().strftime("%H:%M")
+        if not client_local_date:
+            client_local_date = now_ist_naive().strftime("%Y-%m-%d")
+
+        shade_info = shade_finder(r_coordinate, client_local_time, duration_minutes, client_local_date)
+        print('here')
         minutes=int((duration_sec %3600)//60)
         duration_str=f"{hours}h {minutes}min" if hours>0 else f"{minutes}min"
         
         leafly = [[coord[1], coord[0]] for coord in r_coordinate]
+        print(duration_str)
 
         return jsonify({
             'path': leafly,
@@ -551,6 +596,7 @@ def api_search():
             for feature in data.get('features',[]):
                 label=feature['properties']['label']
                 state=detect_state_from_label(label)
+                print(state)
                 suggestions.append({
 					"label":feature['properties']['label'],
 					"coords":feature['geometry']['coordinates'],
@@ -565,7 +611,7 @@ def api_search():
 def get_place_id():
     req_data=request.get_json()
     if not req_data or 'address' not in req_data:
-        return jsonify({"error":"YEH SAHI BHAT NAHI HAI.. I got no place to give ID for"}),400
+        return jsonify({"error":"YEH SAHI BHAT NAHI HAI.. I got not place to give ID for"}),400
 
     search_string = req_data.get('address','').upper()
     state=req_data.get('state','APSRTC')
@@ -624,16 +670,7 @@ def findbus():
 				for bus in data['data']:
 					bus_no=bus.get('oprsNo','').strip()
 					bus['fare']=fare_map.get(bus_no,'N/A')
-					try:
-						dep_time_obj = datetime.strptime(bus['serviceStartTime'], "%H:%M")
-						bus['serviceStartTime'] = dep_time_obj.strftime("%I:%M %p")
-					except (ValueError, TypeError):
-						pass 
-					try:
-						arr_time_obj = datetime.strptime(bus['serviceEndTime'], "%H:%M")
-						bus['serviceEndTime'] = arr_time_obj.strftime("%I:%M %p")
-					except (ValueError, TypeError):
-						pass
+					print(bus['fare'])
 				data['averageFare'] = avg_fare
 
 			bus_cache.save_buses('APSRTC', from_name, to_name, data)
@@ -655,7 +692,7 @@ def findbus2():
     if not from_id or not to_id:
         return jsonify({"error": "Missing Start or End IDs"}), 400
 
-    today_str = datetime.now().strftime("%d/%m/%Y")
+    today_str = now_ist_naive().strftime("%d/%m/%Y")
     
     web_url = "https://www.apsrtconline.in/oprs-web/forward/booking/avail/services.do"
     
@@ -708,7 +745,7 @@ def findbus2():
                         "serviceType": srv_type,
                         "serviceStartTime": start_time,
                         "serviceEndTime": end_time,
-                        "depotName": "APSRTC", 
+                        "depotName": "APSRTC", # Web results often hide depot name
                         "journeyDate": today_str
                     }
                     bus_list.append(bus_obj)
@@ -736,6 +773,8 @@ def get_bus_stops():
         return jsonify({"error": "Missing docId"}), 400
 
     url = "https://utsappapicached01.apsrtconline.in/uts-vts-api/servicewaypointdetails/bydocid"
+    
+    # Using the headers you provided
     payload = {"docId": doc_id}
     
     try:
@@ -763,6 +802,7 @@ def find_buses_kerala():
     
     base_url = f"https://www.kbuses.in/v3/Find/source/{src_slug}/destination/{dst_slug}/type/all/timing/all"
     
+    print(f"🔍 Fetching Kerala buses from: {base_url}")
 
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
@@ -868,9 +908,9 @@ def find_buses_kerala():
                         "duration": duration if duration else "N/A",
                         "fare": fare if fare else "N/A",
                         "depotName": "KERALA",
-                        "serviceDocId": detail_url,
+                        "serviceDocId": detail_url,  # This is the critical field for stops
                         "route": route_info,
-                        "journeyDate": datetime.now().strftime("%d/%m/%Y"),
+                        "journeyDate": now_ist_naive().strftime("%d/%m/%Y"),
                         "page": current_page
                     }
                     
@@ -1003,6 +1043,8 @@ def get_kerala_bus_stops():
 @app.route('/api/find-buses-tnstc', methods=['POST'])
 def find_buses_tnstc():
     req_data = request.get_json()
+    
+    # 1. Input Handling
     from_name = req_data.get('fromName', '')
     to_name = req_data.get('toName', '')
     
@@ -1045,7 +1087,7 @@ def find_buses_tnstc():
     if not from_id or not to_id:
         return jsonify({"error": f"Place ID not found for {from_place} or {to_place}"}), 400
 
-    today_str = datetime.now().strftime("%d/%m/%Y")
+    today_str = now_ist_naive().strftime("%d/%m/%Y")
     url = "https://www.tnstc.in/OTRSOnline/jqreq.do"
     
     payload = {
@@ -1075,9 +1117,10 @@ def find_buses_tnstc():
         
         response = session.post(url, data=payload, timeout=20)
         
+        # Check if session expired during request (Specific TNSTC error check)
         if "Session Expired" in response.text or response.status_code != 200:
-            print(" Session expired during request. Retrying...")
-            tnstc_manager.refresh_session() 
+            print("⚠️ Session expired during request. Retrying...")
+            tnstc_manager.refresh_session() # Force refresh
             session = tnstc_manager.get_valid_session()
             response = session.post(url, data=payload, timeout=20)
 
@@ -1102,18 +1145,9 @@ def find_buses_tnstc():
                 
                 if len(time_divs) >= 2:
                     start_span = time_divs[0].find('span', class_='text-dark')
-                    start_time_raw = start_span.get_text(strip=True) if start_span else "N/A"
+                    start_time = start_span.get_text(strip=True) if start_span else "N/A"
                     end_span = time_divs[-1].find('span', class_='text-dark')
-                    end_time_raw = end_span.get_text(strip=True) if end_span else "N/A"
-                    
-                    try:
-                        start_time = datetime.strptime(start_time_raw, "%H:%M").strftime("%I:%M %p")
-                    except (ValueError, TypeError):
-                        start_time = start_time_raw
-                    try:
-                        end_time = datetime.strptime(end_time_raw, "%H:%M").strftime("%I:%M %p")
-                    except (ValueError, TypeError):
-                        end_time = end_time_raw
+                    end_time = end_span.get_text(strip=True) if end_span else "N/A"
                 
                 duration_elem = item.find('span', class_='duration')
                 duration = duration_elem.get_text(strip=True) if duration_elem else "N/A"
@@ -1170,7 +1204,7 @@ def find_buses_ksrtc_karnataka():
     journey_date_iso = req_data.get('journeyDate')
     
     if not journey_date_iso:
-        journey_date_iso = datetime.now().strftime("%Y-%m-%d")
+        journey_date_iso = now_ist_naive().strftime("%Y-%m-%d")
     
     from_id = (KSRTC_KARNATAKA_MAP.get(from_name_raw.lower()) or 
                KSRTC_KARNATAKA_MAP.get(from_name_raw.upper()) or
@@ -1257,6 +1291,7 @@ def find_buses_ksrtc_karnataka():
         if len(response.content) < 10:
             return jsonify({"error": "Empty response", "data": [], "totalBuses": 0})
         
+        # Parse JSON
         try:
             raw_data = response.json()
         except json.JSONDecodeError as e:
@@ -1264,6 +1299,7 @@ def find_buses_ksrtc_karnataka():
             print(f"Response preview: {response.text[:300]}")
             return jsonify({"error": "Invalid JSON"}), 500
         
+        # Validate data type
         if not isinstance(raw_data, list):
 
             return jsonify({
@@ -1296,8 +1332,8 @@ def find_buses_ksrtc_karnataka():
                     minutes = (duration.seconds % 3600) // 60
                     duration_str = f"{hours}h {minutes}m"
                     
-                    start_time = dep_dt.strftime("%I:%M %p")
-                    end_time = arr_dt.strftime("%I:%M %p")
+                    start_time = dep_dt.strftime("%H:%M")
+                    end_time = arr_dt.strftime("%H:%M")
                     arrival_date = arr_dt.strftime("%d %b")
                 
                 bus_obj = {
@@ -1326,7 +1362,7 @@ def find_buses_ksrtc_karnataka():
                 formatted_buses.append(bus_obj)
                 
             except Exception as parse_err:
-                print(f" Parse error: {parse_err}")
+                print(f"  ⚠️ Parse error: {parse_err}")
                 continue
         
         return jsonify({
@@ -1407,224 +1443,128 @@ def get_ksrtc_ka_stops():
 
 
 def get_tgsrtc_db():
-    conn = sqlite3.connect('tgsrtc.db')
-    conn.row_factory = sqlite3.Row
-    return conn
+    try:
+        conn = sqlite3.connect('tgsrtc.db')
+        conn.row_factory = sqlite3.Row
+        return conn
+    except Exception as e:
+        print(f"DB Connection Error: {e}")
+        return None
 
 @app.route('/api/tgsrtc/resolve-id', methods=['POST'])
 def resolve_tgsrtc_id():
     req_data = request.get_json()
-    place_name = req_data.get('address', '').split(',')[0].strip() 
+    place_name = req_data.get('address', '').split(',')[0].strip() # Extract "Suryapet"
     
     if not place_name:
-        return jsonify({"ids": [], "matches": []}), 400
-    
+        return jsonify({"error": "No place name provided"}), 400
+
     conn = get_tgsrtc_db()
+    if not conn:
+        return jsonify({"error": "Database missing"}), 500
+        
     cursor = conn.cursor()
     
-    patterns = [
-        (place_name, 'exact'),
-        (f"{place_name}%", 'starts_with'),
-        (f"%{place_name}%", 'contains')
-    ]
-    
-    all_stops = []
-    for pattern, match_type in patterns:
-        cursor.execute("""
-            SELECT stop_id, stop_name, stop_lat, stop_lon 
-            FROM stops 
-            WHERE stop_name LIKE ? 
-            ORDER BY stop_name
-        """, (pattern,))
-        
-        stops = cursor.fetchall()
-        if stops:
-            all_stops = stops
-            break
+    print(f"🟣 Searching TGSRTC DB for: {place_name}")
+
+    cursor.execute("SELECT stop_id, stop_name FROM stops WHERE stop_name LIKE ? LIMIT 1", (place_name,))
+    row = cursor.fetchone()
+
+    if not row:
+        cursor.execute("SELECT stop_id, stop_name FROM stops WHERE stop_name LIKE ? LIMIT 1", (f"{place_name}%",))
+        row = cursor.fetchone()
     
+    if not row:
+        cursor.execute("SELECT stop_id, stop_name FROM stops WHERE stop_name LIKE ? LIMIT 1", (f"%{place_name}%",))
+        row = cursor.fetchone()
+
     conn.close()
-    
-    if all_stops:
+
+    if row:
+        print(f"Found TGSRTC ID: {row['stop_id']} for {row['stop_name']}")
         return jsonify({
-            "id": all_stops[0]['stop_id'],
-            "match": all_stops[0]['stop_name'],
-            "state": "TGSRTC",
-            "allMatches": [
-                {
-                    "id": stop['stop_id'],
-                    "name": stop['stop_name'],
-                    "lat": stop['stop_lat'],
-                    "lon": stop['stop_lon']
-                } for stop in all_stops
-            ]
+            "id": row['stop_id'], 
+            "match": row['stop_name'],
+            "state": "TGSRTC"
         })
-    
-    return jsonify({"id": None, "allMatches": []})
-
+    else:
+        print(f"No ID found in stops.txt for {place_name}")
+        return jsonify({"id": None})
 @app.route('/api/find-buses-tgsrtc', methods=['POST'])
 def find_buses_tgsrtc():
     req_data = request.get_json()
-    from_id = str(req_data.get('fromId'))
-    to_id = str(req_data.get('toId'))
-    
+    from_id = req_data.get('fromId')
+    to_id = req_data.get('toId')
+
     if not from_id or not to_id:
-        return jsonify({"error": "Missing Stop IDs"}), 400
-    
+        return jsonify({"error": "Missing valid GTFS Stop IDs"}), 400
+
     conn = get_tgsrtc_db()
     cursor = conn.cursor()
-    
-    cursor.execute("SELECT stop_id, stop_name FROM stops WHERE stop_id = ?", (from_id,))
-    from_stop = cursor.fetchone()
-    cursor.execute("SELECT stop_id, stop_name FROM stops WHERE stop_id = ?", (to_id,))
-    to_stop = cursor.fetchone()
-    
-    if not from_stop or not to_stop:
-        conn.close()
-        return jsonify({"error": "Invalid stop IDs"}), 400
-    
-    print(f"FROM TG ID: {from_id} ({from_stop['stop_name']})")
-    print(f"TO TG ID: {to_id} ({to_stop['stop_name']})")
-    
-    def extract_base_name(stop_name):
-        for delimiter in [' - ', ',', '(']:
-            if delimiter in stop_name:
-                stop_name = stop_name.split(delimiter)[0]
-        return stop_name.strip()
-    
-    from_base = extract_base_name(from_stop['stop_name'])
-    to_base = extract_base_name(to_stop['stop_name'])
-    
-    cursor.execute("SELECT stop_id FROM stops WHERE stop_name LIKE ? OR stop_name LIKE ?", 
-                   (f"{from_base}%", f"%{from_base}%"))
-    from_stop_ids = [str(row['stop_id']) for row in cursor.fetchall()]
-    
-    cursor.execute("SELECT stop_id FROM stops WHERE stop_name LIKE ? OR stop_name LIKE ?", 
-                   (f"{to_base}%", f"%{to_base}%"))
-    to_stop_ids = [str(row['stop_id']) for row in cursor.fetchall()]
-    
-    if not from_stop_ids or not to_stop_ids:
-        conn.close()
-        return jsonify({"error": "No matching stops found", "data": [], "totalBuses": 0})
-    
-    from_placeholders = ','.join('?' * len(from_stop_ids))
-    to_placeholders = ','.join('?' * len(to_stop_ids))
-    
-    utc_now = datetime.utcnow()
-    ist_now = utc_now + timedelta(hours=5, minutes=30)
-    current_time = ist_now.strftime("%H:%M:%S")    
-    
-    query = f'''
-        SELECT DISTINCT
+
+    print(f"🟣 Finding TGSRTC Buses: {from_id} -> {to_id}")
+
+    query = '''
+        SELECT 
             r.route_short_name,
+            r.route_long_name,
             t.trip_id,
-            t.trip_headsign,
             t.bus_class,
-            st1.departure_time,
-            st1.stop_id as from_stop_id,
-            st2.arrival_time,
-            st2.stop_id as to_stop_id
+            st1.departure_time as start_time,
+            st2.arrival_time as end_time
         FROM stop_times st1
         JOIN stop_times st2 ON st1.trip_id = st2.trip_id
         JOIN trips t ON st1.trip_id = t.trip_id
-        LEFT JOIN routes r ON t.route_id = r.route_id
-        WHERE st1.stop_id IN ({from_placeholders})
-          AND st2.stop_id IN ({to_placeholders})
+        JOIN routes r ON t.route_id = r.route_id
+        WHERE st1.stop_id = ? 
+          AND st2.stop_id = ?
           AND CAST(st1.stop_sequence AS INTEGER) < CAST(st2.stop_sequence AS INTEGER)
-          AND st1.departure_time >= ?
         ORDER BY st1.departure_time
-        LIMIT 200
+        LIMIT 50
     '''
-    
-    cursor.execute(query, from_stop_ids + to_stop_ids + [current_time])
-    rows = cursor.fetchall()
-    
-    results = []
-    seen_trips = set()
-    
-    for row in rows:
-        trip_key = f"{row['trip_id']}_{row['departure_time']}"
-        if trip_key in seen_trips:
-            continue
-        seen_trips.add(trip_key)
-        
-        dep_time_obj = datetime.strptime(row['departure_time'], "%H:%M:%S")
-        dep_time_str = dep_time_obj.strftime("%I:%M %p")
-        
-        arr_time_obj = datetime.strptime(row['arrival_time'], "%H:%M:%S")
-        arr_time_str = arr_time_obj.strftime("%I:%M %p")
-        
-        diff = arr_time_obj - dep_time_obj
-        if diff.days < 0:
-            diff = timedelta(days=1) + diff
-        
-        hours = diff.seconds // 3600
-        minutes = (diff.seconds // 60) % 60
-        duration = f"{hours}h {minutes}m" if hours > 0 else f"{minutes}m"
-        
-        cursor.execute("SELECT stop_name FROM stops WHERE stop_id = ?", (row['from_stop_id'],))
-        actual_from = cursor.fetchone()
-        cursor.execute("SELECT stop_name FROM stops WHERE stop_id = ?", (row['to_stop_id'],))
-        actual_to = cursor.fetchone()
-        
-        results.append({
-            "oprsNo": row['route_short_name'] or "N/A",
-            "serviceType": row['bus_class'] or "Ordinary",
-            "serviceStartTime": dep_time_str,
-            "serviceEndTime": arr_time_str,
-            "duration": duration,
-            "via": row['trip_headsign'] or "TGSRTC Route",
-            "route": f"{actual_from['stop_name']} → {actual_to['stop_name']}",
-            "fromStopName": actual_from['stop_name'],
-            "toStopName": actual_to['stop_name'],
-            "source": "TGSRTC",
-            "serviceDocId": row['trip_id'],
-            "journeyDate": datetime.now().strftime("%d-%m-%Y")
-        })
-    
-    conn.close()
-    print(results)
-    return jsonify({"data": results, "source": "TGSRTC", "totalBuses": len(results)})
 
-@app.route('/api/get-tgsrtc-stops', methods=['POST'])
-def get_tgsrtc_stops():
-    req_data = request.get_json()
-    trip_id = str(req_data.get('tripId'))
-    
-    if not trip_id:
-        return jsonify({"error": "Missing trip ID"}), 400
-    
-    conn = get_tgsrtc_db()
-    cursor = conn.cursor()
-    
-    cursor.execute("""
-        SELECT 
-            st.stop_sequence,
-            st.arrival_time,
-            st.departure_time,
-            s.stop_name
-        FROM stop_times st
-        JOIN stops s ON st.stop_id = s.stop_id
-        WHERE st.trip_id = ?
-        ORDER BY CAST(st.stop_sequence AS INTEGER)
-    """, (trip_id,))
-    
-    stops = cursor.fetchall()
-    conn.close()
-    
-    if not stops:
-        return jsonify({"error": "No stops found", "data": []})
-    
-    stops_data = []
-    for stop in stops:
-        time_obj = datetime.strptime(stop['arrival_time'], "%H:%M:%S")
-        time_str = time_obj.strftime("%I:%M %p")
+    try:
+        cursor.execute(query, (from_id, to_id))
+        rows = cursor.fetchall()
         
-        stops_data.append({
-            "placeName": stop['stop_name'],
-            "scheduleArrTime": time_str
-        })
-    
-    return jsonify({"data": stops_data})
+        results = []
+        for row in rows:
+            # Calculate Duration
+            try:
+                t1 = datetime.strptime(row['start_time'], "%H:%M:%S")
+                t2 = datetime.strptime(row['end_time'], "%H:%M:%S")
+                duration = t2 - t1
+                hours, remainder = divmod(duration.seconds, 3600)
+                minutes = remainder // 60
+                dur_str = f"{hours}h {minutes}m"
+            except:
+                dur_str = "N/A"
+
+            results.append({
+                "oprsNo": row['route_short_name'], # e.g. 107VR
+                "serviceType": row['bus_class'] or "TGSRTC",
+                "serviceStartTime": row['start_time'][:5], # HH:MM
+                "serviceEndTime": row['end_time'][:5],
+                "duration": dur_str,
+                "fare": "N/A", # GTFS usually doesn't have fare
+                "depotName": "TGSRTC",
+                "journeyDate": now_ist_naive().strftime("%d-%m-%Y"),
+                "via": row['route_long_name'],
+                "source": "TGSRTC"
+            })
+            
+        conn.close()
+        print(f"Found {len(results)} TGSRTC buses")
+        return jsonify({"data": results, "source": "TGSRTC", "totalBuses": len(results)})
+
+    except Exception as e:
+        print(f"TG SQL Error: {e}")
+        return jsonify({"error": str(e)}), 500
+
+
+
+
+
 @app.route('/')
 def index():
     return render_template('index.html')