Update app.py

app.py

@@ -10,7 +10,7 @@ from timezonefinder import TimezoneFinder
 def get_timezone_by_city(city: str) -> str:
     """Tool to fetch the timezone for a given city using geolocation.
     Args:
-        city: A string representing the city name (e.g., 'Бураево', 'Tønsberg').
+        city: A string representing the city name, optionally with region (e.g., 'Бураево', 'Осиновка, Бирский район').
     Returns:
         A string with the timezone (e.g., 'Europe/Samara') or an error message.
     """
@@ -18,9 +18,14 @@ def get_timezone_by_city(city: str) -> str:
         return f"Error: Expected a string for city, got: {type(city)}"
     try:
         geolocator = Nominatim(user_agent="smolagents_bot")
+        # Попробуем поиск с полным запросом
         location = geolocator.geocode(city, language="en")
         if not location:
-            return f"Error: City '{city}' not found."
+            # Если полный запрос не сработал, попробуем только город (первое слово до запятой)
+            city_name = city.split(",")[0].strip()
+            location = geolocator.geocode(city_name, language="en")
+            if not location:
+                return f"Error: City '{city}' not found."
         tf = TimezoneFinder()
         timezone = tf.timezone_at(lat=location.latitude, lng=location.longitude)
         if not timezone:
@@ -64,22 +69,23 @@ except Exception as e:
 prompt_templates = {
     "system_prompt": (
         "You are a helpful assistant that responds in the same language as the user's query. "
-        "Detect the language and return only the result, without explanations. "
-        "If the query contains a city name (e.g., 'Birsk', 'Tønsberg', 'Бураево') or phrases like 'сколько времени', 'what time', 'quelle heure', "
+        "Detect the language and return only the result, without explanations or images. "
+        "If the query contains a city name (e.g., 'Birsk', 'Tønsberg', 'Бураево', 'Осиновка, Бирский район') or phrases like 'сколько времени', 'what time', 'quelle heure', "
         "ALWAYS use the `get_timezone_by_city` tool to find the timezone, then use `get_current_time_in_timezone` to get the time. "
         "NEVER redefine tools—use only the provided ones. "
         "Always return the response via `final_answer()` in a code block like this:\n"
         "```py\n"
         "final_answer('YOUR ANSWER HERE')\n"
         "```\n"
-        "Execute the tools in sequence (get_timezone_by_city, then get_current_time_in_timezone), then pass the result as a string to final_answer(). "
-        "Do NOT include tool calls inside final_answer(). "
-        "If the city is not found or the query is unclear, return an error message in the same language via final_answer()."
+        "Execute the tools in sequence: first call get_timezone_by_city(city), then get_current_time_in_timezone(timezone). "
+        "Pass the result as a string to final_answer(). Do NOT include tool calls inside final_answer(). "
+        "If the city is not found or the query is unclear, return an error message in the same language via final_answer(). "
+        "Do NOT generate code with multiple arguments for get_timezone_by_city—it accepts only one string."
     ),
     "default": "Response: {{question}}",
     "planning": {
         "initial_plan": (
-            "Analyze the query: {{question}}. If it contains a city name (e.g., 'Birsk', 'Бураево') or phrases like 'сколько времени', "
+            "Analyze the query: {{question}}. If it contains a city name (e.g., 'Birsk', 'Бураево', 'Осиновка, Бирский район') or phrases like 'сколько времени', "
             "use `get_timezone_by_city` to find the timezone, then `get_current_time_in_timezone` to get the time. "
             "Write code to execute the tools and return the result via final_answer() in a code block:\n"
             "```py\n"
@@ -108,7 +114,7 @@ prompt_templates = {
             "Execute the task: {{question}}. If it contains a city name or phrases like 'сколько времени', use `get_timezone_by_city` and `get_current_time_in_timezone`. "
             "Write code in a code block:\n"
             "```py\n"
-            "city = '{{question}}'.lower().split()[-1]  # Extract last word as city\n"
+            "city = '{{question}}'.strip()  # Use full query as city\n"
             "timezone = get_timezone_by_city(city)\n"
             "if not timezone.startswith('Error'):\n"
             "    result = get_current_time_in_timezone(timezone)\n"
@@ -165,7 +171,7 @@ agent = CodeAgent(
 def process_input(user_input):
     try:
         response = agent.run(user_input)
-        return response
+        return response if response else "Error: No response received from the agent."
     except Exception as e:
         return f"Error: {str(e)}"