sophhub 0.4.19 → 0.4.21

package/skills/sophnet-schedule/src/services/datetime_utils.py

@@ -1,117 +1,117 @@
-"""
-共享的时间解析与时区工具。
-
-统一处理：
-- 本地业务时区下的“今天/今年”
-- 本地日期 + 时间组合
-- offset-less ISO 时间按业务时区解释
-- 跨午夜结束时间
-"""
-
-from __future__ import annotations
-
-from datetime import datetime, timedelta
-
-from compat import ZoneInfo, make_aware
-
-_DEFAULT_TZ = "Asia/Shanghai"
-
-
-class DateTimeValidationError(ValueError):
-    """时间输入不合法。"""
-
-
-def now_local(tz: str = _DEFAULT_TZ) -> datetime:
-    return datetime.now(ZoneInfo(tz))
-
-
-def current_date_str(tz: str = _DEFAULT_TZ) -> str:
-    return now_local(tz).strftime("%Y-%m-%d")
-
-
-def current_year(tz: str = _DEFAULT_TZ) -> int:
-    return now_local(tz).year
-
-
-def parse_local_date(date_str: str, tz: str = _DEFAULT_TZ) -> datetime:
-    try:
-        dt = datetime.strptime(date_str.strip(), "%Y-%m-%d")
-    except ValueError as exc:
-        raise DateTimeValidationError(
-            f"日期格式错误：'{date_str}'，应为 YYYY-MM-DD"
-        ) from exc
-    return make_aware(dt, tz)
-
-
-def parse_local_time(time_str: str, base_date: datetime) -> datetime:
-    raw = time_str.strip()
-    for fmt in ("%H:%M", "%H:%M:%S"):
-        try:
-            parsed = datetime.strptime(raw, fmt)
-            return base_date.replace(
-                hour=parsed.hour,
-                minute=parsed.minute,
-                second=0,
-                microsecond=0,
-            )
-        except ValueError:
-            continue
-    raise DateTimeValidationError(f"时间格式错误：'{time_str}'，应为 HH:MM")
-
-
-def build_event_range(
-    date_str: str,
-    start_str: str,
-    end_str: str | None = None,
-    duration_minutes: int = 60,
-    tz: str = _DEFAULT_TZ,
-) -> tuple[datetime, datetime]:
-    if duration_minutes <= 0:
-        raise DateTimeValidationError("持续时间必须大于 0 分钟")
-
-    base = parse_local_date(date_str, tz)
-    start_dt = parse_local_time(start_str, base)
-
-    if end_str:
-        end_dt = parse_local_time(end_str, base)
-        if end_dt <= start_dt:
-            end_dt = end_dt + timedelta(days=1)
-    else:
-        end_dt = start_dt + timedelta(minutes=duration_minutes)
-
-    return start_dt, end_dt
-
-
-def parse_iso_datetime(
-    value: str,
-    tz: str = _DEFAULT_TZ,
-    assume_local_if_naive: bool = True,
-) -> datetime:
-    raw = value.strip()
-    if not raw:
-        raise DateTimeValidationError("时间不能为空")
-
-    try:
-        dt = datetime.fromisoformat(raw.replace("Z", "+00:00"))
-    except ValueError as exc:
-        raise DateTimeValidationError(
-            f"时间格式错误：'{value}'，应为 ISO 8601"
-        ) from exc
-
-    if dt.tzinfo is None:
-        if not assume_local_if_naive:
-            raise DateTimeValidationError(
-                f"时间缺少时区偏移：'{value}'，请使用 ISO 8601 带时区格式"
-            )
-        return make_aware(dt, tz)
-
-    return dt
-
-
-def local_date_window(date_str: str, tz: str = _DEFAULT_TZ) -> tuple[datetime, datetime]:
-    start = parse_local_date(date_str, tz)
-    return start, start + timedelta(days=1)
-
-
-def local_date_label(dt: datetime, tz: str = _DEFAULT_TZ) -> str:
-    return dt.astimezone(ZoneInfo(tz)).strftime("%Y-%m-%d")
+"""
+共享的时间解析与时区工具。
+
+统一处理：
+- 本地业务时区下的“今天/今年”
+- 本地日期 + 时间组合
+- offset-less ISO 时间按业务时区解释
+- 跨午夜结束时间
+"""
+
+from __future__ import annotations
+
+from datetime import datetime, timedelta
+
+from compat import ZoneInfo, make_aware
+
+_DEFAULT_TZ = "Asia/Shanghai"
+
+
+class DateTimeValidationError(ValueError):
+    """时间输入不合法。"""
+
+
+def now_local(tz: str = _DEFAULT_TZ) -> datetime:
+    return datetime.now(ZoneInfo(tz))
+
+
+def current_date_str(tz: str = _DEFAULT_TZ) -> str:
+    return now_local(tz).strftime("%Y-%m-%d")
+
+
+def current_year(tz: str = _DEFAULT_TZ) -> int:
+    return now_local(tz).year
+
+
+def parse_local_date(date_str: str, tz: str = _DEFAULT_TZ) -> datetime:
+    try:
+        dt = datetime.strptime(date_str.strip(), "%Y-%m-%d")
+    except ValueError as exc:
+        raise DateTimeValidationError(
+            f"日期格式错误：'{date_str}'，应为 YYYY-MM-DD"
+        ) from exc
+    return make_aware(dt, tz)
+
+
+def parse_local_time(time_str: str, base_date: datetime) -> datetime:
+    raw = time_str.strip()
+    for fmt in ("%H:%M", "%H:%M:%S"):
+        try:
+            parsed = datetime.strptime(raw, fmt)
+            return base_date.replace(
+                hour=parsed.hour,
+                minute=parsed.minute,
+                second=0,
+                microsecond=0,
+            )
+        except ValueError:
+            continue
+    raise DateTimeValidationError(f"时间格式错误：'{time_str}'，应为 HH:MM")
+
+
+def build_event_range(
+    date_str: str,
+    start_str: str,
+    end_str: str | None = None,
+    duration_minutes: int = 60,
+    tz: str = _DEFAULT_TZ,
+) -> tuple[datetime, datetime]:
+    if duration_minutes <= 0:
+        raise DateTimeValidationError("持续时间必须大于 0 分钟")
+
+    base = parse_local_date(date_str, tz)
+    start_dt = parse_local_time(start_str, base)
+
+    if end_str:
+        end_dt = parse_local_time(end_str, base)
+        if end_dt <= start_dt:
+            end_dt = end_dt + timedelta(days=1)
+    else:
+        end_dt = start_dt + timedelta(minutes=duration_minutes)
+
+    return start_dt, end_dt
+
+
+def parse_iso_datetime(
+    value: str,
+    tz: str = _DEFAULT_TZ,
+    assume_local_if_naive: bool = True,
+) -> datetime:
+    raw = value.strip()
+    if not raw:
+        raise DateTimeValidationError("时间不能为空")
+
+    try:
+        dt = datetime.fromisoformat(raw.replace("Z", "+00:00"))
+    except ValueError as exc:
+        raise DateTimeValidationError(
+            f"时间格式错误：'{value}'，应为 ISO 8601"
+        ) from exc
+
+    if dt.tzinfo is None:
+        if not assume_local_if_naive:
+            raise DateTimeValidationError(
+                f"时间缺少时区偏移：'{value}'，请使用 ISO 8601 带时区格式"
+            )
+        return make_aware(dt, tz)
+
+    return dt
+
+
+def local_date_window(date_str: str, tz: str = _DEFAULT_TZ) -> tuple[datetime, datetime]:
+    start = parse_local_date(date_str, tz)
+    return start, start + timedelta(days=1)
+
+
+def local_date_label(dt: datetime, tz: str = _DEFAULT_TZ) -> str:
+    return dt.astimezone(ZoneInfo(tz)).strftime("%Y-%m-%d")

