Skip to content

⭐AI-driven public opinion & trend monitor with multi-platform aggregation, RSS, and smart alerts.🎯 告别信息过载,你的 AI 舆情监控助手与热点筛选工具!聚合多平台热点 + RSS 订阅,支持关键词精准筛选。AI 智能筛选新闻 + AI 翻译 + AI 分析简报直推手机,也支持接入 MCP 架构,赋能 AI 自然语言对话分析、情感洞察与趋势预测等。支持 Docker ,数据本地/云端自持。集成微信/飞书/钉钉/Telegram/邮件/ntfy/bark/slack 等渠道智能推送。

fix(time): 保留 ISO 时间的小数秒与时区偏移 (#1229)

KennySimpsondcf079cee0e4
diff --git a/tests/test_time.py b/tests/test_time.py
new file mode 100644
index 0000000000..a2ca87d719
--- /dev/null
+++ b/tests/test_time.py
@@ -0,0 +1,37 @@
+from datetime import datetime, timezone
+from unittest.mock import patch
+
+import pytest
+
+from trendradar.utils.time import (
+ calculate_days_old,
+ format_iso_time_friendly,
+ is_within_days,
+)
+
+
+ "2026-10-01T00:00:00.500-05:00",
+ "2026-10-01T05:00:00.500Z",
+ "2026-10-01T13:00:00.500+08:00",
+ "2026-10-01T05:00:00.500",
+])
+def test_equivalent_fractional_timestamps(stamp):
+ now = datetime(2026, 10, 2, 5, tzinfo=timezone.utc)
+ with patch("trendradar.utils.time.get_configured_time", return_value=now):
+ assert calculate_days_old(stamp) == pytest.approx((86400 - 0.5) / 86400)
+ assert is_within_days(stamp, 1)
+ assert format_iso_time_friendly(stamp, "Asia/Shanghai") == "10-01 13:00"
+
+
+def test_fractional_negative_offset_at_freshness_boundary():
+ now = datetime(2026, 10, 2, 3, tzinfo=timezone.utc)
+ with patch("trendradar.utils.time.get_configured_time", return_value=now):
+ assert is_within_days("2026-10-01T00:00:00.500-05:00", 1)
+ assert not is_within_days("2026-09-30T00:00:00.500-05:00", 1)
+
+
+def test_invalid_timestamp_and_disabled_filter_fallbacks():
+ assert calculate_days_old("invalid") is None
+ assert is_within_days("invalid", 1)
+ assert is_within_days("2020-01-01T00:00:00Z", 0)
diff --git a/trendradar/utils/time.py b/trendradar/utils/time.py
index ebe644c82d..f802ff9f91 100644
--- a/trendradar/utils/time.py
+++ b/trendradar/utils/time.py
@@ -93,6 +93,12 @@ def convert_time_for_display(time_str: str) -> str:
return time_str
+def _parse_iso_time(iso_time: str) -> datetime:
+ """保留 ISO 时区和小数秒,无时区按 UTC 处理。"""
+ dt = datetime.fromisoformat(iso_time.replace("Z", "+00:00"))
+ return pytz.UTC.localize(dt) if dt.tzinfo is None else dt
+
+
def format_iso_time_friendly(
iso_time: str,
timezone: str = DEFAULT_TIMEZONE,
@@ -113,39 +119,7 @@ def format_iso_time_friendly(
return ""
try:
- # 尝试解析各种 ISO 格式
- dt = None
-
- # 尝试解析带时区的格式
- if "+" in iso_time or iso_time.endswith("Z"):
- iso_time = iso_time.replace("Z", "+00:00")
- try:
- dt = datetime.fromisoformat(iso_time)
- except ValueError:
- pass
-
- # 尝试解析不带时区的格式(假设为 UTC)
- if dt is None:
- try:
- # 处理 T 分隔符
- if "T" in iso_time:
- dt = datetime.fromisoformat(iso_time.replace("T", " ").split(".")[0])
- else:
- dt = datetime.fromisoformat(iso_time.split(".")[0])
- # 假设为 UTC 时间
- dt = pytz.UTC.localize(dt)
- except ValueError:
- pass
-
- if dt is None:
- # 无法解析,返回原始字符串的简化版本
- if "T" in iso_time:
- parts = iso_time.split("T")
- if len(parts) == 2:
- date_part = parts[0][5:] # MM-DD
- time_part = parts[1][:5] # HH:MM
- return f"{date_part} {time_part}" if include_date else time_part
- return iso_time
+ dt = _parse_iso_time(iso_time)
# 转换到目标时区
try:
@@ -200,30 +174,7 @@ def is_within_days(
return True # max_days=0 表示禁用过滤
try:
- dt = None
-
- # 尝试解析带时区的格式
- if "+" in iso_time or iso_time.endswith("Z"):
- iso_time_normalized = iso_time.replace("Z", "+00:00")
- try:
- dt = datetime.fromisoformat(iso_time_normalized)
- except ValueError:
- pass
-
- # 尝试解析不带时区的格式(假设为 UTC)
- if dt is None:
- try:
- if "T" in iso_time:
- dt = datetime.fromisoformat(iso_time.replace("T", " ").split(".")[0])
- else:
- dt = datetime.fromisoformat(iso_time.split(".")[0])
- dt = pytz.UTC.localize(dt)
- except ValueError:
- pass
-
- if dt is None:
- # 无法解析时间,保留文章
- return True
+ dt = _parse_iso_time(iso_time)
# 获取当前时间(配置的时区,带时区信息)
now = get_configured_time(timezone)
@@ -254,29 +205,7 @@ def calculate_days_old(iso_time: str, timezone: str = DEFAULT_TIMEZONE) -> Optio
return None
try:
- dt = None
-
- # 尝试解析带时区的格式
- if "+" in iso_time or iso_time.endswith("Z"):
- iso_time_normalized = iso_time.replace("Z", "+00:00")
- try:
- dt = datetime.fromisoformat(iso_time_normalized)
- except ValueError:
- pass
-
- # 尝试解析不带时区的格式(假设为 UTC)
- if dt is None:
- try:
- if "T" in iso_time:
- dt = datetime.fromisoformat(iso_time.replace("T", " ").split(".")[0])
- else:
- dt = datetime.fromisoformat(iso_time.split(".")[0])
- dt = pytz.UTC.localize(dt)
- except ValueError:
- pass
-
- if dt is None:
- return None
+ dt = _parse_iso_time(iso_time)
now = get_configured_time(timezone)
diff = now - dt