This commit is contained in:
Timothy Jaeryang Baek committed 2026-07-31 17:30:47 -04:00
1 parent ace84b4ae9
commit d721b0d196
1 file changed
+25 -23
+25 -23
View File
@@ -4,12 +4,11 @@ Calendar utilities.
RRULE expansion reusing the automation infra. RRULE expansion reusing the automation infra.
""" """
import datetime as dt
import logging import logging
from datetime import datetime, timedelta
from typing import Optional
from zoneinfo import ZoneInfo from zoneinfo import ZoneInfo
from open_webui.utils.automations import _parse_rule from open_webui.utils.automations import _resolve_tz
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -18,7 +17,7 @@ def expand_recurring_event(
event_dict: dict, event_dict: dict,
range_start_ns: int, range_start_ns: int,
range_end_ns: int, range_end_ns: int,
tz: Optional[str] = None, tz: str | None = None,
max_instances: int = 5000, max_instances: int = 5000,
) -> list[dict]: ) -> list[dict]:
"""Expand a recurring event into individual instances within a date range. """Expand a recurring event into individual instances within a date range.
@@ -32,16 +31,23 @@ def expand_recurring_event(
if not rrule_str: if not rrule_str:
return [event_dict] return [event_dict]
range_start_dt = datetime.fromtimestamp(range_start_ns / 1_000_000_000) user_timezone = _resolve_tz(tz)
range_end_dt = datetime.fromtimestamp(range_end_ns / 1_000_000_000)
scan_start = range_start_dt - timedelta(days=1) def to_local_datetime(timestamp_ns: int) -> dt.datetime:
if user_timezone:
return dt.datetime.fromtimestamp(timestamp_ns / 1_000_000_000, tz=user_timezone).replace(tzinfo=None)
return dt.datetime.fromtimestamp(timestamp_ns / 1_000_000_000)
range_start = to_local_datetime(range_start_ns)
range_end = to_local_datetime(range_end_ns)
scan_start = range_start - dt.timedelta(days=1)
original_start_ns = event_dict['start_at'] original_start_ns = event_dict['start_at']
original_start_dt = datetime.fromtimestamp(original_start_ns / 1_000_000_000) original_start = to_local_datetime(original_start_ns)
try: try:
# Anchor to the event's real start so day-of-week / day-of-month are correct # Anchor to the event's real start so day-of-week / day-of-month are correct
rule = rrulestr(rrule_str, dtstart=original_start_dt, ignoretz=True) rule = rrulestr(rrule_str, dtstart=original_start, ignoretz=True)
except Exception: except Exception:
log.warning(f'Failed to parse RRULE for event {event_dict.get("id")}: {rrule_str}') log.warning(f'Failed to parse RRULE for event {event_dict.get("id")}: {rrule_str}')
return [event_dict] return [event_dict]
@@ -50,17 +56,13 @@ def expand_recurring_event(
duration_ns = (original_end_ns - original_start_ns) if original_end_ns else None duration_ns = (original_end_ns - original_start_ns) if original_end_ns else None
instances = [] instances = []
dt = rule.after(scan_start, inc=True) occurrence_start = rule.after(scan_start, inc=True)
while dt and dt < range_end_dt and len(instances) < max_instances: while occurrence_start and occurrence_start < range_end and len(instances) < max_instances:
if tz: if user_timezone:
try: instance_start_ns = int(occurrence_start.replace(tzinfo=user_timezone).timestamp() * 1_000_000_000)
dt_tz = dt.replace(tzinfo=ZoneInfo(tz))
instance_start_ns = int(dt_tz.timestamp() * 1_000_000_000)
except Exception:
instance_start_ns = int(dt.timestamp() * 1_000_000_000)
else: else:
instance_start_ns = int(dt.timestamp() * 1_000_000_000) instance_start_ns = int(occurrence_start.timestamp() * 1_000_000_000)
if instance_start_ns >= range_start_ns: if instance_start_ns >= range_start_ns:
instance = { instance = {
@@ -71,15 +73,15 @@ def expand_recurring_event(
} }
instances.append(instance) instances.append(instance)
dt = rule.after(dt) occurrence_start = rule.after(occurrence_start)
return instances return instances
def ns_from_date(year: int, month: int, day: int, tz: Optional[str] = None) -> int: def ns_from_date(year: int, month: int, day: int, tz: str | None = None) -> int:
"""Create epoch nanoseconds from a date.""" """Create epoch nanoseconds from a date."""
if tz: if tz:
dt = datetime(year, month, day, tzinfo=ZoneInfo(tz)) date_time = dt.datetime(year, month, day, tzinfo=ZoneInfo(tz))
else: else:
dt = datetime(year, month, day) date_time = dt.datetime(year, month, day)
return int(dt.timestamp() * 1_000_000_000) return int(date_time.timestamp() * 1_000_000_000)