Update app.py

app.py

@@ -4,153 +4,122 @@ from datetime import datetime, timedelta
 import xml.etree.ElementTree as ET
 import json
 
+api_key=os.environ.get("api_key")
+client_id=os.environ.get("client_id")
+
 def get_station_info(pattern, client_id, api_key):
-    """Sucht Bahnhof und gibt Name sowie EVA-Nummer zurück."""
     url = f"https://apis.deutschebahn.com/db-api-marketplace/apis/timetables/v1/station/{pattern}"
     headers = {'DB-Client-Id': client_id, 'DB-Api-Key': api_key, 'accept': 'application/xml'}
     try:
         response = requests.get(url, headers=headers, timeout=10)
         root = ET.fromstring(response.content)
         station = root.find('station')
-        if station is not None:
-            return {'name': station.get('name'), 'eva': station.get('eva')}
-    except Exception as e:
-        print(f"Error fetching station: {e}")
-    return None
+        return {'name': station.get('name'), 'eva': station.get('eva')} if station is not None else None
+    except: return None
 
-def get_journey_details(trip_id, dest_eva, client_id, api_key):
-    """Holt Ankunftszeit am Ziel-Bahnhof via Trip-ID."""
+def get_arrival_time(trip_id, dest_name, client_id, api_key):
+    """Ruft die Ankunftszeit für einen spezifischen Zug am Zielbahnhof ab."""
     url = f"https://apis.deutschebahn.com/db-api-marketplace/apis/timetables/v1/journey/{trip_id}"
     headers = {'DB-Client-Id': client_id, 'DB-Api-Key': api_key, 'accept': 'application/xml'}
     try:
         response = requests.get(url, headers=headers, timeout=10)
         if response.status_code != 200: return None
         root = ET.fromstring(response.content)
-        
-        # Suche nach dem Stop, der die Ziel-EVA hat
+        # Suche im Fahrtverlauf nach dem Zielbahnhof
         for stop in root.findall('.//s'):
-            if stop.get('eva') == dest_eva:
+            if dest_name.lower() in stop.get('static_name', '').lower():
                 ar = stop.find('ar')
-                if ar is not None:
-                    return ar.get('pt') # Geplante Ankunftszeit
+                if ar is not None: return ar.get('pt') # Geplante Ankunftszeit
     except: pass
     return None
 
 def calculate_duration(dep_str, arr_str):
+    """Berechnet Dauer in Stunden und Minuten."""
     fmt = "%y%m%d%H%M"
-    try:
-        diff = datetime.strptime(arr_str, fmt) - datetime.strptime(dep_str, fmt)
-        hours, remainder = divmod(diff.total_seconds(), 3600)
-        return f"{int(hours)}h {int(remainder // 60)}min"
-    except: return "n/a"
+    dep_dt = datetime.strptime(dep_str, fmt)
+    arr_dt = datetime.strptime(arr_str, fmt)
+    diff = arr_dt - dep_dt
+    hours, remainder = divmod(diff.seconds, 3600)
+    minutes = remainder // 60
+    return f"{hours}h {minutes}min"
 
-def get_next_3_connections(departure_query, destination_query, client_id, api_key):
-    # 1. Bahnhofs-IDs holen
-    dep_info = get_station_info(departure_query, client_id, api_key)
-    dest_info = get_station_info(destination_query, client_id, api_key)
-    
-    if not dep_info: return None, f"Startbahnhof '{departure_query}' nicht gefunden."
-    if not dest_info: return None, f"Zielbahnhof '{destination_query}' nicht gefunden."
+def get_next_3_connections(departure, destination, client_id, api_key):
+    dep_info = get_station_info(departure, client_id, api_key)
+    dest_info = get_station_info(destination, client_id, api_key)
+    if not dep_info or not dest_info: return None, "Bahnhof nicht gefunden."
 
     now = datetime.now()
-    found_conns = []
+    conns = []
     
