Update app.py

app.py

@@ -5,6 +5,7 @@ import xml.etree.ElementTree as ET
 import json
 
 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:
@@ -13,11 +14,12 @@ def get_station_info(pattern, client_id, api_key):
         station = root.find('station')
         if station is not None:
             return {'name': station.get('name'), 'eva': station.get('eva')}
-    except: return None
+    except:
+        return None
     return None
 
 def get_arrival_info(trip_id, dest_eva, client_id, api_key):
-    """Holt die Ankunftszeit am Zielort für eine spezifische Fahrt."""
+    """Ruft die Ankunftszeit für eine spezifische trip_id am Ziel-Bahnhof 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:
@@ -29,35 +31,40 @@ def get_arrival_info(trip_id, dest_eva, client_id, api_key):
                     ar = stop.find('ar')
                     if ar is not None:
                         return ar.get('pt') # Format: YYMMDDHHMM
-    except: pass
+    except:
+        pass
     return None
 
 def calculate_duration(dep_raw, arr_raw):
-    """Berechnet die Reisedauer."""
+    """Berechnet die Reisedauer aus zwei Zeitstempeln (YYMMDDHHMM)."""
     try:
         fmt = "%y%m%d%H%M"
-        diff = datetime.strptime(arr_raw, fmt) - datetime.strptime(dep_raw, fmt)
-        hours, remainder = divmod(diff.total_seconds(), 3600)
+        dep_dt = datetime.strptime(dep_raw, fmt)
+        arr_dt = datetime.strptime(arr_raw, fmt)
+        diff = arr_dt - dep_dt
+        hours, remainder = divmod(int(diff.total_seconds()), 3600)
         minutes = remainder // 60
-        return f"{int(hours)}h {int(minutes)}min"
-    except: return "n/a"
+        return f"{hours}h {minutes}min"
+    except:
+        return "n/a"
 
-def get_connections(departure, destination, client_id, api_key):
+def search_connections(departure, destination, client_id, api_key):
     if not all([departure, destination, client_id, api_key]):
-        return None, "❌ Bitte alle Felder ausfüllen."
+        return "❌ Bitte alle Felder ausfüllen.", []
 
     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."
+        return "❌ Bahnhof nicht gefunden. Bitte Schreibweise prüfen.", []
 
     now = datetime.now()
-    found_connections = []
-    
-    # Suche über 12 Stunden hinweg, um sicher 3 Verbindungen zu finden
+    found_conns = []
+
+    # Suche über die nächsten 12 Stunden hinweg
     for hour_offset in range(12):
-        if len(found_connections) >= 3: break
+        if len(found_conns) >= 3:
+            break
         
         search_time = now + timedelta(hours=hour_offset)
         datum = search_time.strftime("%y%m%d")
@@ -68,81 +75,85 @@ def get_connections(departure, destination, client_id, api_key):
         
         try:
             response = requests.get(url, headers=headers, timeout=10)
-            if response.status_code != 200: continue
-            root = ET.fromstring(response.content)
+            if response.status_code != 200:
+                continue
             
-            for train in root.findall('.//s'):
-                dp = train.find('dp')
-                if dp is None: continue
+            root = ET.fromstring(response.content)
+            for s in root.findall('.//s'):
+                dp = s.find('dp')
+                if dp is None:
+                    continue
                 
                 path = dp.get('ppth', '')
-                # Suche im Pfad nach dem Namen oder der EVA des Ziels
+                # Prüfen ob Ziel im Fahrtverlauf
                 if dest_info['name'].lower() in path.lower() or destination.lower() in path.lower():
                     dep_raw = dp.get('pt', '')
                     dep_dt = datetime.strptime(dep_raw, "%y%m%d%H%M")
                     
-                    if dep_dt >= now:
-                        # Journey Details für Ankunft und Dauer
-                        trip_id = train.get('id')
+                    if dep_dt >= (now - timedelta(minutes=2)):
+                        trip_id = s.get('id')
                         arr_raw = get_arrival_info(trip_id, dest_info['eva'], client_id, api_key)
                         
-                        arrival_time = datetime.strptime(arr_raw, "%y%m%d%H%M").strftime("%H:%M") if arr_raw else "n/a"
-                        duration = calculate_duration(dep_raw, arr_raw) if arr_raw else "n/a"
-                        
-                        tl = train.find('tl')
-                        found_connections.append({
-                            "zug": f"{tl.get('c', '')}{tl.get('n', '')}",
-                            "abfahrt": dep_dt.strftime("%H:%M"),
-                            "ankunft": arrival_time,
-                            "dauer": duration,
-                            "gleis": dp.get('pp', '-'),
-                            "start": dep_info['name'],
-                            "ziel": dest_info['name'],
-                            "_dt": dep_dt
-                        })
-                        if len(found_connections) >= 3: break
-        except: continue
+                        if arr_raw:
+                            tl = s.find('tl')
+                            arr_dt = datetime.strptime(arr_raw, "%y%m%d%H%M")
+                            
+                            found_conns.append({
+                                "zug": f"{tl.get('c','')}{tl.get('n','')}",
+                                "abfahrt": dep_dt.strftime("%H:%M"),
+                                "ankunft": arr_dt.strftime("%H:%M"),
+                                "dauer": calculate_duration(dep_raw, arr_raw),
+                                "gleis": dp.get('pp', '-'),
+                                "start": dep_info['name'],
+                                "ziel": dest_info['name'],
+                                "_dt": dep_dt
+                            })
+                            if len(found_conns) >= 3:
+                                break
+        except:
+            continue
 
-    found_connections.sort(key=lambda x: x['_dt'])
-    return found_connections[:3], None
+    found_conns.sort(key=lambda x: x['_dt'])
+    return None, found_conns[:3]
 
-def main_interface(dep, dest, cid, akey):
-    conns, error = get_connections(dep, dest, cid, akey)
-    if error: return error, json.dumps({"error": error})
-    if not conns: return "Keine Verbindungen gefunden.", "[]"
+def main(departure, destination, client_id, api_key):
+    err, conns = search_connections(departure, destination, client_id, api_key)
     
-    # JSON-Output (Clean)
-    json_output = [{k: v for k, v in c.items() if k != "_dt"} for c in conns]
+    if err:
+        return err, json.dumps({"error": err})
+    if not conns:
+        return "Keine Direktverbindungen gefunden.", "[]"
     
-    # Professional Markdown Table
+    # JSON Output (ohne internes Sortierfeld)
+    clean_json = [{k: v for k, v in c.items() if k != "_dt"} for c in conns]
+    
+    # Markdown Tabelle (Flat & Professional)
     md = f"### 🚆 {conns[0]['start']} → {conns[0]['ziel']}\n\n"
-    md += "| Zug | Abfahrt | Gleis |\n"
-    md += "|:---|:---|:---|\n"
-    for c in json_output:
-        md += f"| **{c['zug']}** | {c['abfahrt']} | {c['gleis']} |\n"
+    md += "| Zug | Abfahrt | Ankunft | Dauer | Gleis |\n"
+    md += "|:---|:---|:---|:---|:---|\n"
+    for c in clean_json:
+        md += f"| **{c['zug']}** | {c['abfahrt']} | {c['ankunft']} | {c['dauer']} | {c['gleis']} |\n"
     
-    md += f"\n\n*Abfrage: {datetime.now().strftime('%H:%M')}*"
+    md += f"\n\n*Abfragezeitpunkt: {datetime.now().strftime('%H:%M')}*"
     
-    return md, json.dumps(json_output, indent=4, ensure_ascii=False)
+    return md, clean_json
 
 # --- Gradio UI ---
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    gr.Markdown("# 🚄 DB Verbindungs-Check")
-    
+    gr.Markdown("# 🚄 DB Timetable Service")
     with gr.Row():
-        cid_input = gr.Textbox(label="Client ID", type="password")
-        akey_input = gr.Textbox(label="API Key", type="password")
-    
+        cid = gr.Textbox(label="Client ID", type="password")
+        akey = gr.Textbox(label="API Key", type="password")
     with gr.Row():
-        dep_input = gr.Textbox(label="Start", placeholder="z.B. Berlin Hbf")
-        dest_input = gr.Textbox(label="Ziel", placeholder="z.B. Hamburg Hbf")
-    
-    btn = gr.Button("Suchen", variant="primary")
+        start = gr.Textbox(label="Start", placeholder="z.B. Berlin Hbf")
+        ziel = gr.Textbox(label="Ziel", placeholder="z.B. Hamburg Hbf")
     
-    md_display = gr.Markdown()
-    json_display = gr.Code(label="JSON", language="json")
+    btn = gr.Button("Nächste 3 Verbindungen suchen", variant="primary")
     
-    btn.click(main_interface, [dep_input, dest_input, cid_input, akey_input], [md_display, json_display])
+    output_md = gr.Markdown()
+    output_json = gr.JSON(label="JSON Result")
+
+    btn.click(main, [start, ziel, cid, akey], [output_md, output_json])
 
 if __name__ == "__main__":
     demo.launch()