Update app.py

copied from github

app.py

@@ -19,7 +19,21 @@ reader = easyocr.Reader(
     user_network_directory='/tmp/.EasyOCR'   # ✅ Also tell it where user models are
 )
 
+def get_trip_info(trip_id):
+    try:
+        with open('trips.txt', 'r') as f:
+            for line in f:
+                if trip_id in line:
+                    # Split the line by commas and get the route information
+                    parts = line.strip().split(',')
+                    if len(parts) >= 2:
+                        return parts[3].strip() # third part
+    except Exception as e:
+        print(f"Error reading trips.txt: {e}")
+    return None
+
 def get_vehicle_locations_and_occupancy(vehicle_numbers):
+    print("DEBUG: Called get_vehicle_locations_and_occupancy with vehicle_numbers:", vehicle_numbers)
     url = "https://bustime.ttc.ca/gtfsrt/vehicles?debug"
     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',
@@ -30,32 +44,58 @@ def get_vehicle_locations_and_occupancy(vehicle_numbers):
         'Connection': 'keep-alive',
         'Upgrade-Insecure-Requests': '1'
     }
-    response = requests.get(url, headers=headers)
+    try:
+        print("DEBUG: Sending GET request to", url)
+        response = requests.get(url, headers=headers, timeout=10)
+        print("DEBUG: Response status code:", response.status_code)
+        response.raise_for_status()
+    except Exception as e:
+        print("ERROR: Exception during requests.get:", e)
+        return jsonify({"error": f"Failed to fetch vehicle data: {e}"}), 500
+
     text = response.text
+    print("DEBUG: Length of response text:", len(text))
+    if len(text) < 1000:
+        print("DEBUG: Response text (first 500 chars):", text[:500])
 
     entities = text.split('entity {')[1:]  # skip the header
+    print("DEBUG: Number of entities found:", len(entities))
+
+    # Ensure vehicle_numbers are strings for comparison
+    vehicle_numbers = set(str(num) for num in vehicle_numbers)
+    print("DEBUG: vehicle_numbers as strings:", vehicle_numbers)
 
     results = []
-    for entity in entities:
+    for idx, entity in enumerate(entities):
         vehicle_id_matches = re.findall(r'vehicle\s*\{\s*id: "(\d+)"', entity)
         if not vehicle_id_matches:
+            print(f"DEBUG: No vehicle id found in entity {idx}")
             continue
         vehicle_id = vehicle_id_matches[-1]
         if vehicle_id not in vehicle_numbers:
+            print(f"DEBUG: vehicle_id {vehicle_id} not in requested vehicle_numbers")
             continue
 
-        # Find latitude, longitude, occupancy_status
         lat_match = re.search(r'latitude: (-?[\d\.]+)', entity)
         lon_match = re.search(r'longitude: (-?[\d\.]+)', entity)
         occ_match = re.search(r'occupancy_status: ([A-Z_]+)', entity)
+        trip_id_match = re.search(r'trip_id: "(\d+)"', entity)
+
+        print(f"DEBUG: vehicle_id={vehicle_id}, lat={lat_match.group(1) if lat_match else None}, lon={lon_match.group(1) if lon_match else None}, occ={occ_match.group(1) if occ_match else None}")
+
+        trip_id = trip_id_match.group(1) if trip_id_match else None
+        route_info = get_trip_info(trip_id) if trip_id else None
 
         results.append({
             'vehicle_id': vehicle_id,
             'latitude': float(lat_match.group(1)) if lat_match else None,
             'longitude': float(lon_match.group(1)) if lon_match else None,
-            'occupancy_status': occ_match.group(1) if occ_match else None
+            'occupancy_status': occ_match.group(1) if occ_match else None,
+            #'trip_id': trip_id, # not needed
+            'route_info': route_info
         })
 
+    print("DEBUG: Final results to return:", results)
     return results
 
 @app.route('/', methods=['GET'])
@@ -134,16 +174,29 @@ def seek():
         # Get minutes
         minpred_span = p_tag.find('span', class_='minpred')
         if minpred_span:
-            inner_span = minpred_span.find('span')
-            if inner_span and inner_span.text.strip().isdigit():
-                minutes = inner_span.text.strip()
-                vehicle_data['minutes'] = f"{minutes} minutes"
+            secs_span = minpred_span.find('span', id=re.compile(r'SECS\d+')) # will always exist
+            secs_value = secs_span.text.strip()
+            if secs_value == "0" or secs_value.startswith("!"):
+                vehicle_data['minutes'] = "Now"
+            else:
+                vehicle_data['minutes'] = f"{secs_value} minutes"
+
+        # Get delay text and color (only spans with color: rgb(...) and NOT background-color)
+        delay_span = None
+        for span in p_tag.find_all('span', style=True):
+            style = span['style']
+            if 'color: rgb(' in style and 'background-color' not in style:
+                delay_span = span
+                break
 
-        # Get delay text and color
-        delay_span = p_tag.find('span', style=re.compile(r'color'))
         if delay_span:
             vehicle_data['delay_text'] = delay_span.get_text(strip=True)
-            vehicle_data['delay_color'] = delay_span.get('style').replace('color: ', '')
+            # Extract just the rgb(...) value
+            rgb_match = re.search(r'color:\s*(rgb\([^)]+\))', delay_span['style'])
+            if rgb_match:
+                vehicle_data['delay_color'] = rgb_match.group(1)
+            else:
+                vehicle_data['delay_color'] = delay_span['style']  # fallback to full style if not matched
 
         # Get vehicle number
         vehicle_link = p_tag.find('a', href="#MapMain")
@@ -157,14 +210,14 @@ def seek():
                 vehicle_data['vehicle_number'] = match.group(1)
 
         # Get stop location description
-        text_nodes = [t for t in p_tag.stripped_strings]
-        location = None
-        for text in reversed(text_nodes):
-            if any(word in text.lower() for word in ['at', 'past', 'aprchg']):
-                location = text
-                break
-        if location:
-            vehicle_data['location'] = location
+        #text_nodes = [t for t in p_tag.stripped_strings]
+        #location = None
+        #for text in reversed(text_nodes):
+        #    if any(word in text.lower() for word in ['at', 'past', 'aprchg']):
+        #        location = text
+        #        break
+        #if location:
+        #    vehicle_data['location'] = location
 
         vehicles.append(vehicle_data)
     
@@ -188,8 +241,8 @@ def vehicle_status():
 
 #@app.route('/test_vehicle', methods=['GET'])
 #def test_vehicle():
-#    info = get_vehicle_locations_and_occupancy(['1217'])
-#    return jsonify(info)
+#    info = get_vehicle_locations_and_occupancy(['3433', '1676'])
+#    return info
 
 if __name__ == '__main__':
-    app.run(debug=True, port=5000)
+    app.run(debug=True, port=5000)