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, optionally with region (e.g., 'Бураево', 'Осиновка, Бирский район').
+        city: A string representing the city name, optionally with region or country (e.g., 'Бураево', 'Осиновка, Бирский район', 'Идиофа, Африка').
     Returns:
         A string with the timezone (e.g., 'Europe/Samara') or an error message.
     """
@@ -18,14 +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:
-            # Если полный запрос не сработал, попробуем только город (первое слово до запятой)
+            # Пробуем только город (до запятой)
             city_name = city.split(",")[0].strip()
             location = geolocator.geocode(city_name, language="en")
             if not location:
-                return f"Error: City '{city}' not found."
+                return f"Error: City '{city}' not found. Try a different spelling or provide more context."
         tf = TimezoneFinder()
         timezone = tf.timezone_at(lat=location.latitude, lng=location.longitude)
         if not timezone:
@@ -69,95 +69,34 @@ 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 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. "
+        "Detect the language and return only the result, without explanations, images, or repeating instructions. "
+        "If the query contains a city name (e.g., 'Бураево', 'Осиновка', 'Fosnavåg', 'न्यू यॉर्क') or phrases like 'сколько времени', 'what time', 'quelle heure', "
+        "use `get_timezone_by_city` to find the timezone, then `get_current_time_in_timezone` to get the time. "
         "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: 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(). "
+        "```"
+        "Execute tools in sequence: first call get_timezone_by_city(city), then get_current_time_in_timezone(timezone). "
+        "Do NOT include tool calls or formatting like 'Current time in X: ' 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."
+        "NEVER generate code without the ```py``` block or with invalid syntax."
     ),
     "default": "Response: {{question}}",
-    "planning": {
-        "initial_plan": (
-            "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"
-            "final_answer('YOUR ANSWER HERE')\n"
-            "```"
-        ),
-        "update_plan_pre_messages": (
-            "Review the query: {{question}} and previous steps. "
-            "If the plan needs adjustment (e.g., incorrect city or timezone), update it. "
-            "Write corrected code in a code block:\n"
-            "```py\n"
-            "final_answer('YOUR ANSWER HERE')\n"
-            "```"
-        ),
-        "update_plan_post_messages": (
-            "Review the query: {{question}} and execution results. "
-            "If the result is incorrect or incomplete, adjust the plan and code. "
-            "Return the result via final_answer() in a code block:\n"
-            "```py\n"
-            "final_answer('YOUR ANSWER HERE')\n"
-            "```"
-        )
-    },
     "managed_agent": {
         "execute": (
             "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}}'.strip()  # Use full query as city\n"
+            "city = '{{question}}'.strip()\n"
             "timezone = get_timezone_by_city(city)\n"
             "if not timezone.startswith('Error'):\n"
             "    result = get_current_time_in_timezone(timezone)\n"
             "    final_answer(result)\n"
             "else:\n"
-            "    final_answer(timezone)  # Return error message\n"
+            "    final_answer(timezone)\n"
             "```"
         ),
-        "report": (
-            "Summarize the execution of the task: {{question}}. "
-            "Return the result via final_answer() in a code block:\n"
-            "```py\n"
-            "final_answer('YOUR ANSWER HERE')\n"
-            "```"
-        ),
-        "task": (
-            "Define the task based on the query: {{question}}. "
-            "If it contains a city name or phrases like 'сколько времени', use `get_timezone_by_city` and `get_current_time_in_timezone`. "
-            "Return the task definition via final_answer() in a code block:\n"
-            "```py\n"
-            "final_answer('YOUR TASK DEFINITION HERE')\n"
-            "```"
-        )
     },
-    "final_answer": {
-        "pre_messages": (
-            "Prepare the final response for the query: {{question}}. "
-            "Ensure the answer is clear and in the same language as the query. "
-            "Return the response via final_answer() in a code block:\n"
-            "```py\n"
-            "final_answer('YOUR ANSWER HERE')\n"
-            "```"
-        ),
-        "template": "Final response: {{answer}}",
-        "post_messages": (
-            "Review the formatted response for the query: {{question}}. "
-            "Ensure the response is accurate and complete. "
-            "Return the final response via final_answer() in a code block:\n"
-            "```py\n"
-            "final_answer('YOUR ANSWER HERE')\n"
-            "```"
-        )
-    }
 }
 
 agent = CodeAgent(