Update app.py

app.py

@@ -6,7 +6,6 @@ import requests
 from bs4 import BeautifulSoup
 import tempfile
 import os
-import sys
 
 app = Flask(__name__)
 CORS(app)
@@ -64,9 +63,7 @@ def get_vehicle_locations_and_occupancy(vehicle_numbers):
         })
     return results
 
-def get_vehicle_destinations(route, stopcall):
-    print(f"DEBUG: Fetching vehicle destinations for route: {route}, stopcall: {stopcall}")
-    
+def get_vehicle_destinations(route, stopcall):    
     url = f'https://www.transsee.ca/predict?s=ttc.{route}.{stopcall}'
     headers = {
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36',
@@ -81,9 +78,7 @@ def get_vehicle_destinations(route, stopcall):
     try:
         response = requests.get(url, headers=headers, timeout=10)
         response.raise_for_status()
-        print("DEBUG: Successfully fetched data from Transsee.")
     except Exception as e:
-        print(f"ERROR: Failed to fetch vehicle data: {e}")
         return jsonify({"error": f"Failed to fetch vehicle data: {e}"}), 500
     
     soup = BeautifulSoup(response.text, 'html.parser')
@@ -94,21 +89,17 @@ def get_vehicle_destinations(route, stopcall):
     dest_par = soup.find('p', id=pattern)
     
     if dest_par:
-        print(f"DEBUG: Found destination paragraph with id: {dest_par['id']}", file=sys.stderr)
         contents = dest_par.contents
-        print(f"DEBUG: Contents: {contents}", file=sys.stderr)
         if len(contents) > 1 and "going" in contents[1]:
             stuff = contents[1].strip().split(" ")
-            branch = False
             if len(stuff) > 1: branch = stuff[1]
             destination_text = dest_par.contents[3].strip()
             # Remove directional prefixes
-            destination_text = re.sub(r'^(North|South|East|West) to\s+', '', destination_text, flags=re.IGNORECASE)
+            destination_text = re.sub(r'^(North|South|East|West)\s+', '', destination_text, flags=re.IGNORECASE)
             if branch:
                 vehicle_info['destination'] = branch + " " + destination_text
             else:
                 vehicle_info['destination'] = destination_text
-            print(f"DEBUG: Extracted destination text: {destination_text}", file=sys.stderr)
         else:
             vehicle_info['destination'] = []
             new_pattern = re.compile(rf'^{route}_{stopcall}\d*_\d*$')
@@ -118,14 +109,12 @@ def get_vehicle_destinations(route, stopcall):
                 vehicle_link = p_tag.find('a', href="#MapMain")
                 if vehicle_link and vehicle_link.text.strip().isdigit():
                     vehicle_data['vehicle_number'] = vehicle_link.text.strip()
-                    print(f"DEBUG: Found vehicle number: {vehicle_data['vehicle_number']}")
                 else:
                     # Case 2: Vehicle number is in plain text like "Vehicle 3417 Load"
                     text = p_tag.get_text()
                     match = re.search(r'Vehicle\s+(\d+)', text)
                     if match:
                         vehicle_data['vehicle_number'] = match.group(1)
-                        print(f"DEBUG: Extracted vehicle number: {vehicle_data['vehicle_number']}")
                 span_element = p_tag.find('span', class_='tsfont')
                 if span_element:
                     destination_text = span_element.next_sibling.strip()
@@ -133,13 +122,39 @@ def get_vehicle_destinations(route, stopcall):
                     # Remove directional prefixes
                     destination_text = re.sub(r'^(North|South|East|West)\s+', '', destination_text, flags=re.IGNORECASE)
                     vehicle_data['destination'] = branch + " " + destination_text
-                    print(f"DEBUG: Extracted destination: {vehicle_data['destination']}")
-                vehicle_info['destination'].append(vehicle_data)
-    else:
-        print("WARNING: No destination paragraph found.")
+                vehicle_info['destination'].append(vehicle_data)   
 
     return vehicle_info
 
+def get_vehicle_delay(vehicle_number):
+    url = f"https://www.transsee.ca/fleetfind?a=ttc&findtrack=1&q={vehicle_number}&Go=Go"
+    headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36',
+        'Referer': 'https://www.transsee.ca/',
+        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+        'Accept-Language': 'en-US,en;q=0.9',
+        'DNT': '1',  # Do Not Track
+        'Connection': 'keep-alive',
+        'Upgrade-Insecure-Requests': '1'
+    }
+    try:
+        response = requests.get(url, headers=headers, timeout=10)
+        response.raise_for_status()
+    except Exception as e:
+        return jsonify({"error": f"Failed to fetch vehicle data: {e}"}), 500
+    
+    soup = BeautifulSoup(response.text, 'html.parser')
+    delay_par = soup.find('p', id=f"{vehicle_number}")
+    if delay_par:
+        for span in delay_par.find_all('span', style=True):
+            if 'color: light-dark' in span['style']:
+                delay_span = span
+                break
+        if delay_span:
+            delay_text = delay_span.get_text(strip=True)
+    return delay_text if delay_text else "0"
+
+
 @app.route('/', methods=['GET'])
 def health_check():
     return 'Backend is running!', 200
@@ -315,10 +330,30 @@ def destinations():
     info = get_vehicle_destinations(route, stopCall)
     return info
 
-@app.route('/test_destinations')
-def test_destinations():
-    return jsonify(get_vehicle_destinations('167', '6653'))
+@app.route('/vehicleinfo', methods=['POST'])
+def vehicleinfo():
+    if not request.is_json:
+        return jsonify({'error': 'Request must be JSON'}), 400
+    data = request.get_json()
+    vehicle_number = data.get('vehicle_number')
+    if not vehicle_number:
+        return jsonify({'error': 'vehicle_number is required'}), 400
+
+    location = get_vehicle_locations_and_occupancy(vehicle_number)[0]
+    delay = get_vehicle_delay(vehicle_number)
+    return jsonify({
+        'location': location,
+        'delay': delay
+    })
 
+#@app.route('/beta_testing')
+#def beta_testing():
+#    location = get_vehicle_locations_and_occupancy(['3166'])[0]
+#    delay = get_vehicle_delay('3166')
+#    return jsonify({
+#        'location': location,
+#        'delay': delay
+#    })
 
 if __name__ == '__main__':
     app.run(debug=True, port=5000)