Update app.py

app.py

@@ -507,6 +507,27 @@ Use [out:json][timeout:25]; at top.
 End with: out center;
 """
 
+
+from pathlib import Path
+
+OSM_PROMPT_PATH = Path("osm_query_system.txt")  # veya Path("data/osm_query_system.txt")
+
+try:
+    with OSM_PROMPT_PATH.open("r", encoding="utf-8") as f:
+        OSM_QUERY_SYSTEM = f.read()
+        print(f"OSM system prompt '{OSM_PROMPT_PATH}' dosyasından yüklendi.")
+except FileNotFoundError:
+    print(f"UYARI: {OSM_PROMPT_PATH} bulunamadı, kısa yedek prompt kullanılacak.")
+    OSM_QUERY_SYSTEM = """
+You are an expert in OpenStreetMap and Overpass API.
+Produce only valid Overpass QL.
+No explanations. No markdown.
+Use [out:json][timeout:25]; at top.
+End with: out center;
+"""
+
+
+
 def generate_overpass_query_from_llm(prompt: str, model_name: str) -> str:
     """
     Doğal dilde verilen prompt'u kullanarak Overpass QL sorgusu üretir.
@@ -564,20 +585,21 @@ def normalize_overpass_query(raw_query: str) -> str:
 # ==========================================
 #  MAHALLE KARŞILAŞTIRMA BAĞLAMI
 # ==========================================
-def prepare_comparison(city, district1, neigh1, district2, neigh2):
+def prepare_comparison(city1, district1, neigh1,city1, district2, neigh2):
     """
     Butona basıldığında:
       - Her iki mahalle için OSM özetini hazırlar
       - İki metin döndürür
       - LLM için karşılaştırma bağlamını üretir
     """
-    city = (city or "").strip()
+    city1 = (city1 or "").strip()
     district1 = (district1 or "").strip()
     neigh1 = (neigh1 or "").strip()
+    city2 = (city2 or "").strip()
     district2 = (district2 or "").strip()
     neigh2 = (neigh2 or "").strip()
 
-    if not city or not district1 or not neigh1 or not district2 or not neigh2:
+    if not city1 or not district1 or not city1 or not neigh1 or not district2 or not neigh2:
         msg = "Şehir, ilçe ve iki mahalle de girilmelidir."
         return (msg, msg, "", "<b>Harita için yeterli veri yok.</b>")
 
@@ -586,9 +608,9 @@ def prepare_comparison(city, district1, neigh1, district2, neigh2):
     labels2 = "Bu mahalle için isim verisi çıkarılamadı."
 
     # Mahalle 1
-    gdf1 = get_neighborhood_gdf(city, district1, neigh1)
+    gdf1 = get_neighborhood_gdf(city1, district1, neigh1)
     if gdf1 is None or len(gdf1) == 0:
-        stats1 = f"{city} / {district1} / {neigh1} için veri bulunamadı."
+        stats1 = f"{city1} / {district1} / {neigh1} için veri bulunamadı."
         summary1 = None
     else:
         pois1 = get_pois_within(gdf1)
@@ -598,9 +620,9 @@ def prepare_comparison(city, district1, neigh1, district2, neigh2):
         labels1 = build_poi_names_text(pois1)
 
     # Mahalle 2
-    gdf2 = get_neighborhood_gdf(city, district2, neigh2)
+    gdf2 = get_neighborhood_gdf(city2, district2, neigh2)
     if gdf2 is None or len(gdf2) == 0:
-        stats2 = f"{city} / {district2} / {neigh2} için veri bulunamadı."
+        stats2 = f"{city2} / {district2} / {neigh2} için veri bulunamadı."
         summary2 = None
     else:
         pois2 = get_pois_within(gdf2)
@@ -611,13 +633,15 @@ def prepare_comparison(city, district1, neigh1, district2, neigh2):
 
     # LLM bağlamı
     compare_context_parts = [
-        f"Şehir: {city}",
+        f"Şehir: {city1}",
         "",
         f"1. Mahalle: {neigh1} (İlçe: {district1})",
         stats1,
         "",
         "1. mahalledeki önemli POI isimleri (okullar, eczaneler, marketler, kafeler vb.):",
         labels1,
+        "",
+         f"Şehir: {city2}",
         "",
         f"2. Mahalle: {neigh2} (İlçe: {district2})",
         stats2,
@@ -1239,14 +1263,16 @@ with gr.Blocks() as demo:
         with gr.Column(scale=1):
             gr.Markdown("### Mahalle Karşılaştırma")
         
-            city_in = gr.Textbox(
-                label="Şehir",
-                value="Ankara",
-                placeholder="Örn: Ankara",
-            )
+            
         
             # 1. mahalle: ilçe + mahalle aynı satırda
             with gr.Row():
+                city_in1 = gr.Textbox(
+                label="1. Şehir",
+                value="Ankara",
+                placeholder="Örn: Ankara",
+                )
+                
                 district1_in = gr.Textbox(
                     label="1. İlçe",
                     value="Gölbaşı",
@@ -1262,6 +1288,11 @@ with gr.Blocks() as demo:
         
             # 2. mahalle: ilçe + mahalle aynı satırda
             with gr.Row():
+                city_in2 = gr.Textbox(
+                    label="2. Şehir",
+                    value="Ankara",
+                    placeholder="Örn: Ankara",
+                )
                 district2_in = gr.Textbox(
                     label="2. İlçe",
                     value="Gölbaşı",
@@ -1326,7 +1357,7 @@ with gr.Blocks() as demo:
 
             nearest_poi_btn.click(
                 fn=nearest_poi_wrapper,
-                inputs=[city_in, district1_in, neigh1_in, poi_type_dropdown],
+                inputs=[city_in1, district1_in, neigh1_in, poi_type_dropdown],
                 outputs=[nearest_poi_box],
             )
 
@@ -1351,7 +1382,7 @@ with gr.Blocks() as demo:
 
             compare_btn.click(
                 fn=prepare_comparison,
-                inputs=[city_in, district1_in, neigh1_in, district2_in, neigh2_in],
+                inputs=[city_in1, district1_in, neigh1_in,city_in1, district2_in, neigh2_in],
                 outputs=[stats1_box, stats2_box, compare_state, map_html],
             )