-    # Wir suchen in den nächsten 10 Stunden (um sicher 3 zu finden, auch in der Nacht)
-    for hour_offset in range(10):
-        if len(found_conns) >= 3: break
-        
-        search_time = now + timedelta(hours=hour_offset)
-        date_str = search_time.strftime("%y%m%d")
-        hour_str = search_time.strftime("%H")
-        
-        url = f"https://apis.deutschebahn.com/db-api-marketplace/apis/timetables/v1/plan/{dep_info['eva']}/{date_str}/{hour_str}"
+    # Suche über die nächsten Stunden
+    for hour_offset in range(5): # Größeres Fenster um sicher 3 zu finden
+        t = now + timedelta(hours=hour_offset)
+        url = f"https://apis.deutschebahn.com/db-api-marketplace/apis/timetables/v1/plan/{dep_info['eva']}/{t.strftime('%y%m%d')}/{t.strftime('%H')}"
         headers = {'DB-Client-Id': client_id, 'DB-Api-Key': api_key, 'accept': 'application/xml'}
         
-        try:
-            res = requests.get(url, headers=headers, timeout=10)
-            if res.status_code != 200: continue
-            root = ET.fromstring(res.content)
+        res = requests.get(url, headers=headers, timeout=10)
+        if res.status_code != 200: continue
+        root = ET.fromstring(res.content)
+        
+        for s in root.findall('.//s'):
+            dp = s.find('dp')
+            if dp is None: continue
             
-            for s in root.findall('.//s'):
-                dp = s.find('dp')
-                if dp is None: continue
+            path = dp.get('ppth', '')
+            if dest_info['name'].lower() in path.lower() or destination.lower() in path.lower():
+                dep_time_raw = dp.get('pt')
+                if not dep_time_raw or datetime.strptime(dep_time_raw, "%y%m%d%H%M") < now: continue
                 
-                # Check ob Ziel in der Route (ppth) vorkommt
-                path = dp.get('ppth', '')
-                dest_name = dest_info['name']
+                # Jetzt Ankunftszeit via Journey-API ermitteln
+                trip_id = s.get('id')
+                arr_time_raw = get_arrival_time(trip_id, dest_info['name'], client_id, api_key)
                 
-                # Filter: Ist das Ziel im Fahrtverlauf?
-                if dest_name.lower() in path.lower() or destination_query.lower() in path.lower():
-                    dep_time_raw = dp.get('pt')
-                    dep_dt = datetime.strptime(dep_time_raw, "%y%m%d%H%M")
-                    
-                    # Nur zukünftige Züge (mit 5 Min Puffer)
-                    if dep_dt >= (now - timedelta(minutes=5)):
-                        trip_id = s.get('id')
-                        arr_time_raw = get_journey_details(trip_id, dest_info['eva'], client_id, api_key)
-                        
-                        if arr_time_raw:
-                            tl = s.find('tl')
-                            found_conns.append({
-                                "zug": f"{tl.get('c','')}{tl.get('n','')}",
-                                "abfahrt": dep_dt.strftime("%H:%M"),
-                                "ankunft": datetime.strptime(arr_time_raw, "%y%m%d%H%M").strftime("%H:%M"),
-                                "dauer": calculate_duration(dep_time_raw, arr_time_raw),
-                                "gleis": dp.get('pp', '-'),
-                                "startort": dep_info['name'],
-                                "zielort": dest_info['name'],
-                                "_dt": dep_dt
-                            })
-                            if len(found_conns) >= 3: break
-        except: continue
+                if arr_time_raw:
+                    conns.append({
+                        "zug": f"{s.find('tl').get('c')}{s.find('tl').get('n')}",
+                        "abfahrt": datetime.strptime(dep_time_raw, "%y%m%d%H%M").strftime("%H:%M"),
+                        "ankunft": datetime.strptime(arr_time_raw, "%y%m%d%H%M").strftime("%H:%M"),
+                        "dauer": calculate_duration(dep_time_raw, arr_time_raw),
+                        "gleis": dp.get('pp', '-'),
+                        "_dt": datetime.strptime(dep_time_raw, "%y%m%d%H%M")
+                    })
+        if len(conns) >= 3: break
 
