mirror of
https://github.com/HKUDS/nanobot.git
synced 2026-08-04 16:38:49 +00:00
refactor(cron): move gateway execution out of cli
maintainer edit: extract cron job execution, streaming buffering, notification gating, and turn_end emission into nanobot.cron.executor so commands.py only wires gateway dependencies.
This commit is contained in:
chengyongru
parent
3ecd042ef0
commit
5f5521d2e6
@ -5,7 +5,6 @@ import os
|
||||
import select
|
||||
import signal
|
||||
import sys
|
||||
import time
|
||||
from collections.abc import Callable
|
||||
from contextlib import nullcontext, suppress
|
||||
from pathlib import Path
|
||||
@ -622,12 +621,11 @@ def _run_gateway(
|
||||
open_browser_url: str | None = None,
|
||||
) -> None:
|
||||
"""Shared gateway runtime; ``open_browser_url`` opens a tab once channels are up."""
|
||||
from nanobot.agent.tools.cron import CronTool
|
||||
from nanobot.agent.tools.message import MessageTool
|
||||
from nanobot.bus.queue import MessageBus
|
||||
from nanobot.channels.manager import ChannelManager
|
||||
from nanobot.cron.executor import CronJobExecutor
|
||||
from nanobot.cron.service import CronService
|
||||
from nanobot.cron.types import CronJob
|
||||
from nanobot.heartbeat.service import HeartbeatService
|
||||
from nanobot.providers.factory import build_provider_snapshot, load_provider_snapshot
|
||||
from nanobot.session.manager import SessionManager
|
||||
@ -714,154 +712,19 @@ def _run_gateway(
|
||||
if isinstance(message_tool, MessageTool):
|
||||
message_tool.set_send_callback(_deliver_to_channel)
|
||||
|
||||
# Set cron callback (needs agent)
|
||||
async def on_cron_job(job: CronJob) -> str | None:
|
||||
"""Execute a cron job through the agent."""
|
||||
# Dream is an internal job — run directly, not through the agent loop.
|
||||
if job.name == "dream":
|
||||
try:
|
||||
await agent.dream.run()
|
||||
logger.info("Dream cron job completed")
|
||||
except Exception:
|
||||
logger.exception("Dream cron job failed")
|
||||
def _get_channel(channel_name: str) -> Any | None:
|
||||
try:
|
||||
return channels.channels.get(channel_name)
|
||||
except NameError:
|
||||
return None
|
||||
|
||||
from nanobot.utils.evaluator import evaluate_response
|
||||
|
||||
reminder_note = (
|
||||
"The scheduled time has arrived. Deliver this reminder to the user now, "
|
||||
"as a brief and natural message in their language. Speak directly to them — "
|
||||
"do not narrate progress, summarize, include user IDs, or add status reports "
|
||||
"like 'Done' or 'Reminded'.\n\n"
|
||||
f"Reminder: {job.payload.message}"
|
||||
)
|
||||
|
||||
cron_tool = agent.tools.get("cron")
|
||||
cron_token = None
|
||||
if isinstance(cron_tool, CronTool):
|
||||
cron_token = cron_tool.set_cron_context(True)
|
||||
|
||||
async def _silent(*_args, **_kwargs):
|
||||
pass
|
||||
|
||||
message_record_token = None
|
||||
if isinstance(message_tool, MessageTool):
|
||||
message_record_token = message_tool.set_record_channel_delivery(True)
|
||||
|
||||
channel_name = job.payload.channel or "cli"
|
||||
chat_id = job.payload.to or "direct"
|
||||
try:
|
||||
target_channel = channels.channels.get(channel_name)
|
||||
except NameError:
|
||||
target_channel = None
|
||||
wants_stream = bool(
|
||||
job.payload.deliver
|
||||
and job.payload.to
|
||||
and target_channel is not None
|
||||
and target_channel.supports_streaming
|
||||
)
|
||||
|
||||
stream_base_id = None
|
||||
stream_segment = 0
|
||||
stream_had_delta = False
|
||||
stream_events: list[OutboundMessage] = []
|
||||
|
||||
def _current_stream_id() -> str:
|
||||
return f"{stream_base_id}:{stream_segment}"
|
||||
|
||||
async def _on_stream(delta: str) -> None:
|
||||
nonlocal stream_had_delta
|
||||
meta = dict(job.payload.channel_meta)
|
||||
meta["_stream_delta"] = True
|
||||
meta["_stream_id"] = _current_stream_id()
|
||||
stream_events.append(OutboundMessage(
|
||||
channel=channel_name,
|
||||
chat_id=chat_id,
|
||||
content=delta,
|
||||
metadata=meta,
|
||||
))
|
||||
if delta:
|
||||
stream_had_delta = True
|
||||
|
||||
async def _on_stream_end(*, resuming: bool = False) -> None:
|
||||
nonlocal stream_segment
|
||||
meta = dict(job.payload.channel_meta)
|
||||
meta["_stream_end"] = True
|
||||
meta["_resuming"] = resuming
|
||||
meta["_stream_id"] = _current_stream_id()
|
||||
stream_events.append(OutboundMessage(
|
||||
channel=channel_name,
|
||||
chat_id=chat_id,
|
||||
content="",
|
||||
metadata=meta,
|
||||
))
|
||||
stream_segment += 1
|
||||
|
||||
if wants_stream:
|
||||
stream_base_id = f"cron:{job.id}:{time.time_ns()}"
|
||||
|
||||
async def _publish_buffered_stream() -> None:
|
||||
for event in stream_events:
|
||||
await bus.publish_outbound(event)
|
||||
|
||||
async def _publish_turn_end_if_needed() -> None:
|
||||
if channel_name != "websocket" or not job.payload.to:
|
||||
return
|
||||
await bus.publish_outbound(OutboundMessage(
|
||||
channel=channel_name,
|
||||
chat_id=chat_id,
|
||||
content="",
|
||||
metadata={**job.payload.channel_meta, "_turn_end": True},
|
||||
))
|
||||
|
||||
try:
|
||||
resp = await agent.process_direct(
|
||||
reminder_note,
|
||||
session_key=f"cron:{job.id}",
|
||||
channel=channel_name,
|
||||
chat_id=chat_id,
|
||||
on_progress=_silent,
|
||||
on_stream=_on_stream if wants_stream else None,
|
||||
on_stream_end=_on_stream_end if wants_stream else None,
|
||||
)
|
||||
finally:
|
||||
if isinstance(cron_tool, CronTool) and cron_token is not None:
|
||||
cron_tool.reset_cron_context(cron_token)
|
||||
if isinstance(message_tool, MessageTool) and message_record_token is not None:
|
||||
message_tool.reset_record_channel_delivery(message_record_token)
|
||||
|
||||
response = resp.content if resp else ""
|
||||
|
||||
if job.payload.deliver and isinstance(message_tool, MessageTool) and message_tool._sent_in_turn:
|
||||
await _publish_turn_end_if_needed()
|
||||
return response
|
||||
|
||||
delivered = False
|
||||
if job.payload.deliver and job.payload.to and response:
|
||||
should_notify = await evaluate_response(
|
||||
response, reminder_note, agent.provider, agent.model,
|
||||
)
|
||||
if should_notify:
|
||||
meta = dict(job.payload.channel_meta)
|
||||
if wants_stream and stream_had_delta:
|
||||
await _publish_buffered_stream()
|
||||
meta["_streamed"] = True
|
||||
await _deliver_to_channel(
|
||||
OutboundMessage(
|
||||
channel=channel_name,
|
||||
chat_id=chat_id,
|
||||
content=response,
|
||||
metadata=meta,
|
||||
),
|
||||
record=True,
|
||||
session_key=job.payload.session_key,
|
||||
)
|
||||
delivered = True
|
||||
if delivered:
|
||||
await _publish_turn_end_if_needed()
|
||||
return response
|
||||
|
||||
cron.on_job = on_cron_job
|
||||
cron_executor = CronJobExecutor(
|
||||
agent=agent,
|
||||
bus=bus,
|
||||
deliver_to_channel=_deliver_to_channel,
|
||||
get_channel=_get_channel,
|
||||
)
|
||||
cron.on_job = cron_executor.run
|
||||
|
||||
# Create channel manager (forwards SessionManager so the WebSocket channel
|
||||
# can serve the embedded webui's REST surface).
|
||||
|
||||
231
nanobot/cron/executor.py
Normal file
231
nanobot/cron/executor.py
Normal file
@ -0,0 +1,231 @@
|
||||
"""Cron job execution for the gateway runtime."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import time
|
||||
from collections.abc import Awaitable, Callable
|
||||
from typing import Any, Protocol
|
||||
|
||||
from loguru import logger
|
||||
|
||||
import nanobot.utils.evaluator as evaluator
|
||||
from nanobot.agent.tools.cron import CronTool
|
||||
from nanobot.agent.tools.message import MessageTool
|
||||
from nanobot.bus.events import OutboundMessage
|
||||
from nanobot.bus.queue import MessageBus
|
||||
from nanobot.cron.types import CronJob
|
||||
|
||||
|
||||
class DeliverToChannel(Protocol):
|
||||
def __call__(
|
||||
self,
|
||||
msg: OutboundMessage,
|
||||
*,
|
||||
record: bool = False,
|
||||
session_key: str | None = None,
|
||||
) -> Awaitable[None]: ...
|
||||
|
||||
|
||||
ChannelLookup = Callable[[str], Any | None]
|
||||
|
||||
|
||||
class _CronStreamBuffer:
|
||||
def __init__(
|
||||
self,
|
||||
*,
|
||||
channel: str,
|
||||
chat_id: str,
|
||||
channel_meta: dict[str, Any],
|
||||
base_id: str,
|
||||
) -> None:
|
||||
self.channel = channel
|
||||
self.chat_id = chat_id
|
||||
self.channel_meta = channel_meta
|
||||
self.base_id = base_id
|
||||
self.segment = 0
|
||||
self.events: list[OutboundMessage] = []
|
||||
self.has_delta = False
|
||||
|
||||
def _stream_id(self) -> str:
|
||||
return f"{self.base_id}:{self.segment}"
|
||||
|
||||
async def on_stream(self, delta: str) -> None:
|
||||
meta = dict(self.channel_meta)
|
||||
meta["_stream_delta"] = True
|
||||
meta["_stream_id"] = self._stream_id()
|
||||
self.events.append(OutboundMessage(
|
||||
channel=self.channel,
|
||||
chat_id=self.chat_id,
|
||||
content=delta,
|
||||
metadata=meta,
|
||||
))
|
||||
if delta:
|
||||
self.has_delta = True
|
||||
|
||||
async def on_stream_end(self, *, resuming: bool = False) -> None:
|
||||
meta = dict(self.channel_meta)
|
||||
meta["_stream_end"] = True
|
||||
meta["_resuming"] = resuming
|
||||
meta["_stream_id"] = self._stream_id()
|
||||
self.events.append(OutboundMessage(
|
||||
channel=self.channel,
|
||||
chat_id=self.chat_id,
|
||||
content="",
|
||||
metadata=meta,
|
||||
))
|
||||
self.segment += 1
|
||||
|
||||
async def publish(self, bus: MessageBus) -> None:
|
||||
for event in self.events:
|
||||
await bus.publish_outbound(event)
|
||||
|
||||
|
||||
class CronJobExecutor:
|
||||
"""Runs scheduled cron jobs through the agent and optional channel delivery."""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
*,
|
||||
agent: Any,
|
||||
bus: MessageBus,
|
||||
deliver_to_channel: DeliverToChannel,
|
||||
get_channel: ChannelLookup | None = None,
|
||||
) -> None:
|
||||
self.agent = agent
|
||||
self.bus = bus
|
||||
self.deliver_to_channel = deliver_to_channel
|
||||
self.get_channel = get_channel or (lambda _channel: None)
|
||||
|
||||
async def run(self, job: CronJob) -> str | None:
|
||||
if job.name == "dream":
|
||||
try:
|
||||
await self.agent.dream.run()
|
||||
logger.info("Dream cron job completed")
|
||||
except Exception:
|
||||
logger.exception("Dream cron job failed")
|
||||
return None
|
||||
|
||||
return await self._run_agent_turn(job)
|
||||
|
||||
async def _run_agent_turn(self, job: CronJob) -> str | None:
|
||||
reminder_note = self._reminder_note(job)
|
||||
cron_tool = self._tool("cron")
|
||||
cron_token = None
|
||||
if isinstance(cron_tool, CronTool):
|
||||
cron_token = cron_tool.set_cron_context(True)
|
||||
|
||||
message_tool = self._tool("message")
|
||||
message_record_token = None
|
||||
if isinstance(message_tool, MessageTool):
|
||||
message_record_token = message_tool.set_record_channel_delivery(True)
|
||||
|
||||
channel_name = job.payload.channel or "cli"
|
||||
chat_id = job.payload.to or "direct"
|
||||
stream = self._stream_buffer(job, channel_name=channel_name, chat_id=chat_id)
|
||||
|
||||
try:
|
||||
resp = await self.agent.process_direct(
|
||||
reminder_note,
|
||||
session_key=f"cron:{job.id}",
|
||||
channel=channel_name,
|
||||
chat_id=chat_id,
|
||||
on_progress=self._silent,
|
||||
on_stream=stream.on_stream if stream else None,
|
||||
on_stream_end=stream.on_stream_end if stream else None,
|
||||
)
|
||||
finally:
|
||||
if isinstance(cron_tool, CronTool) and cron_token is not None:
|
||||
cron_tool.reset_cron_context(cron_token)
|
||||
if isinstance(message_tool, MessageTool) and message_record_token is not None:
|
||||
message_tool.reset_record_channel_delivery(message_record_token)
|
||||
|
||||
response = resp.content if resp else ""
|
||||
|
||||
if job.payload.deliver and isinstance(message_tool, MessageTool) and message_tool._sent_in_turn:
|
||||
await self._publish_turn_end_if_needed(job, channel_name=channel_name, chat_id=chat_id)
|
||||
return response
|
||||
|
||||
delivered = False
|
||||
if job.payload.deliver and job.payload.to and response:
|
||||
should_notify = await evaluator.evaluate_response(
|
||||
response, reminder_note, self.agent.provider, self.agent.model,
|
||||
)
|
||||
if should_notify:
|
||||
meta = dict(job.payload.channel_meta)
|
||||
if stream and stream.has_delta:
|
||||
await stream.publish(self.bus)
|
||||
meta["_streamed"] = True
|
||||
await self.deliver_to_channel(
|
||||
OutboundMessage(
|
||||
channel=channel_name,
|
||||
chat_id=chat_id,
|
||||
content=response,
|
||||
metadata=meta,
|
||||
),
|
||||
record=True,
|
||||
session_key=job.payload.session_key,
|
||||
)
|
||||
delivered = True
|
||||
|
||||
if delivered:
|
||||
await self._publish_turn_end_if_needed(job, channel_name=channel_name, chat_id=chat_id)
|
||||
return response
|
||||
|
||||
def _tool(self, name: str) -> Any | None:
|
||||
tools = getattr(self.agent, "tools", {})
|
||||
if hasattr(tools, "get"):
|
||||
return tools.get(name)
|
||||
return None
|
||||
|
||||
def _stream_buffer(
|
||||
self,
|
||||
job: CronJob,
|
||||
*,
|
||||
channel_name: str,
|
||||
chat_id: str,
|
||||
) -> _CronStreamBuffer | None:
|
||||
target_channel = self.get_channel(channel_name)
|
||||
wants_stream = bool(
|
||||
job.payload.deliver
|
||||
and job.payload.to
|
||||
and target_channel is not None
|
||||
and target_channel.supports_streaming
|
||||
)
|
||||
if not wants_stream:
|
||||
return None
|
||||
return _CronStreamBuffer(
|
||||
channel=channel_name,
|
||||
chat_id=chat_id,
|
||||
channel_meta=job.payload.channel_meta,
|
||||
base_id=f"cron:{job.id}:{time.time_ns()}",
|
||||
)
|
||||
|
||||
async def _publish_turn_end_if_needed(
|
||||
self,
|
||||
job: CronJob,
|
||||
*,
|
||||
channel_name: str,
|
||||
chat_id: str,
|
||||
) -> None:
|
||||
if channel_name != "websocket" or not job.payload.to:
|
||||
return
|
||||
await self.bus.publish_outbound(OutboundMessage(
|
||||
channel=channel_name,
|
||||
chat_id=chat_id,
|
||||
content="",
|
||||
metadata={**job.payload.channel_meta, "_turn_end": True},
|
||||
))
|
||||
|
||||
@staticmethod
|
||||
async def _silent(*_args: Any, **_kwargs: Any) -> None:
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def _reminder_note(job: CronJob) -> str:
|
||||
return (
|
||||
"The scheduled time has arrived. Deliver this reminder to the user now, "
|
||||
"as a brief and natural message in their language. Speak directly to them — "
|
||||
"do not narrate progress, summarize, include user IDs, or add status reports "
|
||||
"like 'Done' or 'Reminded'.\n\n"
|
||||
f"Reminder: {job.payload.message}"
|
||||
)
|
||||
Loading…
x
Reference in New Issue
Block a user