package/skills/sophnet-schedule/src/services/event_classifier.py

@@ -1,100 +1,100 @@
-"""
-事件分类器。
-
-根据事件标题关键词判断类型（sport / meal / family / medical / appointment）。
-分类规则从 config/reminder_rules.yaml 加载，支持运行时覆盖。
-"""
-
-from __future__ import annotations
-
-import logging
-import sys
-from pathlib import Path
-
-sys.path.insert(0, str(Path(__file__).parent.parent))
-
-import yaml
-
-logger = logging.getLogger(__name__)
-
-_DEFAULT_RULES_PATH = Path(__file__).parent.parent / "config" / "reminder_rules.yaml"
-
-# yaml 不可用时的内置 fallback
-_BUILTIN_KEYWORDS: dict[str, list[str]] = {
-    "sport":       ["跑步", "晨跑", "健身", "游泳", "打球", "羽毛球", "乒乓球", "网球", "篮球", "足球", "瑜伽"],
-    "meal":        ["聚餐", "饭局", "晚餐", "午餐", "火锅", "烧烤", "下午茶"],
-    "family":      ["亲子", "接送", "接孩子", "送孩子", "家长会", "探望", "探亲", "回家"],
-    "medical":     ["体检", "看病", "就医", "门诊", "复诊", "牙医", "口腔", "打疫苗"],
-    "appointment": ["预约", "约定", "美发", "理发", "活动", "讲座", "展览", "旅行", "课程"],
-}
-_BUILTIN_DEFAULT = "appointment"
-
-
-def _load_rules(path: Path) -> dict:
-    try:
-        with open(path, encoding="utf-8") as f:
-            return yaml.safe_load(f) or {}
-    except Exception as e:
-        logger.warning(f"加载 reminder_rules.yaml 失败，使用内置规则: {e}")
-        return {}
-
-
-class EventClassifier:
-    """
-    事件分类器。
-
-    用法：
-        clf = EventClassifier()
-        clf.classify("跑步晨练")   # → "sport"
-        clf.classify("家庭聚餐")   # → "meal"
-        clf.classify("牙医预约")   # → "medical"
-        clf.classify("接孩子放学") # → "family"
-        clf.classify("理发")       # → "appointment"
-    """
-
-    def __init__(
-        self,
-        rules_path: Path | None = None,
-        keywords: dict[str, list[str]] | None = None,
-        default_type: str | None = None,
-    ):
-        data = _load_rules(rules_path or _DEFAULT_RULES_PATH)
-
-        # 优先级：外部传入 > yaml > 内置
-        if keywords:
-            self.keywords = keywords
-        elif data.get("keywords"):
-            self.keywords = {
-                k: [str(w) for w in v]
-                for k, v in data["keywords"].items()
-            }
-        else:
-            self.keywords = _BUILTIN_KEYWORDS
-
-        self.default_type: str = (
-            default_type or data.get("default_type", _BUILTIN_DEFAULT)
-        )
-
-    def classify(self, summary: str, description: str = "") -> str:
-        """
-        返回事件类型：'sport' | 'meal' | 'family' | 'medical' | 'appointment'。
-        按 sport → meal → family → medical → appointment 顺序匹配，匹配即返回。
-        """
-        text = (summary + " " + description).lower()
-        for event_type in ("sport", "meal", "family", "medical", "appointment"):
-            for kw in self.keywords.get(event_type, []):
-                if kw.lower() in text:
-                    return event_type
-        return self.default_type
-
-
-# 模块级默认实例，可直接 import 快速使用
-_default: EventClassifier | None = None
-
-
-def classify_event(summary: str, description: str = "") -> str:
-    """模块级快捷函数，使用默认分类器（延迟初始化）。"""
-    global _default
-    if _default is None:
-        _default = EventClassifier()
-    return _default.classify(summary, description)
+"""
+事件分类器。
+
+根据事件标题关键词判断类型（sport / meal / family / medical / appointment）。
+分类规则从 config/reminder_rules.yaml 加载，支持运行时覆盖。
+"""
+
+from __future__ import annotations
+
+import logging
+import sys
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).parent.parent))
+
+import yaml
+
+logger = logging.getLogger(__name__)
+
+_DEFAULT_RULES_PATH = Path(__file__).parent.parent / "config" / "reminder_rules.yaml"
+
+# yaml 不可用时的内置 fallback
+_BUILTIN_KEYWORDS: dict[str, list[str]] = {
+    "sport":       ["跑步", "晨跑", "健身", "游泳", "打球", "羽毛球", "乒乓球", "网球", "篮球", "足球", "瑜伽"],
+    "meal":        ["聚餐", "饭局", "晚餐", "午餐", "火锅", "烧烤", "下午茶"],
+    "family":      ["亲子", "接送", "接孩子", "送孩子", "家长会", "探望", "探亲", "回家"],
+    "medical":     ["体检", "看病", "就医", "门诊", "复诊", "牙医", "口腔", "打疫苗"],
+    "appointment": ["预约", "约定", "美发", "理发", "活动", "讲座", "展览", "旅行", "课程"],
+}
+_BUILTIN_DEFAULT = "appointment"
+
+
+def _load_rules(path: Path) -> dict:
+    try:
+        with open(path, encoding="utf-8") as f:
+            return yaml.safe_load(f) or {}
+    except Exception as e:
+        logger.warning(f"加载 reminder_rules.yaml 失败，使用内置规则: {e}")
+        return {}
+
+
+class EventClassifier:
+    """
+    事件分类器。
+
+    用法：
+        clf = EventClassifier()
+        clf.classify("跑步晨练")   # → "sport"
+        clf.classify("家庭聚餐")   # → "meal"
+        clf.classify("牙医预约")   # → "medical"
+        clf.classify("接孩子放学") # → "family"
+        clf.classify("理发")       # → "appointment"
+    """
+
+    def __init__(
+        self,
+        rules_path: Path | None = None,
+        keywords: dict[str, list[str]] | None = None,
+        default_type: str | None = None,
+    ):
+        data = _load_rules(rules_path or _DEFAULT_RULES_PATH)
+
+        # 优先级：外部传入 > yaml > 内置
+        if keywords:
+            self.keywords = keywords
+        elif data.get("keywords"):
+            self.keywords = {
+                k: [str(w) for w in v]
+                for k, v in data["keywords"].items()
+            }
+        else:
+            self.keywords = _BUILTIN_KEYWORDS
+
+        self.default_type: str = (
+            default_type or data.get("default_type", _BUILTIN_DEFAULT)
+        )
+
+    def classify(self, summary: str, description: str = "") -> str:
+        """
+        返回事件类型：'sport' | 'meal' | 'family' | 'medical' | 'appointment'。
+        按 sport → meal → family → medical → appointment 顺序匹配，匹配即返回。
+        """
+        text = (summary + " " + description).lower()
+        for event_type in ("sport", "meal", "family", "medical", "appointment"):
+            for kw in self.keywords.get(event_type, []):
+                if kw.lower() in text:
+                    return event_type
+        return self.default_type
+
+
+# 模块级默认实例，可直接 import 快速使用
+_default: EventClassifier | None = None
+
+
+def classify_event(summary: str, description: str = "") -> str:
+    """模块级快捷函数，使用默认分类器（延迟初始化）。"""
+    global _default
+    if _default is None:
+        _default = EventClassifier()
+    return _default.classify(summary, description)