Update app.py

app.py

@@ -5,6 +5,9 @@ from datetime import datetime
 from dateutil import parser
 from io import BytesIO
 from PIL import Image
+from geopy.geocoders import Nominatim
+from timezonefinder import TimezoneFinder
+import pytz
 
 # Russian translations for planets
 planet_ru = {
@@ -18,15 +21,11 @@ planet_symbols = {
     'Mars': '♂', 'Jupiter': '♃', 'Saturn': '♄'
 }
 
-# Parse date-time into ISO format
-def parse_date_time(date_time_str):
-    try:
-        dt = parser.parse(date_time_str)
-        return dt.isoformat()
-    except ValueError:
-        return None
+# Initialize geolocator and timezone finder
+geolocator = Nominatim(user_agent="pladder_app")
+tf = TimezoneFinder()
 
-# Convert longitude to zodiac sign and degrees
+# Function to convert longitude to zodiac sign and degrees
 def lon_to_sign(lon):
     signs = ["Овен", "Телец", "Близнецы", "Рак", "Лев", "Дева", 
              "Весы", "Скорпион", "Стрелец", "Козерог", "Водолей", "Рыбы"]
@@ -35,7 +34,7 @@ def lon_to_sign(lon):
     minutes = int((lon % 1) * 60)
     return f"{signs[sign_index]} {degrees}°{minutes}'"
 
-# Calculate PLadder and zone sizes
+# Function to calculate PLadder and zone sizes (unchanged)
 def PLadder_ZSizes(date_time_iso, lat, lon):
     try:
         dt = datetime.fromisoformat(date_time_iso)
@@ -84,7 +83,7 @@ def PLadder_ZSizes(date_time_iso, lat, lon):
     except Exception as e:
         return {"error": f"Ошибка: {str(e)}"}
 
-# Plot the planetary ladder
+# Function to plot the planetary ladder (unchanged)
 def plot_pladder(PLadder):
     fig, ax = plt.subplots()
     ax.plot([0, 1.5, 3, 0], [0, 3, 0, 0], 'k-')  # Triangle
@@ -99,27 +98,63 @@ def plot_pladder(PLadder):
     ax.axis('off')
     return fig
 
-# Main interface function
-def chat_interface(query, lat, lon):
+# Main interface function (reworked)
+def chat_interface(query):
+    # Check for valid command
     if not query.startswith("PLadder "):
-        return "Запрос должен начинаться с 'PLadder' и содержать дату/время.", None
+        return "Запрос должен начинаться с 'PLadder' и содержать дату, время и местоположение.", None
     
-    date_time_str = query.split(" ", 1)[1]
-    date_time_iso = parse_date_time(date_time_str)
-    if not date_time_iso:
+    # Extract date, time, and location
+    query_rest = query[len("PLadder "):]
+    try:
+        parsed_dt, skipped = parser.parse(query_rest, fuzzy_with_tokens=True)
+        location = " ".join(skipped)
+        if not location:
+            return "Укажите местоположение (город или населённый пункт).", None
+    except ValueError:
         return "Неверный формат даты и времени.", None
     
-    result = PLadder_ZSizes(date_time_iso, lat, lon)
+    # Geocode the location to get latitude and longitude
+    try:
+        location_data = geolocator.geocode(location)
+        if location_data:
+            lat = location_data.latitude
+            lon = location_data.longitude
+        else:
+            return f"Не удалось найти координаты для '{location}'.", None
+    except Exception as e:
+        return f"Ошибка геокодирования: {str(e)}", None
+    
+    # Determine time zone from coordinates
+    tz_name = tf.timezone_at(lng=lon, lat=lat)
+    if tz_name is None:
+        return f"Не удалось определить часовой пояс для '{location}'.", None
+    tz = pytz.timezone(tz_name)
+    
+    # Localize the parsed local time and convert to UTC
+    try:
+        timezone_aware_dt = tz.localize(parsed_dt)
+    except pytz.exceptions.AmbiguousTimeError:
+        # Handle ambiguous times (e.g., DST transitions) by defaulting to standard time
+        timezone_aware_dt = tz.localize(parsed_dt, is_dst=False)
+    utc_dt = timezone_aware_dt.astimezone(pytz.utc)
+    date_time_iso = utc_dt.isoformat()
+    
+    # Pass UTC time and coordinates to PLadder_ZSizes
+    result = PLadder_ZSizes(date_time_iso, str(lat), str(lon))
     if "error" in result:
         return result["error"], None
     
+    # Extract results
     PLadder = result["PLadder"]
     ZSizes = result["ZSizes"]
     longitudes = result["longitudes"]
     
+    # Format output text
     planet_list = "\n".join([f"{planet_ru[p]}: {lon_to_sign(longitudes[p])}" for p in PLadder])
     zones_text = "\n".join([f"Зона {i+1}: {size} ({cls})" for i, (size, cls) in enumerate(ZSizes)])
     
+    # Generate plot
     fig = plot_pladder(PLadder)
     buf = BytesIO()
     fig.savefig(buf, format='png', bbox_inches='tight')
@@ -127,26 +162,23 @@ def chat_interface(query, lat, lon):
     img = Image.open(buf)
     plt.close(fig)
     
+    # Combine text output
     text = f"Планетарная лестница:\n{planet_list}\n\nРазмеры зон:\n{zones_text}"
     return text, img
 
-# Gradio UI
+# Gradio UI (reworked for single query field)
 with gr.Blocks() as interface:
+    query_text = gr.Textbox(label="Запрос", placeholder="Пример: PLadder 2023-10-10 12:00 New York")
+    submit_button = gr.Button("Отправить")
     with gr.Row():
         with gr.Column(scale=2):
             output_text = gr.Textbox(label="Ответ", lines=10)
         with gr.Column(scale=1):
             output_image = gr.Image(label="График планетарной лестницы")
-    with gr.Row():
-        with gr.Column(scale=1):
-            query_text = gr.Textbox(label="Запрос", placeholder="Пример: PLadder 2023-10-10 12:00")
-            location_lat = gr.Textbox(label="Широта", placeholder="Пример: 37.7749")
-            location_lon = gr.Textbox(label="Долгота", placeholder="Пример: -122.4194")
-            submit_button = gr.Button("Отправить")
     
     submit_button.click(
         fn=chat_interface,
-        inputs=[query_text, location_lat, location_lon],
+        inputs=query_text,
         outputs=[output_text, output_image]
     )