mirror of
https://github.com/bytedance/deer-flow.git
synced 2026-10-26 21:26:39 +00:00
* feat(channels): generalize IM group targets and add task/goal run notifications
- Generalize proactive group notification capability (proactive_group_notifications), binding validation, and scheduled task group selection across Feishu, QQ, and WeCom while keeping WeChat personal-only.
- Add QQ group active notification delivery via POST /v2/groups/{group_openid}/messages (msg_type=2) and WeCom group active notification delivery via WS Client.sendMessage(chatid, body) with bot_id:group:chatid workspace isolation.
- Generalize notification outbox sources via migration 0043_runtime_im_notices (source_kind, source_key, run_id, nullable task_id/task_run_id) with backward-compatible SQLite/PostgreSQL upgrades.
- Add opt-in ordinary task & goal run IM notifications (run_completed, run_failed, human_input_requested) on the shared outbox, delivery worker, renderer, and settings UI.
* fix(notifications): address review feedback and group/runtime notification edge cases
* test(migrations): update CURRENT_HEAD to 0043_runtime_im_notices across migration chain tests
* fix(channels): preserve group binding names and legacy authorization
Carry owner-chosen group names through existing connect state, keep private bindings out of legacy group fallback, and restore completion metadata retries. Cover real binding and worker finalization paths and synchronize notification docs.
---------
Co-authored-by: Willem Jiang <willem.jiang@gmail.com>
447 lines
23 KiB
Python
447 lines
23 KiB
Python
"""Outbox delivery worker for scheduled-task IM notifications (issue #4254).
|
|
|
|
The scheduler's finalization observer (``ScheduledTaskService._on_finalization``)
|
|
writes durable outbox rows in the transaction that records each outcome; this
|
|
worker owns the actual IM send. Notice text lives in ``notification_text``.
|
|
Execution state and delivery state stay separated: the worker moves outbox
|
|
rows through ``pending -> sending -> sent|failed`` and never touches run or
|
|
task rows. Retries with backoff live in the repository (``mark_failed``);
|
|
the worker just claims what is due and reports outcomes.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import inspect
|
|
import logging
|
|
from collections.abc import Callable
|
|
from datetime import UTC, datetime, timedelta
|
|
from typing import Any
|
|
|
|
from app.channels.base import ChannelUnavailable
|
|
from app.channels.capabilities import supports_proactive_group_notifications, supports_proactive_notifications
|
|
from app.channels.notification_groups import is_notification_group
|
|
from app.scheduler.notification_text import DEFAULT_NOTIFICATION_LOCALE, redact_egress_text, render_notification_text, wants_result_summary
|
|
from deerflow.persistence.user.im_notifications import (
|
|
DISABLED_BY_OWNER,
|
|
IM_RUNTIME_NOTIFICATION_EVENTS,
|
|
RUNTIME_NOTIFICATION_SOURCE_KINDS,
|
|
)
|
|
|
|
__all__ = ["NotificationDeliveryWorker", "redact_egress_text", "render_notification_text"]
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Resolves a provider name (e.g. "wecom") to a running Channel instance, or
|
|
# None when the channel is not configured/running. Sync or async callables
|
|
# are both accepted (``ChannelService.get_channel`` is sync).
|
|
ChannelResolver = Callable[[str], Any]
|
|
|
|
# Resolves the run's final reply, keyed ``(run_id, owner_user_id)``, or None
|
|
# when no reply is available. The renderer reduces it to the tasks page's
|
|
# one-line run summary. Sync or async callables are both accepted; failures
|
|
# send the notice without a result line.
|
|
SummaryResolver = Callable[[str, str | None], Any]
|
|
|
|
# Lists an owner's channel connections (``ChannelConnectionRepository
|
|
# .list_connections``), each a dict with ``provider``, ``external_account_id``
|
|
# and ``status``. Sync or async callables are both accepted. The worker uses
|
|
# it to confirm, at send time, that the delivery's target is still bound.
|
|
ConnectionResolver = Callable[[str], Any]
|
|
|
|
# Returns the providers this instance must not claim rows for, or None for no
|
|
# restriction. Under ``channels.leader_lease`` (``ChannelService
|
|
# .notification_excluded_providers``) these are the providers another instance
|
|
# holds the transport of: claiming their rows here would only park them.
|
|
ExcludedProvidersResolver = Callable[[], Any]
|
|
|
|
# A claimed row stuck in "sending" longer than this is considered orphaned
|
|
# (process died between claim and the final status write) and flipped back
|
|
# to pending. Generous on purpose: a healthy send plus status write finishes
|
|
# in seconds, and resetting too eagerly would double-send live deliveries.
|
|
_STALE_SENDING_TIMEOUT_SECONDS = 600
|
|
|
|
# Matches Gateway ``_SHUTDOWN_HOOK_TIMEOUT_SECONDS``: this worker sits in
|
|
# front of external IM I/O, so an unbounded join would stall the whole
|
|
# lifespan shutdown path the channel-service bound was added to protect.
|
|
_STOP_TIMEOUT_SECONDS = 5.0
|
|
|
|
|
|
class NotificationDeliveryWorker:
|
|
"""Polls the notification outbox and pushes due deliveries over IM."""
|
|
|
|
def __init__(
|
|
self,
|
|
*,
|
|
delivery_repo,
|
|
resolve_channel: ChannelResolver,
|
|
poll_interval_seconds: int = 5,
|
|
batch_size: int = 10,
|
|
resolve_run_summary: SummaryResolver | None = None,
|
|
resolve_connections: ConnectionResolver | None = None,
|
|
excluded_providers: ExcludedProvidersResolver | None = None,
|
|
resolve_notification_preferences: Callable[[str], Any] | None = None,
|
|
resolve_notification_event_preferences: Callable[[str], Any] | None = None,
|
|
resolve_human_input_pending: Callable[..., Any] | None = None,
|
|
stale_sending_timeout_seconds: int = _STALE_SENDING_TIMEOUT_SECONDS,
|
|
stop_timeout_seconds: float = _STOP_TIMEOUT_SECONDS,
|
|
default_locale: str = DEFAULT_NOTIFICATION_LOCALE,
|
|
) -> None:
|
|
self._delivery_repo = delivery_repo
|
|
self._resolve_channel = resolve_channel
|
|
self._resolve_run_summary = resolve_run_summary
|
|
self._resolve_connections = resolve_connections
|
|
self._excluded_providers = excluded_providers
|
|
self._resolve_notification_preferences = resolve_notification_preferences
|
|
self._resolve_notification_event_preferences = resolve_notification_event_preferences
|
|
self._resolve_human_input_pending = resolve_human_input_pending
|
|
self._poll_interval_seconds = poll_interval_seconds
|
|
self._batch_size = batch_size
|
|
self._stale_sending_timeout_seconds = stale_sending_timeout_seconds
|
|
self._stop_timeout_seconds = stop_timeout_seconds
|
|
# ``channel_connections.notification_locale``: the language of rows
|
|
# whose owner has no UI language preference (and of legacy rows).
|
|
self._default_locale = default_locale
|
|
self._task: asyncio.Task | None = None
|
|
self._stop = asyncio.Event()
|
|
self._lifecycle_lock = asyncio.Lock()
|
|
|
|
async def start(self) -> None:
|
|
async with self._lifecycle_lock:
|
|
if self._task is not None:
|
|
return
|
|
self._stop.clear()
|
|
self._task = asyncio.create_task(self._run_loop())
|
|
|
|
async def stop(self) -> None:
|
|
async with self._lifecycle_lock:
|
|
task = self._task
|
|
if task is None:
|
|
return
|
|
self._stop.set()
|
|
try:
|
|
try:
|
|
await asyncio.wait_for(task, timeout=self._stop_timeout_seconds)
|
|
except TimeoutError:
|
|
logger.warning(
|
|
"Notification delivery worker stop exceeded %.1fs; cancelling in-flight poll",
|
|
self._stop_timeout_seconds,
|
|
)
|
|
task.cancel()
|
|
try:
|
|
await task
|
|
except asyncio.CancelledError:
|
|
pass
|
|
finally:
|
|
if self._task is task:
|
|
self._task = None
|
|
|
|
async def run_once(self, *, now: datetime) -> None:
|
|
await self._recover_stale_sending(now)
|
|
excluded = self._current_exclusions()
|
|
if excluded is None:
|
|
rows = await self._delivery_repo.claim_due_deliveries(now=now, limit=self._batch_size)
|
|
else:
|
|
rows = await self._delivery_repo.claim_due_deliveries(now=now, limit=self._batch_size, exclude_providers=excluded)
|
|
for row in rows:
|
|
try:
|
|
await self._deliver(row)
|
|
except Exception:
|
|
# One poisoned row must not abort the loop and strand the
|
|
# rest of the claimed batch in "sending". Best-effort
|
|
# mark_failed; if even that raises, the stale reset above
|
|
# reclaims the row on a later poll.
|
|
logger.exception("Notification delivery %s crashed; isolating from the rest of the batch", row.get("id"))
|
|
try:
|
|
await self._delivery_repo.mark_failed(row["id"], claim_token=row.get("claim_token"), error="delivery crashed before completion")
|
|
except Exception:
|
|
logger.warning("Could not mark crashed delivery %s as failed; stale reset will recover it", row.get("id"), exc_info=True)
|
|
|
|
def _current_exclusions(self) -> frozenset[str] | None:
|
|
"""Providers to leave to the instance holding their transport (read fresh every poll)."""
|
|
if self._excluded_providers is None:
|
|
return None
|
|
excluded = self._excluded_providers()
|
|
if not isinstance(excluded, (set, frozenset, list, tuple)) or not excluded:
|
|
return None
|
|
return frozenset(str(provider) for provider in excluded)
|
|
|
|
async def _recover_stale_sending(self, now: datetime) -> None:
|
|
"""Lease-style reconciliation, run before every claim (the first poll
|
|
after startup is covered too). Mirrors how the scheduler recovers
|
|
stale active runs."""
|
|
try:
|
|
reset = await self._delivery_repo.reset_stale_sending_rows(
|
|
now=now,
|
|
timeout=timedelta(seconds=self._stale_sending_timeout_seconds),
|
|
)
|
|
if reset:
|
|
logger.info("Recovered %s notification deliveries stuck in 'sending'", reset)
|
|
except Exception:
|
|
logger.warning("Failed to reset stale sending rows; retrying next poll", exc_info=True)
|
|
|
|
async def _resolve_summary(self, delivery: dict[str, Any]) -> str | None:
|
|
"""Best-effort lookup of the run's final reply at delivery time.
|
|
|
|
Read at delivery time, not enqueue time, so retried deliveries see
|
|
the freshest value and the outbox payload stays small. Any failure
|
|
sends the notice without its result line instead of blocking it.
|
|
"""
|
|
if self._resolve_run_summary is None:
|
|
return None
|
|
run_id = delivery.get("run_id")
|
|
if not run_id:
|
|
return None
|
|
try:
|
|
summary = self._resolve_run_summary(run_id, delivery.get("owner_user_id"))
|
|
if inspect.isawaitable(summary):
|
|
summary = await summary
|
|
except Exception:
|
|
logger.warning("Failed to resolve run summary for run %s; sending skeleton notification", run_id, exc_info=True)
|
|
return None
|
|
if isinstance(summary, str) and summary.strip():
|
|
return summary
|
|
return None
|
|
|
|
async def _target_still_connected(self, delivery: dict[str, Any]) -> bool | None:
|
|
"""Return whether the delivery's ``(provider, target)`` is still a
|
|
``connected`` identity of its owner, or None when that could not be
|
|
determined (no resolver wired, or the lookup failed).
|
|
|
|
The outbox row was written while the identity was connected, but
|
|
delivery can run up to a day later (counted retries, then parking),
|
|
and ``disconnect_connection`` only flips the connection row. The
|
|
lookup is scoped to the row's own ``owner_user_id`` so it cannot
|
|
match another owner's binding of the same external account.
|
|
"""
|
|
if self._resolve_connections is None:
|
|
return None
|
|
owner_user_id = delivery.get("owner_user_id")
|
|
provider = delivery.get("provider")
|
|
target = delivery.get("target")
|
|
is_group = (delivery.get("payload") or {}).get("target_type") == "group"
|
|
if not owner_user_id or not provider or not target:
|
|
return None
|
|
try:
|
|
connections = self._resolve_connections(owner_user_id)
|
|
if inspect.isawaitable(connections):
|
|
connections = await connections
|
|
except Exception:
|
|
logger.warning("Failed to check channel connections for delivery %s; parking it", delivery.get("id"), exc_info=True)
|
|
return None
|
|
if connections is None:
|
|
connections = []
|
|
if not isinstance(connections, (list, tuple)):
|
|
# An unexpected shape is a lookup problem, not evidence that the
|
|
# binding is gone: iterating a dict or a str would "find" nothing
|
|
# and drop the row for good.
|
|
logger.warning("Channel connection lookup for delivery %s returned %s, not a list; parking it", delivery.get("id"), type(connections).__name__)
|
|
return None
|
|
for connection in connections:
|
|
if not isinstance(connection, dict):
|
|
continue
|
|
# The resolver is called with the row's owner; a row that names a
|
|
# different owner is skipped as well, so a resolver that is not
|
|
# owner-scoped still cannot make another user's binding count.
|
|
row_owner = connection.get("owner_user_id")
|
|
if row_owner is not None and row_owner != owner_user_id:
|
|
continue
|
|
if is_group:
|
|
if (
|
|
row_owner == owner_user_id
|
|
and connection.get("id") == target
|
|
and connection.get("provider") == provider
|
|
and supports_proactive_group_notifications(provider)
|
|
and is_notification_group(
|
|
provider=connection.get("provider"),
|
|
status=connection.get("status"),
|
|
workspace_id=connection.get("workspace_id"),
|
|
metadata=connection.get("metadata"),
|
|
)
|
|
):
|
|
return True
|
|
continue
|
|
if connection.get("provider") == provider and connection.get("external_account_id") == target and connection.get("status") == "connected":
|
|
return True
|
|
return False
|
|
|
|
async def _check_notification_preference(self, delivery: dict[str, Any]) -> bool:
|
|
if self._resolve_notification_preferences is None:
|
|
return True
|
|
try:
|
|
preferences = self._resolve_notification_preferences(delivery.get("owner_user_id") or "")
|
|
if inspect.isawaitable(preferences):
|
|
preferences = await preferences
|
|
if not isinstance(preferences, dict) or type(preferences.get(delivery.get("provider"))) is not bool:
|
|
raise ValueError("Invalid notification preference response")
|
|
except Exception:
|
|
logger.warning("Could not verify notification preference for delivery %s; parking it", delivery["id"], exc_info=True)
|
|
await self._delivery_repo.mark_failed(delivery["id"], claim_token=delivery.get("claim_token"), error="could not verify notification preference", count_attempt=False)
|
|
return False
|
|
if not preferences[delivery["provider"]]:
|
|
await self._delivery_repo.mark_failed(delivery["id"], claim_token=delivery.get("claim_token"), error=DISABLED_BY_OWNER, count_attempt=False, terminal=True)
|
|
return False
|
|
source_kind = delivery.get("source_kind") or (delivery.get("payload") or {}).get("source_kind")
|
|
event = delivery.get("event")
|
|
if source_kind in RUNTIME_NOTIFICATION_SOURCE_KINDS and isinstance(event, str) and event in IM_RUNTIME_NOTIFICATION_EVENTS:
|
|
if self._resolve_notification_event_preferences is not None:
|
|
try:
|
|
event_prefs = self._resolve_notification_event_preferences(delivery.get("owner_user_id") or "")
|
|
if inspect.isawaitable(event_prefs):
|
|
event_prefs = await event_prefs
|
|
except Exception:
|
|
logger.warning("Could not verify runtime event preference for delivery %s; parking it", delivery["id"], exc_info=True)
|
|
await self._delivery_repo.mark_failed(delivery["id"], claim_token=delivery.get("claim_token"), error="could not verify notification preference", count_attempt=False)
|
|
return False
|
|
if isinstance(event_prefs, dict) and not event_prefs.get(event, False):
|
|
await self._delivery_repo.mark_failed(delivery["id"], claim_token=delivery.get("claim_token"), error=DISABLED_BY_OWNER, count_attempt=False, terminal=True)
|
|
return False
|
|
elif preferences.get(event) is False:
|
|
await self._delivery_repo.mark_failed(delivery["id"], claim_token=delivery.get("claim_token"), error=DISABLED_BY_OWNER, count_attempt=False, terminal=True)
|
|
return False
|
|
return True
|
|
|
|
async def _check_human_input_pending(self, delivery: dict[str, Any]) -> bool:
|
|
if delivery.get("event") != "human_input_requested" or self._resolve_human_input_pending is None:
|
|
return True
|
|
try:
|
|
params = inspect.signature(self._resolve_human_input_pending).parameters
|
|
positional = [p for p in params.values() if p.kind in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD)]
|
|
if len(positional) >= 2:
|
|
payload = delivery.get("payload") if isinstance(delivery.get("payload"), dict) else {}
|
|
thread_id = payload.get("thread_id") or ""
|
|
request_id = payload.get("request_id") or payload.get("tool_call_id")
|
|
pending = self._resolve_human_input_pending(thread_id, request_id)
|
|
else:
|
|
pending = self._resolve_human_input_pending(delivery)
|
|
if inspect.isawaitable(pending):
|
|
pending = await pending
|
|
except Exception:
|
|
logger.warning("Could not verify human input request state for delivery %s; parking it", delivery["id"], exc_info=True)
|
|
await self._delivery_repo.mark_failed(
|
|
delivery["id"],
|
|
claim_token=delivery.get("claim_token"),
|
|
error="could not verify human input request state",
|
|
count_attempt=False,
|
|
)
|
|
return False
|
|
if pending is None:
|
|
await self._delivery_repo.mark_failed(
|
|
delivery["id"],
|
|
claim_token=delivery.get("claim_token"),
|
|
error="could not verify human input request state",
|
|
count_attempt=False,
|
|
)
|
|
return False
|
|
if not pending:
|
|
await self._delivery_repo.mark_failed(
|
|
delivery["id"],
|
|
claim_token=delivery.get("claim_token"),
|
|
error="human_input_request_already_resolved",
|
|
count_attempt=False,
|
|
terminal=True,
|
|
)
|
|
return False
|
|
return True
|
|
|
|
async def _deliver(self, delivery: dict[str, Any]) -> None:
|
|
delivery_id = delivery["id"]
|
|
provider = delivery.get("provider") or ""
|
|
target_type = (delivery.get("payload") or {}).get("target_type")
|
|
if target_type not in (None, "group") or (target_type == "group" and not supports_proactive_group_notifications(provider)):
|
|
await self._delivery_repo.mark_failed(delivery_id, claim_token=delivery.get("claim_token"), error="unsupported notification target type", terminal=True)
|
|
return
|
|
if not supports_proactive_notifications(provider):
|
|
# The scheduler enqueues only for providers with proactive push;
|
|
# a row for any other provider predates that rule. It can never
|
|
# be sent, so it ends now instead of using up its retries.
|
|
await self._delivery_repo.mark_failed(
|
|
delivery_id,
|
|
claim_token=delivery.get("claim_token"),
|
|
error="provider does not support proactive notifications",
|
|
terminal=True,
|
|
)
|
|
return
|
|
if self._resolve_connections is not None or target_type == "group":
|
|
# Re-check the binding at delivery time, before anything else: a
|
|
# target the owner has disconnected since enqueue must never
|
|
# receive the push, however long the row waited, and it must not
|
|
# sit in parking for a day either when the channel is also down
|
|
# (disconnecting a provider revokes its connections and stops its
|
|
# channel together). A lookup failure parks instead, so a
|
|
# transient store error neither drops nor sends the row.
|
|
still_connected = await self._target_still_connected(delivery)
|
|
if still_connected is False:
|
|
await self._delivery_repo.mark_failed(
|
|
delivery_id,
|
|
claim_token=delivery.get("claim_token"),
|
|
error=f"target is no longer a connected {provider} identity of its owner",
|
|
terminal=True,
|
|
)
|
|
return
|
|
if still_connected is None:
|
|
await self._delivery_repo.mark_failed(delivery_id, claim_token=delivery.get("claim_token"), error="could not verify the target's channel connection", count_attempt=False)
|
|
return
|
|
if not await self._check_notification_preference(delivery):
|
|
return
|
|
if not await self._check_human_input_pending(delivery):
|
|
return
|
|
# Re-check channel liveness at delivery time, not enqueue time: the
|
|
# channel may have been disabled or disconnected after the outbox row
|
|
# was written, and the row stays retryable for when it comes back.
|
|
channel = self._resolve_channel(provider)
|
|
if inspect.isawaitable(channel):
|
|
channel = await channel
|
|
if channel is None or not getattr(channel, "is_running", True):
|
|
# Channel outage is not the delivery's fault: park the row
|
|
# without consuming its retry budget so it survives an
|
|
# hours-long outage and delivers once the channel returns.
|
|
await self._delivery_repo.mark_failed(delivery_id, claim_token=delivery.get("claim_token"), error=f"channel '{provider}' is not running", count_attempt=False)
|
|
return
|
|
enriched = delivery
|
|
if wants_result_summary(delivery):
|
|
summary = await self._resolve_summary(delivery)
|
|
if summary is not None:
|
|
# Copy before enriching: the claimed row must not be mutated
|
|
# in place (its payload is the durable outbox snapshot).
|
|
enriched = dict(delivery)
|
|
enriched["payload"] = {**(delivery.get("payload") or {}), "result_summary": summary}
|
|
# Summary/config lookups can await long enough for a user to mute.
|
|
if not await self._check_notification_preference(delivery):
|
|
return
|
|
if not await self._check_human_input_pending(delivery):
|
|
return
|
|
is_active_claim = getattr(self._delivery_repo, "is_active_claim", None)
|
|
if callable(is_active_claim) and not await is_active_claim(delivery_id, claim_token=delivery.get("claim_token")):
|
|
return
|
|
try:
|
|
send = channel.send_group_notification_for_owner if target_type == "group" else channel.send_notification_for_owner
|
|
await send(
|
|
owner_user_id=delivery.get("owner_user_id") or "",
|
|
target=delivery.get("target") or "",
|
|
text_markdown=render_notification_text(enriched, default_locale=self._default_locale),
|
|
)
|
|
except ChannelUnavailable as exc:
|
|
await self._delivery_repo.mark_failed(delivery_id, claim_token=delivery.get("claim_token"), error=str(exc), count_attempt=False)
|
|
return
|
|
except Exception as exc:
|
|
await self._delivery_repo.mark_failed(delivery_id, claim_token=delivery.get("claim_token"), error=str(exc))
|
|
return
|
|
await self._delivery_repo.mark_sent(delivery_id, claim_token=delivery.get("claim_token"))
|
|
|
|
async def _run_loop(self) -> None:
|
|
while not self._stop.is_set():
|
|
try:
|
|
await self.run_once(now=datetime.now(UTC))
|
|
except Exception:
|
|
# A transient DB error must not kill the poller task for the
|
|
# rest of the process life (same policy as the scheduler).
|
|
logger.exception("Notification delivery poll failed; retrying next interval")
|
|
try:
|
|
await asyncio.wait_for(
|
|
self._stop.wait(),
|
|
timeout=self._poll_interval_seconds,
|
|
)
|
|
except TimeoutError:
|
|
continue
|