Update app.py

app.py

@@ -453,46 +453,53 @@ from zoneinfo import ZoneInfo
 
 def get_time_tool2(query: str) -> datetime:
     try:
+        # Step 1: Get location from the query
         location_prompt = f"""
-        You are a location extractor. Given a user's query about time or date, return the location mentioned in it. If not found, return "London".
+        You are a location extractor. Given a user's query about time or date, return the location mentioned in it.
+        If not found, return "London".
+        
+        Query: "{query}"
+        """
+        location_response = llm_gpt4.invoke(location_prompt)
+        location = location_response.content.strip() if isinstance(location_response, AIMessage) else str(location_response).strip()
 
-        Examples:
-        - "What's the time in Tokyo now?" → Tokyo
-        - "今天台北幾點？" → Taipei
-        - "現在在紐約幾點？" → New York
-        - "今天幾號？" → London
-        - "What date is today？" → London
+        # Step 2: Get the timezone of the location
+        tz_str = location_to_timezone(location)
+        now = datetime.now(ZoneInfo(tz_str))
 
-        Now process this query: "{query}"
+        # Step 3: Use GPT to determine the specific time
+        time_query_prompt = f"""
+        Given the current time in {location}, answer the following:
+
+        Query: "{query}"
+
+        Provide the exact time the user is referring to. If the query is asking for a time in the future or past, calculate that time relative to now.
         """
-        location_response = llm_gpt4.invoke(location_prompt)
-        if isinstance(location_response, AIMessage):
-            location = location_response.content.strip()
+        time_response = llm_gpt4.invoke(time_query_prompt)
+
+        if isinstance(time_response, AIMessage):
+            time_str = time_response.content.strip()
         else:
-            location = str(location_response).strip()
-    except Exception as e:
-        location = "London"
+            time_str = str(time_response).strip()
 
-    location_key = location.lower()
-    tz_str = location_to_timezone(location)
-    
-    # Get the correct local time based on the extracted location
-    now = datetime.now(ZoneInfo(tz_str))
+        # Step 4: If the time string contains specific time formats, adjust accordingly
+        try:
+            if "AM" in time_str or "PM" in time_str:
+                # If it's a time format, assume it's the intended time
+                target_time = datetime.strptime(time_str, "%I:%M %p")
+            else:
+                # Otherwise, parse the date and time
+                target_time = datetime.strptime(time_str, "%Y-%m-%d %H:%M:%S")
 
-    # Handle AM/PM format in the query result
-    q_lower = query.lower()
-    if any(k in q_lower for k in ["date", "幾號", "today", "day"]):
-        return now.date()  # Return date object
-    elif any(k in q_lower for k in ["time", "幾點", "現在"]):
-        # If the query asks for time in the future (e.g., "2 hours later"), calculate and return future time
-        if "hour" in query:  # Detects if the query is asking for time in hours later
-            hours_later = int(query.split(" ")[-2])  # Extracts the number of hours from query
-            target_time = now + timedelta(hours=hours_later)
-            return target_time.replace(tzinfo=ZoneInfo(tz_str))  # Add timezone to the future time
-        else:
-            return now.replace(tzinfo=ZoneInfo(tz_str))  # Default return the current datetime object
-    else:
-        return now  # Default return the current datetime object
+            # Ensure it's in the correct timezone
+            target_time = target_time.replace(tzinfo=ZoneInfo(tz_str))
+
+            return target_time.strftime("%Y-%m-%d %H:%M:%S")
+        except Exception as e:
+            return f"Error in processing time: {e}"
+
+    except Exception as e:
+        return f"Error in retrieving location or time information: {e}"
 
 def weather_agent_tool(query: str) -> str:
     """Weather Agent: Return current, hourly, or historical weather info using WeatherAPI."""