sophhub 0.4.19 → 0.4.21

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

@@ -1,139 +1,139 @@
-"""
-轻量日历后端选择器。
-
-不引入完整 provider 抽象层，只集中管理：
-- 当前模式判断
-- 事件读取
-- 事件创建
-- 事件删除
-- Google 同步触发
-"""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-from datetime import datetime
-
-from config.settings import (
-    GCAL_CALENDAR_ID,
-    GCAL_MAX_RETRIES,
-    GCAL_SSL_VERIFY,
-    GCAL_TIMEOUT,
-    GCAL_TOKEN_PATH,
-    PROXIES,
-    TIMEZONE,
-)
-from gcal.client import CalendarClient
-from gcal.models import CalendarEvent
-from services import local_event_store
-from services.google_integration import get_active_mode, sync_local_events_to_google
-
-
-@dataclass
-class EventView:
-    event: CalendarEvent
-    provider: str
-    sync_state: str = ""
-
-
-@dataclass
-class EventCreateResult:
-    provider: str
-    event_id: str
-    sync_state: str = ""
-
-
-def _new_google_client() -> CalendarClient:
-    return CalendarClient(
-        token_path=GCAL_TOKEN_PATH,
-        proxies=PROXIES,
-        calendar_id=GCAL_CALENDAR_ID,
-        timeout=GCAL_TIMEOUT,
-        max_retries=GCAL_MAX_RETRIES,
-        verify=GCAL_SSL_VERIFY,
-    )
-
-
-def active_provider() -> str:
-    return get_active_mode()
-
-
-def list_event_views(time_min: datetime, time_max: datetime) -> list[EventView]:
-    provider = active_provider()
-    if provider == "google":
-        client = _new_google_client()
-        return [
-            EventView(event=event, provider="google", sync_state="")
-            for event in client.list_events(time_min, time_max)
-        ]
-
-    records = local_event_store.list_records(time_min=time_min, time_max=time_max)
-    return [
-        EventView(
-            event=local_event_store.record_to_event(record),
-            provider="local",
-            sync_state=record.get("sync_state", "local_only"),
-        )
-        for record in records
-    ]
-
-
-def list_events(time_min: datetime, time_max: datetime) -> list[CalendarEvent]:
-    return [item.event for item in list_event_views(time_min, time_max)]
-
-
-def create_event(
-    summary: str,
-    start: datetime,
-    end: datetime,
-    location: str = "",
-    description: str = "",
-    remind_minutes: int = 0,
-) -> EventCreateResult:
-    provider = active_provider()
-    if provider == "google":
-        client = _new_google_client()
-        event_id = client.create_event(
-            summary=summary,
-            start=start,
-            end=end,
-            location=location,
-            description=description,
-            tz=TIMEZONE,
-        )
-        return EventCreateResult(provider="google", event_id=event_id, sync_state="")
-
-    record = local_event_store.create_event(
-        summary=summary,
-        start=start,
-        end=end,
-        location=location,
-        description=description,
-        remind_minutes=remind_minutes,
-    )
-    return EventCreateResult(
-        provider="local",
-        event_id=record["id"],
-        sync_state=record.get("sync_state", "local_only"),
-    )
-
-
-def delete_event(event_id: str) -> bool:
-    provider = active_provider()
-    if event_id.startswith("local_") or provider == "local":
-        return local_event_store.delete_event(event_id)
-    client = _new_google_client()
-    client.delete_event(event_id)
-    return True
-
-
-def get_event_status(event_id: str) -> str | None:
-    provider = active_provider()
-    if event_id.startswith("local_") or provider == "local":
-        return local_event_store.get_event_status(event_id)
-    client = _new_google_client()
-    return client.get_event_status(event_id)
-
-
-def sync_local_events() -> dict:
-    return sync_local_events_to_google()
+"""
+轻量日历后端选择器。
+
+不引入完整 provider 抽象层，只集中管理：
+- 当前模式判断
+- 事件读取
+- 事件创建
+- 事件删除
+- Google 同步触发
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import datetime
+
+from config.settings import (
+    GCAL_CALENDAR_ID,
+    GCAL_MAX_RETRIES,
+    GCAL_SSL_VERIFY,
+    GCAL_TIMEOUT,
+    GCAL_TOKEN_PATH,
+    PROXIES,
+    TIMEZONE,
+)
+from gcal.client import CalendarClient
+from gcal.models import CalendarEvent
+from services import local_event_store
+from services.google_integration import get_active_mode, sync_local_events_to_google
+
+
+@dataclass
+class EventView:
+    event: CalendarEvent
+    provider: str
+    sync_state: str = ""
+
+
+@dataclass
+class EventCreateResult:
+    provider: str
+    event_id: str
+    sync_state: str = ""
+
+
+def _new_google_client() -> CalendarClient:
+    return CalendarClient(
+        token_path=GCAL_TOKEN_PATH,
+        proxies=PROXIES,
+        calendar_id=GCAL_CALENDAR_ID,
+        timeout=GCAL_TIMEOUT,
+        max_retries=GCAL_MAX_RETRIES,
+        verify=GCAL_SSL_VERIFY,
+    )
+
+
+def active_provider() -> str:
+    return get_active_mode()
+
+
+def list_event_views(time_min: datetime, time_max: datetime) -> list[EventView]:
+    provider = active_provider()
+    if provider == "google":
+        client = _new_google_client()
+        return [
+            EventView(event=event, provider="google", sync_state="")
+            for event in client.list_events(time_min, time_max)
+        ]
+
+    records = local_event_store.list_records(time_min=time_min, time_max=time_max)
+    return [
+        EventView(
+            event=local_event_store.record_to_event(record),
+            provider="local",
+            sync_state=record.get("sync_state", "local_only"),
+        )
+        for record in records
+    ]
+
+
+def list_events(time_min: datetime, time_max: datetime) -> list[CalendarEvent]:
+    return [item.event for item in list_event_views(time_min, time_max)]
+
+
+def create_event(
+    summary: str,
+    start: datetime,
+    end: datetime,
+    location: str = "",
+    description: str = "",
+    remind_minutes: int = 0,
+) -> EventCreateResult:
+    provider = active_provider()
+    if provider == "google":
+        client = _new_google_client()
+        event_id = client.create_event(
+            summary=summary,
+            start=start,
+            end=end,
+            location=location,
+            description=description,
+            tz=TIMEZONE,
+        )
+        return EventCreateResult(provider="google", event_id=event_id, sync_state="")
+
+    record = local_event_store.create_event(
+        summary=summary,
+        start=start,
+        end=end,
+        location=location,
+        description=description,
+        remind_minutes=remind_minutes,
+    )
+    return EventCreateResult(
+        provider="local",
+        event_id=record["id"],
+        sync_state=record.get("sync_state", "local_only"),
+    )
+
+
+def delete_event(event_id: str) -> bool:
+    provider = active_provider()
+    if event_id.startswith("local_") or provider == "local":
+        return local_event_store.delete_event(event_id)
+    client = _new_google_client()
+    client.delete_event(event_id)
+    return True
+
+
+def get_event_status(event_id: str) -> str | None:
+    provider = active_provider()
+    if event_id.startswith("local_") or provider == "local":
+        return local_event_store.get_event_status(event_id)
+    client = _new_google_client()
+    return client.get_event_status(event_id)
+
+
+def sync_local_events() -> dict:
+    return sync_local_events_to_google()

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

@@ -1,96 +1,96 @@
-"""
-日程冲突检测器。
-
-检测同一批事件中时间重叠的事件对。全天事件不参与检测。
-
-规则：
-  - A.start < B.end AND A.end > B.start → 有重叠
-  - 紧接场景（间隔 < 5 分钟）→ 额外警告（is_tight=True）
-"""
-
-from __future__ import annotations
-
-import sys
-from dataclasses import dataclass
-from datetime import timedelta
-from pathlib import Path
-
-sys.path.insert(0, str(Path(__file__).parent.parent))
-
-from gcal.models import CalendarEvent
-
-_TIGHT_MINUTES = 5   # 间隔小于此值视为"紧接"
-
-
-@dataclass
-class ConflictPair:
-    a: CalendarEvent
-    b: CalendarEvent
-    overlap_minutes: int   # 0 表示紧接但不重叠
-    is_tight: bool = False # True = 无重叠但间隔 < 5 分钟
-
-    def format_text(self) -> str:
-        ta = f"{self.a.start.strftime('%H:%M')}–{self.a.end.strftime('%H:%M')}"
-        tb = f"{self.b.start.strftime('%H:%M')}–{self.b.end.strftime('%H:%M')}"
-        if self.is_tight:
-            gap = int((self.b.start - self.a.end).total_seconds() / 60)
-            return (
-                f"⚡ 紧接：【{self.a.summary}】({ta}) 结束后仅 {gap} 分钟"
-                f"【{self.b.summary}】({tb}) 就开始"
-            )
-        return (
-            f"⚠️ 冲突：【{self.a.summary}】({ta})"
-            f" 与 【{self.b.summary}】({tb})"
-            f" 重叠 {self.overlap_minutes} 分钟"
-        )
-
-
-def detect_conflicts(
-    events: list[CalendarEvent],
-    tight_minutes: int = _TIGHT_MINUTES,
-) -> list[ConflictPair]:
-    """
-    检测时间重叠或紧接的事件对。
-
-    返回结果按事件开始时间升序排列。
-    仅检测有确定时间的事件（跳过全天事件）。
-    """
-    timed = [
-        e for e in events
-        if not e.is_all_day and e.start is not None and e.end is not None
-    ]
-    timed.sort(key=lambda e: e.start)
-
-    pairs: list[ConflictPair] = []
-    for i in range(len(timed)):
-        for j in range(i + 1, len(timed)):
-            a, b = timed[i], timed[j]
-
-            # b 开始已超过 a 结束 + tight window → 不可能再有冲突/紧接
-            if b.start >= a.end + timedelta(minutes=tight_minutes):
-                break
-
-            if b.start < a.end:
-                # 有重叠
-                overlap_start = max(a.start, b.start)
-                overlap_end   = min(a.end,   b.end)
-                overlap_min   = int((overlap_end - overlap_start).total_seconds() / 60)
-                if overlap_min > 0:
-                    pairs.append(ConflictPair(a=a, b=b, overlap_minutes=overlap_min))
-            else:
-                # 无重叠但间隔 < tight_minutes
-                pairs.append(ConflictPair(a=a, b=b, overlap_minutes=0, is_tight=True))
-
-    return pairs
-
-
-def format_conflicts_section(pairs: list[ConflictPair]) -> str:
-    """将冲突列表格式化为 Markdown 通知文本。"""
-    if not pairs:
-        return ""
-    lines = ["⚠️ **发现日程冲突：**", ""]
-    for p in pairs:
-        lines.append(f"- {p.format_text()}")
-    lines.append("")
-    lines.append("建议：检查 Google Calendar 并调整时间安排。")
-    return "\n".join(lines)
+"""
+日程冲突检测器。
+
+检测同一批事件中时间重叠的事件对。全天事件不参与检测。
+
+规则：
+  - A.start < B.end AND A.end > B.start → 有重叠
+  - 紧接场景（间隔 < 5 分钟）→ 额外警告（is_tight=True）
+"""
+
+from __future__ import annotations
+
+import sys
+from dataclasses import dataclass
+from datetime import timedelta
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).parent.parent))
+
+from gcal.models import CalendarEvent
+
+_TIGHT_MINUTES = 5   # 间隔小于此值视为"紧接"
+
+
+@dataclass
+class ConflictPair:
+    a: CalendarEvent
+    b: CalendarEvent
+    overlap_minutes: int   # 0 表示紧接但不重叠
+    is_tight: bool = False # True = 无重叠但间隔 < 5 分钟
+
+    def format_text(self) -> str:
+        ta = f"{self.a.start.strftime('%H:%M')}–{self.a.end.strftime('%H:%M')}"
+        tb = f"{self.b.start.strftime('%H:%M')}–{self.b.end.strftime('%H:%M')}"
+        if self.is_tight:
+            gap = int((self.b.start - self.a.end).total_seconds() / 60)
+            return (
+                f"⚡ 紧接：【{self.a.summary}】({ta}) 结束后仅 {gap} 分钟"
+                f"【{self.b.summary}】({tb}) 就开始"
+            )
+        return (
+            f"⚠️ 冲突：【{self.a.summary}】({ta})"
+            f" 与 【{self.b.summary}】({tb})"
+            f" 重叠 {self.overlap_minutes} 分钟"
+        )
+
+
+def detect_conflicts(
+    events: list[CalendarEvent],
+    tight_minutes: int = _TIGHT_MINUTES,
+) -> list[ConflictPair]:
+    """
+    检测时间重叠或紧接的事件对。
+
+    返回结果按事件开始时间升序排列。
+    仅检测有确定时间的事件（跳过全天事件）。
+    """
+    timed = [
+        e for e in events
+        if not e.is_all_day and e.start is not None and e.end is not None
+    ]
+    timed.sort(key=lambda e: e.start)
+
+    pairs: list[ConflictPair] = []
+    for i in range(len(timed)):
+        for j in range(i + 1, len(timed)):
+            a, b = timed[i], timed[j]
+
+            # b 开始已超过 a 结束 + tight window → 不可能再有冲突/紧接
+            if b.start >= a.end + timedelta(minutes=tight_minutes):
+                break
+
+            if b.start < a.end:
+                # 有重叠
+                overlap_start = max(a.start, b.start)
+                overlap_end   = min(a.end,   b.end)
+                overlap_min   = int((overlap_end - overlap_start).total_seconds() / 60)
+                if overlap_min > 0:
+                    pairs.append(ConflictPair(a=a, b=b, overlap_minutes=overlap_min))
+            else:
+                # 无重叠但间隔 < tight_minutes
+                pairs.append(ConflictPair(a=a, b=b, overlap_minutes=0, is_tight=True))
+
+    return pairs
+
+
+def format_conflicts_section(pairs: list[ConflictPair]) -> str:
+    """将冲突列表格式化为 Markdown 通知文本。"""
+    if not pairs:
+        return ""
+    lines = ["⚠️ **发现日程冲突：**", ""]
+    for p in pairs:
+        lines.append(f"- {p.format_text()}")
+    lines.append("")
+    lines.append("建议：检查 Google Calendar 并调整时间安排。")
+    return "\n".join(lines)