refactor(bot): 移除汇率数据缓存状态和下次更新时间信息

- 从 fetch_and_parse_rate_data 和 get_exchange_rate 函数中移除了缓存状态和下次更新时间的返回值
- 更新了相关命令的响应消息，不再包含缓存状态和下次更新时间信息
- 简化了数据获取逻辑，提高了代码可读性和性能

Author: Goojoe

app/bot/handlers.py

@@ -68,8 +68,8 @@ async def rate_command(message: types.Message, bot=None):
         # Get the URL from environment variable
         url = settings.BOC_URL
 
-        # Fetch exchange rate data directly with cache info
-        data, is_cached, next_update = await fetch_and_parse_rate_data(url)
+        # Fetch exchange rate data directly
+        data = await fetch_and_parse_rate_data(url)
 
         if not data or "currencies" not in data or not data["currencies"]:
             await bot_to_use.send_message(
@@ -81,15 +81,9 @@ async def rate_command(message: types.Message, bot=None):
         # Get the last updated time
         last_updated = data.get("last_updated", "未知")
 
-        # Add cache status and next update time
-        cache_status = "✅ 数据来源: 缓存" if is_cached else "🔄 数据来源: 实时获取"
-        next_update_str = next_update.strftime("%Y-%m-%d %H:%M:%S")
-
         # Start response with update time header including the timestamp
         response_lines = [
-            f"汇率更新时间\n{last_updated}\n",
-            f"{cache_status}",
-            f"下次更新时间: {next_update_str}\n"
+            f"汇率更新时间\n{last_updated}\n"
         ]
 
         # Get supported currencies and their Chinese names
@@ -160,31 +154,24 @@ async def convert_command(message: types.Message, bot=None):
             )
             return
 
-        rate_info = await get_exchange_rate(from_currency, to_currency)
-        rate, is_cached, next_update = rate_info
+        rate = await get_exchange_rate(from_currency, to_currency)
 
         if rate:
             # Get the last updated time
             from app.services.exchange_rate import fetch_and_parse_rate_data
             from app.core.config import settings
 
             # Fetch data to get the update time
-            data, _, _ = await fetch_and_parse_rate_data(settings.BOC_URL)
+            data = await fetch_and_parse_rate_data(settings.BOC_URL)
             last_updated = data.get("last_updated", "未知")
 
