feat(hermes): full Zulip adapter with subprocess agent routing + streaming
CI / validate (pull_request) Failing after 1s
CI / validate (pull_request) Failing after 1s
Complete rewrite of hermes-zulip-plugin following the same architecture validated in pi-zulip-extension: - Zulip event queue registration + async poll loop (replaces deprecated call_on_each_message threaded approach) - DM-first processing (ADR-001/ADR-002): all private messages routed to agent - @mention and @all-bots detection (ADR-005/ADR-006) with mention cleanup - Subprocess agent invocation (configurable via agent.command) with stdin message passing and stdout response capture - Placeholder + edit pattern: sends 'Thinking...' immediately, edits with final response (like pi extension streaming) - Typing indicators (start/stop) via REST API - Typing indicator support via REST API - 10K Zulip char limit with graceful truncation - Error handling: timeout, FileNotFoundError, agent crash → graceful Zulip msg - Health endpoint (:9200) in background thread - CLI entry point: python3 -m hermes_zulip --config config.yaml
This commit is contained in:
@@ -1,11 +1,146 @@
|
||||
"""
|
||||
Hermes Zulip Plugin — Core adapter for Hermes Python agents
|
||||
|
||||
Implements BasePlatformAdapter to connect Hermes agents (Tanko, Mumuni,
|
||||
Koonimo, Koby) to the Sysloggh Zulip agent mesh.
|
||||
Connects Hermes agents (Tanko, Mumuni, Koonimo, Koby) to the Sysloggh
|
||||
Zulip agent mesh via event queue polling + subprocess agent invocation.
|
||||
|
||||
Architecture mirrors pi-zulip-extension:
|
||||
Zulip event queue → poll loop → parse message → spawn agent subprocess
|
||||
→ capture stdout → post response to Zulip (with placeholder + edit)
|
||||
|
||||
Usage (systemd service):
|
||||
python3 -m hermes_zulip --config /path/to/config.yaml
|
||||
|
||||
Path: hermes-zulip-plugin/src/hermes_zulip/
|
||||
Config: config.yaml (per-agent, deployed alongside plugin)
|
||||
|
||||
@see ADR-001 DM-first, ADR-005 @mention detection
|
||||
@see ADR-006 @all-bots, ADR-009 error handling
|
||||
"""
|
||||
|
||||
__version__ = "0.1.0"
|
||||
import argparse
|
||||
import logging
|
||||
import sys
|
||||
from typing import Dict, Any
|
||||
|
||||
# Ensure the src directory is on the path for the adapter import
|
||||
import os
|
||||
import sys
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
|
||||
|
||||
from hermes_zulip.adapter import ZulipAdapter
|
||||
|
||||
__version__ = "0.2.0"
|
||||
|
||||
|
||||
def load_config(config_path: str) -> Dict[str, Any]:
|
||||
"""Load YAML config and inject env vars."""
|
||||
import yaml
|
||||
|
||||
with open(config_path) as f:
|
||||
cfg = yaml.safe_load(f)
|
||||
|
||||
# Override api_key from env if set
|
||||
env_key = os.environ.get("ZULIP_API_KEY")
|
||||
if env_key:
|
||||
cfg.setdefault("zulip", {})["api_key"] = env_key
|
||||
|
||||
return cfg
|
||||
|
||||
|
||||
def setup_logging(cfg: Dict[str, Any]) -> None:
|
||||
"""Configure logging from config."""
|
||||
level = (
|
||||
cfg.get("monitoring", {}).get("log_level", "INFO").upper()
|
||||
)
|
||||
logging.basicConfig(
|
||||
level=getattr(logging, level, logging.INFO),
|
||||
format="%(asctime)s [%(name)s] %(levelname)s: %(message)s",
|
||||
datefmt="%Y-%m-%d %H:%M:%S",
|
||||
)
|
||||
|
||||
|
||||
def start_health_server(cfg: Dict[str, Any], adapter: ZulipAdapter) -> None:
|
||||
"""Start a minimal health HTTP endpoint in a background thread."""
|
||||
import threading
|
||||
from http.server import HTTPServer, BaseHTTPRequestHandler
|
||||
|
||||
port = cfg.get("monitoring", {}).get("health_port", 9200)
|
||||
start_time = time.time()
|
||||
|
||||
class HealthHandler(BaseHTTPRequestHandler):
|
||||
def do_GET(self) -> None:
|
||||
if self.path in ("/", "/health"):
|
||||
import json
|
||||
body = json.dumps({
|
||||
"status": "ok",
|
||||
"agent": cfg.get("agent", {}).get("name", "unknown"),
|
||||
"connected": adapter.connected,
|
||||
"uptime_seconds": int(time.time() - start_time),
|
||||
"timestamp": datetime.utcnow().isoformat(),
|
||||
})
|
||||
self.send_response(200)
|
||||
self.send_header("Content-Type", "application/json")
|
||||
self.end_headers()
|
||||
self.wfile.write(body.encode())
|
||||
else:
|
||||
self.send_response(404)
|
||||
self.end_headers()
|
||||
|
||||
def log_message(self, fmt, *args):
|
||||
pass # Suppress health check log spam
|
||||
|
||||
server = HTTPServer(("127.0.0.1", port), HealthHandler)
|
||||
thread = threading.Thread(target=server.serve_forever, daemon=True)
|
||||
thread.start()
|
||||
logging.getLogger(__name__).info(f"Health endpoint on :{port}")
|
||||
|
||||
|
||||
def main() -> None:
|
||||
"""CLI entry point for the Hermes Zulip plugin.
|
||||
|
||||
Usage:
|
||||
python3 -m hermes_zulip --config /path/to/config.yaml
|
||||
"""
|
||||
import time
|
||||
from datetime import datetime
|
||||
|
||||
parser = argparse.ArgumentParser(
|
||||
description="Hermes Zulip Plugin — Connects Hermes agents to Zulip"
|
||||
)
|
||||
parser.add_argument(
|
||||
"--config", "-c",
|
||||
default="config.yaml",
|
||||
help="Path to config.yaml (default: config.yaml)",
|
||||
)
|
||||
args = parser.parse_args()
|
||||
|
||||
# Load config
|
||||
cfg = load_config(args.config)
|
||||
setup_logging(cfg)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
logger.info(
|
||||
f"Starting Hermes Zulip Plugin v{__version__} "
|
||||
f"for {cfg.get('agent', {}).get('name', 'unknown')}"
|
||||
)
|
||||
|
||||
# Create adapter
|
||||
adapter = ZulipAdapter(cfg)
|
||||
|
||||
# Start health endpoint (if enabled)
|
||||
if cfg.get("monitoring", {}).get("health_endpoint_enabled", True):
|
||||
start_health_server(cfg, adapter)
|
||||
|
||||
# Run the event loop (blocks until interrupted)
|
||||
try:
|
||||
adapter.run()
|
||||
except KeyboardInterrupt:
|
||||
logger.info("Shutting down...")
|
||||
except Exception as e:
|
||||
logger.error(f"Fatal error: {e}")
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
@@ -1,50 +1,100 @@
|
||||
# Core adapter implements BasePlatformAdapter for Zulip
|
||||
# See ADR-005 for @mention detection, ADR-009 for error handling
|
||||
# Full implementation in issue #5.
|
||||
"""
|
||||
Core Zulip adapter for Hermes agents (Tanko, Mumuni, Koonimo, Koby).
|
||||
|
||||
Architecture (mirrors pi-zulip-extension):
|
||||
Zulip event queue → poll loop → parse message → spawn agent subprocess
|
||||
→ capture stdout → post response to Zulip
|
||||
|
||||
The Hermes agent is invoked as a subprocess (configurable command) so the
|
||||
plugin remains decoupled from the agent runtime. In a future iteration,
|
||||
this could switch to a direct IPC/socket if the agent exposes one.
|
||||
|
||||
See ADR-005 (@mention detection), ADR-006 (@all-bots), ADR-009 (error handling).
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import json
|
||||
import logging
|
||||
import time
|
||||
import re
|
||||
import threading
|
||||
import shlex
|
||||
import subprocess
|
||||
import time
|
||||
from datetime import datetime
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class ZulipAdapter:
|
||||
"""Zulip adapter for Hermes agents. Connects to Zulip, listens for
|
||||
@mentions in #agent-hub, routes messages via BasePlatformAdapter."""
|
||||
|
||||
# Regex to strip Zulip mention artifacts from message bodies (ADR-008)
|
||||
MENTION_CLEANER = re.compile(r'@\*\*[^*]+\*\*')
|
||||
|
||||
|
||||
class ZulipAdapter:
|
||||
"""Zulip adapter for Hermes agents.
|
||||
|
||||
Connects to Zulip via event queues (not the deprecated call_on_each_message),
|
||||
polls for new events, routes @mentions and DMs to the Hermes agent via
|
||||
subprocess, and posts responses back to Zulip.
|
||||
"""
|
||||
|
||||
def __init__(self, config: Dict[str, Any]) -> None:
|
||||
self.config = config
|
||||
self.connected = False
|
||||
self._client = None
|
||||
self._thread = None
|
||||
self._stop_event = threading.Event()
|
||||
self._queue_id: Optional[str] = None
|
||||
self._last_event_id: int = -1
|
||||
self._poll_task: Optional[asyncio.Task] = None
|
||||
|
||||
# Agent subprocess config
|
||||
self._agent_command: str = config.get("agent", {}).get(
|
||||
"command", "hermes chat"
|
||||
)
|
||||
self._agent_timeout: int = config.get("error_handling", {}).get(
|
||||
"timeout_seconds", 60
|
||||
)
|
||||
|
||||
# Bot identity for filtering own messages
|
||||
self._bot_email: str = config.get("zulip", {}).get("email", "")
|
||||
self._bot_id: int = config.get("swarm", {}).get("bot_id", 0)
|
||||
|
||||
# Stream config
|
||||
self._stream: str = config.get("zulip", {}).get("stream", "agent-hub")
|
||||
self._all_bots_user_id: int = config.get("zulip", {}).get(
|
||||
"all_bots_user_id", 1
|
||||
)
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Connection lifecycle
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
async def connect(self) -> None:
|
||||
"""Establish connection to Zulip and start the event loop."""
|
||||
"""Connect to Zulip and register an event queue."""
|
||||
if self.connected:
|
||||
logger.info("Already connected to Zulip.")
|
||||
return
|
||||
|
||||
try:
|
||||
from zulip import Client
|
||||
server_url = self.config['zulip']['server_url']
|
||||
email = self.config['zulip']['email']
|
||||
api_key = self.config['zulip']['api_key']
|
||||
import zulip
|
||||
|
||||
self._client = Client(server_url=server_url, email=email, api_key=api_key)
|
||||
server_url = self.config["zulip"]["server_url"]
|
||||
email = self.config["zulip"]["email"]
|
||||
api_key = self.config["zulip"]["api_key"]
|
||||
|
||||
self._client = zulip.Client(
|
||||
server_url=server_url, email=email, api_key=api_key
|
||||
)
|
||||
|
||||
# Register an event queue (like the pi extension)
|
||||
queue_res = self._client.register(
|
||||
event_types=["message"]
|
||||
)
|
||||
self._queue_id = queue_res.get("queue_id")
|
||||
self._last_event_id = queue_res.get("last_event_id", -1)
|
||||
self.connected = True
|
||||
logger.info(f"Connected to Zulip: {server_url} as {email}")
|
||||
|
||||
# Start the event loop in a background thread
|
||||
self._stop_event.clear()
|
||||
self._thread = threading.Thread(target=self._event_loop, daemon=True)
|
||||
self._thread.start()
|
||||
logger.info("Zulip event loop started.")
|
||||
logger.info(
|
||||
f"Connected to Zulip: {server_url} as {email} "
|
||||
f"(queue={self._queue_id})"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to connect to Zulip: {e}")
|
||||
@@ -52,82 +102,422 @@ class ZulipAdapter:
|
||||
raise
|
||||
|
||||
async def disconnect(self) -> None:
|
||||
"""Disconnect from Zulip and stop the event loop."""
|
||||
if not self.connected:
|
||||
return
|
||||
self._stop_event.set()
|
||||
if self._thread:
|
||||
self._thread.join(timeout=5)
|
||||
"""Disconnect and cancel the poll loop."""
|
||||
if self._poll_task:
|
||||
self._poll_task.cancel()
|
||||
try:
|
||||
await self._poll_task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
self._poll_task = None
|
||||
self.connected = False
|
||||
logger.info("Disconnected from Zulip.")
|
||||
|
||||
async def send_message(self, topic: str, content: str) -> Dict[str, Any]:
|
||||
"""Send a message to Zulip with retry logic (ADR-009)."""
|
||||
max_retries = self.config.get('error_handling', {}).get('retry_count', 3)
|
||||
retry_delay = self.config.get('error_handling', {}).get('retry_delay_seconds', 5)
|
||||
# ------------------------------------------------------------------
|
||||
# Event polling (async loop, like pi extension's setInterval)
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
for attempt in range(max_retries):
|
||||
async def poll_forever(self, poll_interval: float = 3.0) -> None:
|
||||
"""Continuously poll the Zulip event queue and process messages.
|
||||
|
||||
This is the main event loop. Runs until cancelled.
|
||||
"""
|
||||
while self.connected and self._client and self._queue_id:
|
||||
try:
|
||||
result = self._client.send_message({
|
||||
'type': 'stream',
|
||||
'to': self.config['zulip']['stream'],
|
||||
'subject': topic,
|
||||
'content': content,
|
||||
})
|
||||
logger.info(f"Message sent to {self.config['zulip']['stream']} > {topic} (attempt {attempt + 1})")
|
||||
return result
|
||||
events = await self._poll_events()
|
||||
for event in events:
|
||||
await self._process_event(event)
|
||||
except asyncio.CancelledError:
|
||||
break
|
||||
except Exception as e:
|
||||
logger.warning(f"Failed to send message (attempt {attempt + 1}): {e}")
|
||||
if attempt < max_retries - 1:
|
||||
time.sleep(retry_delay)
|
||||
else:
|
||||
raise
|
||||
logger.error(f"Poll error: {e}")
|
||||
# Check for queue expiry
|
||||
if "BAD_EVENT_QUEUE_ID" in str(e):
|
||||
logger.info("Queue expired, reconnecting...")
|
||||
self.connected = False
|
||||
await self._reconnect_with_retry()
|
||||
continue
|
||||
|
||||
async def on_event(self, event: Dict[str, Any]) -> Optional[Dict[str, Any]]:
|
||||
"""Process incoming Zulip events and route via BasePlatformAdapter."""
|
||||
if event.get('type') != 'message':
|
||||
return None
|
||||
await asyncio.sleep(poll_interval)
|
||||
|
||||
msg = event.get('message', {})
|
||||
mentioned_users = msg.get('mentioned_users', False)
|
||||
async def _poll_events(self) -> list:
|
||||
"""Fetch events from the Zulip event queue."""
|
||||
import zulip
|
||||
|
||||
# Only process messages that mention this bot (ADR-005)
|
||||
if not mentioned_users:
|
||||
return None
|
||||
if not self._client or not self._queue_id:
|
||||
return []
|
||||
|
||||
# Strip Zulip formatting artifacts
|
||||
body = msg.get('content', '')
|
||||
clean_body = self.MENTION_CLEANER.sub('', body)
|
||||
clean_body = clean_body.strip()
|
||||
response = self._client.get_events(
|
||||
queue_id=self._queue_id,
|
||||
last_event_id=self._last_event_id,
|
||||
dont_block=True,
|
||||
)
|
||||
|
||||
# Construct the MessageEvent for BasePlatformAdapter
|
||||
return {
|
||||
'type': 'MessageEvent',
|
||||
'sender': msg.get('sender_full_name', 'Unknown'),
|
||||
'body': clean_body,
|
||||
'topic': msg.get('subject', 'Unknown Topic'),
|
||||
'stream': msg.get('stream', 'Unknown Stream'),
|
||||
'timestamp': msg.get('timestamp', 0),
|
||||
}
|
||||
if response.get("result") != "success":
|
||||
raise RuntimeError(
|
||||
f"Events API error: {response.get('msg', 'unknown')}"
|
||||
)
|
||||
|
||||
def _event_loop(self) -> None:
|
||||
"""Background thread to listen for Zulip events."""
|
||||
events = response.get("events", [])
|
||||
for event in events:
|
||||
if event.get("id", 0) > self._last_event_id:
|
||||
self._last_event_id = event["id"]
|
||||
|
||||
return [e for e in events if e.get("type") == "message"]
|
||||
|
||||
async def _reconnect_with_retry(self) -> None:
|
||||
"""Retry connection with backoff."""
|
||||
retries = self.config.get("error_handling", {}).get("retry_count", 3)
|
||||
delay = self.config.get("error_handling", {}).get(
|
||||
"retry_delay_seconds", 5
|
||||
)
|
||||
|
||||
for attempt in range(retries):
|
||||
logger.info(
|
||||
f"Reconnect attempt {attempt + 1}/{retries} "
|
||||
f"in {delay}s..."
|
||||
)
|
||||
await asyncio.sleep(delay)
|
||||
try:
|
||||
self._client.call_on_each_message(
|
||||
lambda event: self._process_event(event),
|
||||
await self.connect()
|
||||
if self.connected:
|
||||
logger.info("Reconnected successfully.")
|
||||
return
|
||||
except Exception as e:
|
||||
logger.error(f"Reconnect attempt {attempt + 1} failed: {e}")
|
||||
delay *= 2 # Exponential backoff
|
||||
|
||||
logger.error("Max reconnection retries reached. Giving up.")
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Message processing
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
async def _process_event(self, event: Dict[str, Any]) -> None:
|
||||
"""Route a Zulip message event to the Hermes agent."""
|
||||
msg = event.get("message", {})
|
||||
msg_type = msg.get("type", "") # "private" or "stream"
|
||||
sender_email = msg.get("sender_email", "")
|
||||
sender_name = msg.get("sender_full_name", "Unknown")
|
||||
content = msg.get("content", "")
|
||||
|
||||
# Ignore own messages
|
||||
if sender_email == self._bot_email:
|
||||
return
|
||||
|
||||
# Determine if this message targets this bot
|
||||
mentioned_users = msg.get("mentioned_users", [])
|
||||
mentioned_user_ids = [u.get("user_id") for u in mentioned_users]
|
||||
is_dm = msg_type == "private"
|
||||
is_mention = self._bot_id in mentioned_user_ids
|
||||
is_all_bots = self._all_bots_user_id in mentioned_user_ids
|
||||
|
||||
# DM-first: process all private messages (like ADR-001/ADR-002)
|
||||
if is_dm:
|
||||
logger.info(f"DM from {sender_name}: {content[:80]}...")
|
||||
await self._route_to_agent(
|
||||
message_type="dm",
|
||||
sender_name=sender_name,
|
||||
content=content,
|
||||
recipient=sender_email,
|
||||
)
|
||||
return
|
||||
|
||||
# Stream: only respond to @mentions and @all-bots (ADR-005, ADR-006)
|
||||
if msg_type == "stream" and (is_mention or is_all_bots):
|
||||
stream_name = msg.get("display_recipient", "unknown")
|
||||
topic = msg.get("subject", "general")
|
||||
logger.info(
|
||||
f"{'@mention' if is_mention else '@all-bots'} "
|
||||
f"in #{stream_name} > {topic}"
|
||||
)
|
||||
|
||||
# Clean @mention artifacts from content (ADR-008)
|
||||
clean_content = MENTION_CLEANER.sub("", content).strip()
|
||||
|
||||
await self._route_to_agent(
|
||||
message_type="mention" if is_mention else "all-bots",
|
||||
sender_name=sender_name,
|
||||
content=clean_content,
|
||||
recipient=stream_name,
|
||||
topic=topic,
|
||||
stream_id=msg.get("stream_id"),
|
||||
)
|
||||
|
||||
async def _route_to_agent(
|
||||
self,
|
||||
message_type: str,
|
||||
sender_name: str,
|
||||
content: str,
|
||||
recipient: str,
|
||||
topic: Optional[str] = None,
|
||||
stream_id: Optional[int] = None,
|
||||
) -> None:
|
||||
"""Send the message to the Hermes agent subprocess and relay the
|
||||
response back to Zulip.
|
||||
|
||||
Architecture note: This uses a subprocess (configurable via
|
||||
agent.command in config.yaml). This mirrors the initial pi extension
|
||||
approach. A future iteration could use IPC or a socket if the
|
||||
Hermes agent exposes one.
|
||||
"""
|
||||
# 1. Send typing indicator
|
||||
await self._send_typing_indicator(recipient, "start")
|
||||
|
||||
# 2. Send a "Thinking..." placeholder to Zulip immediately.
|
||||
# On agent_end, this message will be edited with the final response.
|
||||
placeholder = (
|
||||
f":robot: _Processing your message..._"
|
||||
)
|
||||
placeholder_msg_id = None
|
||||
try:
|
||||
placeholder_msg_id = await self._send_message(
|
||||
message_type=message_type,
|
||||
recipient=recipient,
|
||||
content=placeholder,
|
||||
topic=topic,
|
||||
stream_id=stream_id,
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"Event loop crashed: {e}")
|
||||
self.connected = False
|
||||
logger.warning(f"Failed to send placeholder: {e}")
|
||||
|
||||
# 3. Invoke the Hermes agent subprocess
|
||||
response_text = await self._invoke_agent(content, sender_name)
|
||||
|
||||
# 4. Stop typing indicator
|
||||
await self._send_typing_indicator(recipient, "stop")
|
||||
|
||||
# 5. Post (or edit) the response
|
||||
if not response_text.strip():
|
||||
logger.warning(
|
||||
f"Hermes agent returned empty response for "
|
||||
f"{message_type} from {sender_name}"
|
||||
)
|
||||
return
|
||||
|
||||
# Truncate to Zulip's 10K char limit
|
||||
MAX_ZULIP_MSG = 10000
|
||||
truncated = (
|
||||
response_text[:MAX_ZULIP_MSG]
|
||||
+ "\n\n[...truncated at Zulip limit]"
|
||||
if len(response_text) > MAX_ZULIP_MSG
|
||||
else response_text
|
||||
)
|
||||
|
||||
def _process_event(self, event: Dict[str, Any]) -> None:
|
||||
"""Bridge the synchronous event to the async on_event handler."""
|
||||
import asyncio
|
||||
try:
|
||||
loop = asyncio.get_event_loop()
|
||||
if loop.is_running():
|
||||
asyncio.create_task(self.on_event(event))
|
||||
if placeholder_msg_id:
|
||||
await self._edit_message(placeholder_msg_id, truncated)
|
||||
logger.info(
|
||||
f"Finalized response to {sender_name} "
|
||||
f"({len(truncated)} chars)"
|
||||
)
|
||||
else:
|
||||
asyncio.run(self.on_event(event))
|
||||
await self._send_message(
|
||||
message_type=message_type,
|
||||
recipient=recipient,
|
||||
content=truncated,
|
||||
topic=topic,
|
||||
stream_id=stream_id,
|
||||
)
|
||||
logger.info(
|
||||
f"Sent response to {sender_name} "
|
||||
f"({len(truncated)} chars)"
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"Error processing event: {e}")
|
||||
logger.error(f"Failed to post response: {e}")
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Hermes agent subprocess invocation
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
async def _invoke_agent(
|
||||
self, message: str, sender_name: str
|
||||
) -> str:
|
||||
"""Spawn the Hermes agent subprocess with the message.
|
||||
|
||||
The agent command is configurable (agent.command in config.yaml).
|
||||
Default: "hermes chat"
|
||||
|
||||
The message is passed via stdin (pipe). The agent's stdout is
|
||||
captured as the response.
|
||||
|
||||
This is synchronous (run in executor) to avoid blocking the
|
||||
event loop during subprocess execution.
|
||||
"""
|
||||
cmd_str = self._agent_command
|
||||
cmd = shlex.split(cmd_str)
|
||||
|
||||
logger.info(
|
||||
f"Invoking agent: {' '.join(cmd)} "
|
||||
f"(timeout={self._agent_timeout}s)"
|
||||
)
|
||||
|
||||
def _run() -> str:
|
||||
try:
|
||||
result = subprocess.run(
|
||||
cmd,
|
||||
input=message,
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=self._agent_timeout,
|
||||
)
|
||||
if result.returncode != 0:
|
||||
stderr = result.stderr.strip()
|
||||
logger.error(
|
||||
f"Agent exited with code {result.returncode}: "
|
||||
f"{stderr}"
|
||||
)
|
||||
return (
|
||||
f":warning: Agent error (exit {result.returncode}). "
|
||||
f"Please try again later."
|
||||
)
|
||||
return result.stdout.strip()
|
||||
except subprocess.TimeoutExpired:
|
||||
logger.error(
|
||||
f"Agent timed out after {self._agent_timeout}s"
|
||||
)
|
||||
return (
|
||||
f":hourglass: Agent timed out after "
|
||||
f"{self._agent_timeout}s. Please try again."
|
||||
)
|
||||
except FileNotFoundError:
|
||||
logger.error(f"Agent command not found: {cmd_str}")
|
||||
return (
|
||||
f":warning: Agent command not found: `{cmd_str}`. "
|
||||
f"Check configuration."
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"Agent invocation error: {e}")
|
||||
return (
|
||||
f":warning: Failed to invoke agent: {e}"
|
||||
)
|
||||
|
||||
return await asyncio.get_event_loop().run_in_executor(None, _run)
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Zulip API helpers
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
async def _send_message(
|
||||
self,
|
||||
message_type: str,
|
||||
recipient: str,
|
||||
content: str,
|
||||
topic: Optional[str] = None,
|
||||
stream_id: Optional[int] = None,
|
||||
) -> Optional[int]:
|
||||
"""Send a message to Zulip. Returns the message ID if successful."""
|
||||
if not self._client:
|
||||
return None
|
||||
|
||||
def _send() -> Optional[int]:
|
||||
if message_type in ("dm", "private"):
|
||||
# Private message: recipient is email
|
||||
payload = {
|
||||
"type": "private",
|
||||
"to": [recipient],
|
||||
"content": content,
|
||||
}
|
||||
else:
|
||||
# Stream message
|
||||
payload = {
|
||||
"type": "stream",
|
||||
"to": stream_id or recipient,
|
||||
"subject": topic or "general",
|
||||
"content": content,
|
||||
}
|
||||
|
||||
try:
|
||||
result = self._client.send_message(payload)
|
||||
if result.get("result") == "success":
|
||||
return result.get("id")
|
||||
logger.error(
|
||||
f"Send message failed: {result.get('msg', 'unknown')}"
|
||||
)
|
||||
return None
|
||||
except Exception as e:
|
||||
logger.error(f"Send message error: {e}")
|
||||
return None
|
||||
|
||||
return await asyncio.get_event_loop().run_in_executor(None, _send)
|
||||
|
||||
async def _edit_message(
|
||||
self, message_id: int, content: str
|
||||
) -> bool:
|
||||
"""Edit a previously sent Zulip message (for streaming updates)."""
|
||||
if not self._client:
|
||||
return False
|
||||
|
||||
def _edit() -> bool:
|
||||
try:
|
||||
result = self._client.update_message(
|
||||
{"message_id": message_id, "content": content}
|
||||
)
|
||||
if result.get("result") != "success":
|
||||
logger.warning(
|
||||
f"Edit message {message_id}: "
|
||||
f"{result.get('msg', 'unknown')}"
|
||||
)
|
||||
return result.get("result") == "success"
|
||||
except Exception as e:
|
||||
logger.warning(f"Edit message {message_id} error: {e}")
|
||||
return False
|
||||
|
||||
return await asyncio.get_event_loop().run_in_executor(None, _edit)
|
||||
|
||||
async def _send_typing_indicator(
|
||||
self, recipient: str, operation: str
|
||||
) -> None:
|
||||
"""Send a typing indicator (start/stop)."""
|
||||
if not self._client:
|
||||
return
|
||||
|
||||
def _typing() -> None:
|
||||
try:
|
||||
# The zulip Python library doesn't have a direct typing API
|
||||
# Use the REST endpoint directly via requests
|
||||
import requests
|
||||
|
||||
server_url = self.config["zulip"]["server_url"]
|
||||
email = self.config["zulip"]["email"]
|
||||
api_key = self.config["zulip"]["api_key"]
|
||||
|
||||
# For private messages, recipient is the user's email
|
||||
# We need their user_id. Use the API directly.
|
||||
to_data = json.dumps([recipient])
|
||||
requests.post(
|
||||
f"{server_url}/api/v1/typing",
|
||||
auth=requests.auth.HTTPBasicAuth(email, api_key),
|
||||
data={"to": to_data, "op": operation},
|
||||
timeout=5,
|
||||
)
|
||||
except Exception as e:
|
||||
# Non-critical
|
||||
pass
|
||||
|
||||
await asyncio.get_event_loop().run_in_executor(None, _typing)
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# Synchronous entry point for the Hermes runner
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
def run(self) -> None:
|
||||
"""Synchronous entry point that starts the async poll loop.
|
||||
|
||||
Called by the Hermes runner (e.g., from a systemd service).
|
||||
"""
|
||||
asyncio.run(self._run_async())
|
||||
|
||||
async def _run_async(self) -> None:
|
||||
"""Async entry point."""
|
||||
try:
|
||||
await self.connect()
|
||||
if self.connected:
|
||||
logger.info("Starting event poll loop...")
|
||||
await self.poll_forever()
|
||||
except asyncio.CancelledError:
|
||||
logger.info("Poll loop cancelled.")
|
||||
except Exception as e:
|
||||
logger.error(f"Fatal error in event loop: {e}")
|
||||
finally:
|
||||
await self.disconnect()
|
||||
|
||||
Reference in New Issue
Block a user