-    found_conns.sort(key=lambda x: x['_dt'])
-    return found_conns[:3], None
+    conns.sort(key=lambda x: x['_dt'])
+    return conns[:3], None
 
-def process(dep, dest, cid, akey):
-    data, error = get_next_3_connections(dep, dest, cid, akey)
-    
-    if error:
-        return f"### ❌ Fehler\n{error}", json.dumps({"error": error}, indent=2)
+def format_output(dep, dest, client_id, api_key):
+    data, err = get_next_3_connections(dep, dest, client_id, api_key)
+    if err: return err, json.dumps({"error": err})
     
-    if not data:
-        return "### ℹ️ Keine direkten Verbindungen gefunden.", "[]"
-
-    # JSON Output (ohne internes Sortierfeld)
-    json_clean = [{k: v for k, v in c.items() if k != "_dt"} for c in data]
+    # JSON Output
+    clean_json = [{k: v for k, v in c.items() if k != "_dt"} for c in data]
     
-    # Markdown Table
-    md = f"### 🚆 {data[0]['startort']} → {data[0]['zielort']}\n\n"
-    md += "| Zug | Abfahrt | Ankunft | Dauer | Gleis |\n"
+    # Markdown Table Output (Smartphone optimiert)
+    md = f"### 🚆 {dep.upper()} → {dest.upper()}\n\n"
+    md += "| Zug | Ab | An | Dauer | Gl. |\n"
     md += "|:---|:---|:---|:---|:---|\n"
-    for c in json_clean:
+    for c in clean_json:
         md += f"| **{c['zug']}** | {c['abfahrt']} | {c['ankunft']} | {c['dauer']} | {c['gleis']} |\n"
     
-    md += f"\n\n*Abfragezeitpunkt: {datetime.now().strftime('%H:%M')}*"
+    md += f"\n\n*Stand: {datetime.now().strftime('%H:%M')}*"
     
-    return md, json_clean
+    return md, clean_json
+
+# --- Interface ---
+with gr.Blocks(theme=gr.themes.Soft()) as demo:
+    gr.Markdown("# 🚄 DB Timetable Pro")
 
-# --- Gradio UI ---
-with gr.Blocks(theme=gr.themes.Soft(), title="DB Timetable Pro") as demo:
-    gr.Markdown("# 🚄 DB Timetable Professional")
-    
-    with gr.Row():
-        cid = gr.Textbox(label="Client ID", type="password", value="")
-        akey = gr.Textbox(label="API Key", type="password", value="")
-    
     with gr.Row():
-        start = gr.Textbox(label="Von", placeholder="z.B. Berlin Hbf")
-        ziel = gr.Textbox(label="Nach", placeholder="z.B. Hamburg Hbf")
+        start = gr.Textbox(label="Start", placeholder="z.B. Köln Hbf")
+        ziel = gr.Textbox(label="Ziel", placeholder="z.B. Berlin Hbf")
     
-    btn = gr.Button("Nächste 3 Verbindungen suchen", variant="primary")
+    btn = gr.Button("Verbindungen finden", variant="primary")
     
-    with gr.Tabs():
-        with gr.TabItem("📱 Verbindung"):
-            md_out = gr.Markdown("Ergebnisse erscheinen hier...")
-        with gr.TabItem("💻 JSON"):
-            json_out = gr.JSON()
+    display = gr.Markdown()
+    js_out = gr.JSON(label="JSON Daten")
 
-    btn.click(process, [start, ziel, cid, akey], [md_out, json_out])
+    btn.click(format_output, [start, ziel,], [display, js_out])
 
 if __name__ == "__main__":
     demo.launch()