-            # Add cache status and next update time
-            cache_status = "✅ 数据来源: 缓存" if is_cached else "🔄 数据来源: 实时获取"
-            next_update_str = next_update.strftime("%Y-%m-%d %H:%M:%S")
-
             converted_amount = amount * rate
             await bot_to_use.send_message(
                 chat_id=message.chat.id,
                 text=f"💱 货币转换结果:\n"
                      f"{amount:.2f} {from_currency} = {converted_amount:.2f} {to_currency}\n"
                      f"(汇率: 1 {from_currency} = {rate:.4f} {to_currency})\n\n"
-                     f"汇率更新时间\n{last_updated}\n"
-                     f"{cache_status}\n"
-                     f"下次更新时间: {next_update_str}"
+                     f"汇率更新时间\n{last_updated}"
             )
         else:
             await bot_to_use.send_message(
@@ -230,20 +217,14 @@ async def currency_command(message: types.Message, bot=None):
     from app.core.config import settings
 
     # Fetch data to get the update time
-    data, is_cached, next_update = await fetch_and_parse_rate_data(settings.BOC_URL)
+    data = await fetch_and_parse_rate_data(settings.BOC_URL)
     last_updated = data.get("last_updated", "未知")
 
-    # Add cache status and next update time
-    cache_status = "✅ 数据来源: 缓存" if is_cached else "🔄 数据来源: 实时获取"
-    next_update_str = next_update.strftime("%Y-%m-%d %H:%M:%S")
-
     await bot_to_use.send_message(
         chat_id=message.chat.id,
         text=f"💰 支持的货币列表:\n{currency_list}\n\n"
              f"使用 /rate 或 /convert 或 /cny_convert 获取汇率和转换货币。\n\n"
-             f"汇率更新时间\n{last_updated}\n"
-             f"{cache_status}\n"
-             f"下次更新时间: {next_update_str}"
+             f"汇率更新时间\n{last_updated}"
     )
 
 async def cny_convert_command(message: types.Message, bot=None):
@@ -267,31 +248,24 @@ async def cny_convert_command(message: types.Message, bot=None):
         amount = float(args[2])
         to_currency = "CNY"
 
-        rate_info = await get_exchange_rate(from_currency, to_currency)
-        rate, is_cached, next_update = rate_info
+        rate = await get_exchange_rate(from_currency, to_currency)
 
         if rate:
             # Get the last updated time
             from app.services.exchange_rate import fetch_and_parse_rate_data
             from app.core.config import settings
 
             # Fetch data to get the update time
-            data, _, _ = await fetch_and_parse_rate_data(settings.BOC_URL)
+            data = await fetch_and_parse_rate_data(settings.BOC_URL)
             last_updated = data.get("last_updated", "未知")
 
-            # Add cache status and next update time
-            cache_status = "✅ 数据来源: 缓存" if is_cached else "🔄 数据来源: 实时获取"
-            next_update_str = next_update.strftime("%Y-%m-%d %H:%M:%S")
-
             converted_amount = amount * rate
             await bot_to_use.send_message(
                 chat_id=message.chat.id,
                 text=f"💱 转换为人民币结果:\n"
                      f"{amount:.2f} {from_currency} = {converted_amount:.2f} {to_currency}\n"
                      f"(汇率: 1 {from_currency} = {rate:.4f} {to_currency})\n\n"
-                     f"汇率更新时间\n{last_updated}\n"
-                     f"{cache_status}\n"
-                     f"下次更新时间: {next_update_str}"
+                     f"汇率更新时间\n{last_updated}"
             )
         else:
             await bot_to_use.send_message(

app/services/exchange_rate.py

@@ -20,26 +20,21 @@
 # Default to 60 minutes (3600 seconds) if not specified
 CACHE_TTL = int(getattr(settings, "CACHE_TTL_MINUTES", 10)) * 60
 
-CACHE_TTL = int(getattr(settings, "CACHE_TTL_MINUTES", 10)) * 60
-
 # Create a global cache to store timestamps
 _cache_timestamps = {}
 @cached(ttl=CACHE_TTL, cache=SimpleMemoryCache)
 # Custom caching implementation to track cache status
-async def fetch_and_parse_rate_data(url: str, timeout: int = 10) -> Tuple[Dict[str, Any], bool, datetime]:
+async def fetch_and_parse_rate_data(url: str, timeout: int = 10) -> Dict[str, Any]:
     """
     Asynchronously fetches exchange rate data from the specified URL and parses it,
-    with caching and cache status tracking.
+    with caching.
 
     Args:
         url: The URL to fetch the exchange rate data from
         timeout: Request timeout in seconds
 
     Returns:
-        Tuple containing:
-        - Dictionary containing the parsed exchange rate data
-        - Boolean indicating whether the result is from cache
-        - Datetime object indicating when the cache will be updated next
+        Dictionary containing the parsed exchange rate data.
 
     Raises:
         Exception: If there's an error during fetching or parsing the data
@@ -67,9 +62,8 @@ async def fetch_and_parse_rate_data(url: str, timeout: int = 10) -> Tuple[Dict[s
 
             logger.info(f"Successfully fetched and parsed exchange rate data: {exchange_data}")
 
-
-
-            return exchange_data, None, None
+            # Return only the data
+            return exchange_data
 
     except httpx.TimeoutException:
         logger.error(f"Timeout error while fetching data from {url}")
@@ -198,7 +192,7 @@ def _parse_exchange_rate_data(soup: BeautifulSoup) -> Dict[str, Any]:
         logger.error(f"Error parsing exchange rate data: {e}")
         return {}
 
-async def get_exchange_rate(from_currency: str, to_currency: str) -> Union[Tuple[Optional[float], bool, datetime], Optional[float]]:
+async def get_exchange_rate(from_currency: str, to_currency: str) -> Optional[float]:
     """
     Get the exchange rate between two currencies based on Cash Selling Rate.
 
@@ -207,18 +201,16 @@ async def get_exchange_rate(from_currency: str, to_currency: str) -> Union[Tuple
         to_currency: The target currency code (e.g., "EUR")
 
     Returns:
-        A tuple containing:
-        - The exchange rate as a float, or None if the rate couldn't be retrieved
-        - Boolean indicating whether the result is from cache
-        - Datetime object indicating when the cache will be updated next
+        The exchange rate as a float, or None if the rate couldn't be retrieved.
     """
     try:
         # Get the URL from environment variable
         from app.core.config import Settings
         settings = Settings()
         url = settings.BOC_URL
 
-        data, is_cached, next_update = await fetch_and_parse_rate_data(url)
+        # Fetch data (cache status and next update are no longer returned)
+        data = await fetch_and_parse_rate_data(url)
 
         # This logic will depend on the structure of your parsed data
         if "currencies" not in data or not data["currencies"]:
@@ -254,7 +246,7 @@ async def get_exchange_rate(from_currency: str, to_currency: str) -> Union[Tuple
 
             # For CNY conversion, return the rate divided by 100
             # This is because rates are quoted as CNY per 100 foreign currency units
-            return from_rate / 100, is_cached, next_update
+            return from_rate / 100
 
         # If from_currency is CNY, we need to handle differently
         elif from_currency == "CNY":
@@ -268,7 +260,7 @@ async def get_exchange_rate(from_currency: str, to_currency: str) -> Union[Tuple
                 return None
 
             # For converting from CNY, we need reciprocal of the rate divided by 100
-            return 100 / to_rate, is_cached, next_update
+            return 100 / to_rate
 
         # Normal case - converting between two non-CNY currencies
         else:
@@ -292,13 +284,14 @@ async def get_exchange_rate(from_currency: str, to_currency: str) -> Union[Tuple
 
             # Calculate exchange rate between the two currencies
             exchange_rate = to_rate / from_rate
-            return exchange_rate, is_cached, next_update
+            return exchange_rate
 
         # Note: This code is unreachable due to the return statements above
         logger.error(f"Exchange rate not available for {from_currency} to {to_currency}")
-        return None, is_cached, next_update
+        return None
 
     except Exception as e:
         logger.error(f"Error getting exchange rate: {e}")
         logger.exception("Stack trace:")
-        return None, False, datetime.now() + timedelta(seconds=CACHE_TTL)
+        # Return None on error, as cache status/next update are no longer relevant here
+        return None