Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f7047eb429 | |||
| 67160b2de0 | |||
| 4eaa21f20c |
@@ -5,6 +5,42 @@ All notable changes to Hermes Relay will be documented in this file.
|
|||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [3.3.0] - 2026-08-16
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- **HTTP-only response by default:** `/ask` now returns the answer only to its HTTP caller. Relay responses are no longer delivered to Telegram automatically.
|
||||||
|
- **Explicit opt-in for Telegram:** set `HERMES_RELAY_TELEGRAM_DELIVERY_ENABLED=true` only when asynchronous Telegram delivery is wanted. `telegram_queued` and `/health` now expose the active delivery state.
|
||||||
|
- **Hermes import compatibility:** auto-detect the Hermes Git-checkout layout as well as the former virtualenv site-packages layout.
|
||||||
|
|
||||||
|
## [3.2.0] - 2026-07-20
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **HTTP latency:** Telegram delivery is now queued in a background task. `/ask` returns after the LLM response instead of waiting another ~5–6 seconds for `hermes send`.
|
||||||
|
- **Shared-agent concurrency:** model calls are serialized with an async lock. The warm Hermes agent mutates message state and is not safe for concurrent calls.
|
||||||
|
- **Timeout enforcement:** `HERMES_RELAY_TIMEOUT` now covers queueing plus the model call and returns HTTP `504` on expiry.
|
||||||
|
- **Accurate API metrics:** `elapsed_seconds` / `llm_elapsed_seconds` report model duration, and `request_elapsed_seconds` reports actual HTTP duration. `telegram_queued` replaces the misleading synchronous `telegram_sent` result.
|
||||||
|
- **Toolset warning:** default relay toolsets are empty; Telegram delivery uses `hermes send` and does not require a `messaging` toolset.
|
||||||
|
- **Health semantics/version:** unified version reporting at 3.2.0 and clarified that detailed health checks local agent state rather than performing an LLM probe.
|
||||||
|
|
||||||
|
### Removed
|
||||||
|
- Unused `httpx` HTTP/2 client, disk cache and related dependencies. Telegram delivery is performed by the Hermes CLI subprocess, not this client.
|
||||||
|
|
||||||
|
## [3.1.0] - 2026-07-15
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **Telegram delivery**: Replaced broken `send_message_tool` import with `hermes send` CLI subprocess
|
||||||
|
- Root cause: `_ensure_gw_config()` clobbered `TELEGRAM_BOT_TOKEN` env var before `load_gateway_config()` could read it from `.env`
|
||||||
|
- Fix: `subprocess.run(['hermes', 'send', '--to', 'telegram', '--quiet', text])` — robust, no import hacks
|
||||||
|
- Token must be in `~/.hermes/.env` (not masked `***`); systemd drop-in as backup
|
||||||
|
|
||||||
|
### Removed
|
||||||
|
- `CircuitBreaker` class and `_tg_circuit_breaker` instance (unused after Telegram delivery refactor)
|
||||||
|
- `_ensure_gw_config()` function and associated globals `_gw_config_loaded`, `_gw_config`
|
||||||
|
- `tenacity` import (no longer needed)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Docstring: v3 -> v3.1, fixed Unicode characters
|
||||||
|
|
||||||
## [3.0.0] - 2026-06-16
|
## [3.0.0] - 2026-06-16
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -1,75 +1,98 @@
|
|||||||
# Hermes Relay
|
# Hermes Relay v3.3
|
||||||
|
|
||||||
Flask bridge tussen Node-RED en Hermes Agent.
|
Snelle Quart-bridge tussen Node-RED en een warme Hermes Agent.
|
||||||
|
|
||||||
## Architectuur
|
```text
|
||||||
|
Node-RED ──POST /ask──▶ Quart relay ──serialized call──▶ warme Hermes-agent
|
||||||
|
│
|
||||||
|
└── JSON direct terug naar Node-RED
|
||||||
|
|
||||||
|
Optioneel: Telegram-bezorging via `hermes send` (standaard uit)
|
||||||
```
|
```
|
||||||
Node-RED (192.168.1.125) ──POST /ask──▶ Hermes Relay (192.168.1.74:8650)
|
|
||||||
│
|
## Gedrag en grenzen
|
||||||
├──▶ hermes chat -q (subprocess)
|
|
||||||
│ │
|
- **Warme agent:** Hermes wordt tijdens startup geladen/geïnitialiseerd.
|
||||||
│ ▼
|
- **Veilige concurrency:** de gedeelde, mutable agent verwerkt precies één LLM-call tegelijk. Overige HTTP-verzoeken wachten in de queue; ze kunnen niet elkaars `messages` resetten.
|
||||||
│ JSON response ──▶ Node-RED
|
- **Timeout:** `HERMES_RELAY_TIMEOUT` (standaard 120 s) omvat wachttijd plus LLM-call. Een timeout retourneert HTTP `504`.
|
||||||
│
|
- **Snelle response:** Een succesvolle `/ask` reageert zodra het model antwoordt.
|
||||||
└──▶ hermes send --to telegram
|
- **Geen chatbezorging standaard:** relay-antwoorden blijven in de HTTP-response en verschijnen dus niet in Telegram.
|
||||||
│
|
- **Optionele Telegram-bezorging:** alleen met `HERMES_RELAY_TELEGRAM_DELIVERY_ENABLED=true` wordt het antwoord asynchroon via `hermes send` bezorgd. Bij een gecontroleerde shutdown wacht de service op lopende bezorgingen.
|
||||||
▼
|
|
||||||
Telegram chat
|
|
||||||
```
|
|
||||||
|
|
||||||
## Endpoints
|
## Endpoints
|
||||||
|
|
||||||
### `POST /ask`
|
### `POST /ask`
|
||||||
Verwacht JSON body:
|
|
||||||
|
JSON body:
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{ "payload": "Wat is het weer in Best?" }
|
{ "payload": "Wat is het weer in Best?" }
|
||||||
```
|
```
|
||||||
|
|
||||||
Response:
|
Succesresponse:
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"status": "ok",
|
"status": "ok",
|
||||||
"answer": "Het is 22°C en zonnig in Best...",
|
"answer": "...",
|
||||||
"elapsed_seconds": 8.3,
|
"elapsed_seconds": 6.213,
|
||||||
"telegram_sent": true
|
"llm_elapsed_seconds": 6.213,
|
||||||
|
"request_elapsed_seconds": 6.214,
|
||||||
|
"telegram_queued": false
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
### `GET /health`
|
`elapsed_seconds` blijft aanwezig voor compatibiliteit en is de LLM-duur. `request_elapsed_seconds` is de feitelijke HTTP-duur. `telegram_queued` is standaard `false`; bij expliciet ingeschakelde Telegram-bezorging betekent `true` dat de achtergrondtaak is ingepland. Raadpleeg dan journald voor het uiteindelijke bezorgresultaat.
|
||||||
Health check voor monitoring.
|
|
||||||
|
|
||||||
## Setup
|
Fouten: `400` lege payload, `413` payload groter dan limiet, `504` timeout, `502` onverwachte agentfout.
|
||||||
|
|
||||||
|
### `GET /health`
|
||||||
|
|
||||||
|
Geeft service-status, versie en het aantal lopende Telegram-bezorgingen terug.
|
||||||
|
|
||||||
|
- `/health?detail=true` voegt de **lokale agent-state** toe; dit doet bewust geen dure LLM/provider-call.
|
||||||
|
|
||||||
|
## Configuratie
|
||||||
|
|
||||||
|
| Variabele | Standaard | Betekenis |
|
||||||
|
|---|---:|---|
|
||||||
|
| `HERMES_RELAY_TIMEOUT` | `120` | Max. wachttijd + modelcall per HTTP-request |
|
||||||
|
| `HERMES_RELAY_TELEGRAM_DELIVERY_ENABLED` | `false` | Zet alleen op `true` voor asynchrone Telegram-bezorging |
|
||||||
|
| `HERMES_RELAY_DELIVERY_WORKERS` | `2` | Begrensde workers voor Telegram-bezorging als die is ingeschakeld |
|
||||||
|
| `HERMES_RELAY_MAX_PAYLOAD_CHARS` | `12000` | Maximale lengte van `payload` |
|
||||||
|
| `HERMES_RELAY_MAX_TURNS` | `10` | Agent turn-budget |
|
||||||
|
| `HERMES_RELAY_MODEL` | profieldefault | Optionele modelovertuiging |
|
||||||
|
| `HERMES_RELAY_TOOLSETS` | leeg | Alleen invullen met geldige benodigde toolsets |
|
||||||
|
|
||||||
|
De relay leest zijn Hermes-config via profiel `voice-assistant`. Pas model/provider/config aan en herstart daarna de service:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd /root/hermes-relay
|
systemctl restart hermes-relay
|
||||||
python3 -m venv venv
|
|
||||||
source venv/bin/activate
|
|
||||||
pip install -r requirements.txt
|
|
||||||
|
|
||||||
# Test
|
|
||||||
python app.py
|
|
||||||
|
|
||||||
# Of als service
|
|
||||||
sudo systemctl enable hermes-relay
|
|
||||||
sudo systemctl start hermes-relay
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## Node-RED Nodes
|
## Testen
|
||||||
|
|
||||||
### Versturen (HTTP Request node)
|
```bash
|
||||||
- **Method:** POST
|
curl -s http://127.0.0.1:8650/health
|
||||||
|
curl -s -X POST http://127.0.0.1:8650/ask \
|
||||||
|
-H 'Content-Type: application/json' \
|
||||||
|
-d '{"payload":"Zeg alleen hoi"}'
|
||||||
|
|
||||||
|
journalctl -u hermes-relay -f
|
||||||
|
```
|
||||||
|
|
||||||
|
## Node-RED
|
||||||
|
|
||||||
|
Gebruik een HTTP Request-node:
|
||||||
|
|
||||||
|
- **Method:** `POST`
|
||||||
- **URL:** `http://192.168.1.74:8650/ask`
|
- **URL:** `http://192.168.1.74:8650/ask`
|
||||||
- **Return:** a parsed JSON object
|
- **Return:** parsed JSON
|
||||||
- **Timeout:** 120000 (ms) — Hermes kan even duren
|
- **Timeout:** `120000` ms
|
||||||
|
|
||||||
### Ontvangen
|
Voorafgaande Function-node:
|
||||||
Het antwoord komt terug als `msg.payload`:
|
|
||||||
- `msg.payload.answer` — het Hermes antwoord
|
|
||||||
- `msg.payload.elapsed_seconds` — hoe lang het duurde
|
|
||||||
- `msg.payload.telegram_sent` — of het ook naar Telegram is gestuurd
|
|
||||||
- `msg.payload.status` — "ok" of "error"
|
|
||||||
|
|
||||||
### Health check (optioneel)
|
```javascript
|
||||||
- **Method:** GET
|
msg.payload = { payload: msg.payload };
|
||||||
- **URL:** `http://192.168.1.74:8650/health`
|
return msg;
|
||||||
|
```
|
||||||
|
|||||||
@@ -1,51 +1,35 @@
|
|||||||
"""
|
"""Hermes Relay v3.2 — fast, bounded Quart bridge for Node-RED."""
|
||||||
Hermes Relay v3.1 - Quart (async) bridge tussen Node-RED en Hermes Agent.
|
|
||||||
|
|
||||||
Gebruikt de voice-assistant profiel (minimale chatbot, max_turns=10).
|
|
||||||
Geen prefix/model override nodig, profiel handelt dit af.
|
|
||||||
|
|
||||||
Node-RED stuurt POST met msg.payload -> Hermes (direct) -> Alleen antwoord terug.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
import logging
|
|
||||||
import json
|
|
||||||
import asyncio
|
import asyncio
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import signal
|
import sys
|
||||||
|
import threading
|
||||||
|
import time
|
||||||
from concurrent.futures import ThreadPoolExecutor
|
from concurrent.futures import ThreadPoolExecutor
|
||||||
from functools import wraps
|
from typing import Set
|
||||||
from typing import Optional, Callable, Any
|
|
||||||
|
|
||||||
# ── Hermes path toevoegen (zodat we Hermes direct kunnen importeren) ───
|
_HERMES_SITE = os.environ.get(
|
||||||
_HERMES_SITE = os.environ.get("HERMES_RELAY_SITE_PACKAGES", "/usr/local/lib/hermes-agent/venv/lib/python3.11/site-packages")
|
"HERMES_RELAY_SITE_PACKAGES",
|
||||||
|
"/usr/local/lib/hermes-agent/venv/lib/python3.11/site-packages",
|
||||||
|
)
|
||||||
if _HERMES_SITE not in sys.path:
|
if _HERMES_SITE not in sys.path:
|
||||||
sys.path.insert(0, _HERMES_SITE)
|
sys.path.insert(0, _HERMES_SITE)
|
||||||
|
|
||||||
from quart import Quart, request, jsonify
|
from quart import Quart, jsonify, request
|
||||||
|
|
||||||
# ── Third-party optimizations ───────────────────────────────────────────
|
VERSION = "3.3.0"
|
||||||
import httpx
|
TIMEOUT = int(os.environ.get("HERMES_RELAY_TIMEOUT", "120"))
|
||||||
import diskcache
|
TG_TARGET = os.environ.get("HERMES_RELAY_TELEGRAM_TARGET", "telegram")
|
||||||
|
DELIVERY_WORKERS = int(os.environ.get("HERMES_RELAY_DELIVERY_WORKERS", "2"))
|
||||||
|
MAX_PAYLOAD_CHARS = int(os.environ.get("HERMES_RELAY_MAX_PAYLOAD_CHARS", "12000"))
|
||||||
|
# HTTP replies are the default. Set this explicitly to true only when relay
|
||||||
|
# answers should additionally be delivered through Telegram.
|
||||||
|
TELEGRAM_DELIVERY_ENABLED = os.environ.get(
|
||||||
|
"HERMES_RELAY_TELEGRAM_DELIVERY_ENABLED", "false"
|
||||||
|
).strip().lower() in {"1", "true", "yes", "on"}
|
||||||
|
|
||||||
# ── Config ──────────────────────────────────────────────────────────────
|
|
||||||
TIMEOUT = int(os.environ.get("HERMES_RELAY_TIMEOUT", "120")) # max seconden voor Hermes query
|
|
||||||
TG_TARGET = os.environ.get("HERMES_RELAY_TELEGRAM_TARGET", "telegram") # hermes send target
|
|
||||||
|
|
||||||
# Thread pool config - increased for better concurrency
|
|
||||||
THREAD_POOL_WORKERS = int(os.environ.get("HERMES_RELAY_THREAD_WORKERS", "8"))
|
|
||||||
|
|
||||||
# Cache config
|
|
||||||
CACHE_DIR = os.environ.get("HERMES_RELAY_CACHE_DIR", "/tmp/hermes-relay-cache")
|
|
||||||
CACHE_TTL = int(os.environ.get("HERMES_RELAY_CACHE_TTL", "300")) # 5 minuten default
|
|
||||||
|
|
||||||
# HTTP client config for Telegram
|
|
||||||
HTTP_CLIENT_TIMEOUT = httpx.Timeout(10.0, connect=5.0)
|
|
||||||
HTTP_CLIENT_LIMITS = httpx.Limits(max_keepalive_connections=10, max_connections=20)
|
|
||||||
|
|
||||||
# ── Logging ─────────────────────────────────────────────────────────────
|
|
||||||
logging.basicConfig(
|
logging.basicConfig(
|
||||||
level=logging.INFO,
|
level=logging.INFO,
|
||||||
format="[hermes-relay] %(asctime)s %(levelname)s %(message)s",
|
format="[hermes-relay] %(asctime)s %(levelname)s %(message)s",
|
||||||
@@ -53,129 +37,91 @@ logging.basicConfig(
|
|||||||
)
|
)
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
# ── Quart app ───────────────────────────────────────────────────────────
|
|
||||||
app = Quart(__name__)
|
app = Quart(__name__)
|
||||||
|
|
||||||
# Thread pool for running sync Hermes agent calls
|
# HermesCLI/AIAgent is mutable (messages are reset per request), so it must not
|
||||||
_executor = ThreadPoolExecutor(max_workers=THREAD_POOL_WORKERS)
|
# be called concurrently. Delivery uses a separate, bounded executor instead.
|
||||||
|
_hermes_lock: asyncio.Lock | None = None
|
||||||
|
_delivery_executor = ThreadPoolExecutor(
|
||||||
|
max_workers=DELIVERY_WORKERS, thread_name_prefix="telegram-delivery"
|
||||||
|
)
|
||||||
|
_delivery_tasks: Set[asyncio.Task] = set()
|
||||||
|
|
||||||
# HTTP client with connection pooling for Telegram
|
|
||||||
_http_client: Optional[httpx.AsyncClient] = None
|
|
||||||
|
|
||||||
# Disk cache for health checks and other reusable data
|
|
||||||
_cache = diskcache.Cache(CACHE_DIR, timeout=5)
|
|
||||||
|
|
||||||
# ── Hermes warm houden ──────────────────────────────────────────────────
|
|
||||||
from hermes_client import call_hermes as _hermes_query
|
from hermes_client import call_hermes as _hermes_query
|
||||||
from hermes_client import _ensure_hermes_loaded, _initialize_agent
|
from hermes_client import _ensure_hermes_loaded, _initialize_agent
|
||||||
|
|
||||||
# Pre-warm the agent on startup (non-blocking)
|
|
||||||
import threading
|
|
||||||
|
|
||||||
def _prewarm_agent():
|
def _prewarm_agent() -> None:
|
||||||
"""Pre-initialize Hermes agent in background so first request is fast."""
|
"""Initialize the agent before the first request without blocking startup."""
|
||||||
try:
|
try:
|
||||||
_ensure_hermes_loaded()
|
_ensure_hermes_loaded()
|
||||||
_initialize_agent()
|
_initialize_agent()
|
||||||
logger.info("Hermes agent pre-warmed successfully")
|
logger.info("Hermes agent pre-warmed successfully")
|
||||||
except Exception as e:
|
except Exception:
|
||||||
logger.error("Hermes agent pre-warm failed: %s", e, exc_info=True)
|
logger.exception("Hermes agent pre-warm failed")
|
||||||
|
|
||||||
|
|
||||||
_prewarm_thread = threading.Thread(target=_prewarm_agent, daemon=True)
|
_prewarm_thread = threading.Thread(target=_prewarm_agent, daemon=True)
|
||||||
_prewarm_thread.start()
|
_prewarm_thread.start()
|
||||||
|
|
||||||
async def _get_http_client() -> httpx.AsyncClient:
|
|
||||||
"""Get or create the shared HTTP client with connection pooling."""
|
|
||||||
global _http_client
|
|
||||||
if _http_client is None or _http_client.is_closed:
|
|
||||||
_http_client = httpx.AsyncClient(
|
|
||||||
timeout=HTTP_CLIENT_TIMEOUT,
|
|
||||||
limits=HTTP_CLIENT_LIMITS,
|
|
||||||
http2=True, # Enable HTTP/2 for better performance
|
|
||||||
)
|
|
||||||
return _http_client
|
|
||||||
|
|
||||||
|
def _send_telegram_sync(text: str) -> bool:
|
||||||
async def _close_http_client():
|
"""Send through Hermes CLI. This deliberately runs outside the request path."""
|
||||||
"""Close the HTTP client on shutdown."""
|
|
||||||
global _http_client
|
|
||||||
if _http_client and not _http_client.is_closed:
|
|
||||||
await _http_client.aclose()
|
|
||||||
_http_client = None
|
|
||||||
|
|
||||||
|
|
||||||
def cached(ttl: int = CACHE_TTL):
|
|
||||||
"""Decorator for caching function results in diskcache."""
|
|
||||||
def decorator(func: Callable) -> Callable:
|
|
||||||
@wraps(func)
|
|
||||||
async def wrapper(*args, **kwargs):
|
|
||||||
# Create cache key from function name and arguments
|
|
||||||
key_parts = [func.__name__]
|
|
||||||
key_parts.extend(str(arg) for arg in args)
|
|
||||||
key_parts.extend(f"{k}={v}" for k, v in sorted(kwargs.items()))
|
|
||||||
cache_key = ":".join(key_parts)
|
|
||||||
|
|
||||||
# Try to get from cache
|
|
||||||
cached_result = _cache.get(cache_key)
|
|
||||||
if cached_result is not None:
|
|
||||||
logger.debug("Cache hit for %s", cache_key)
|
|
||||||
return cached_result
|
|
||||||
|
|
||||||
# Call function and cache result
|
|
||||||
result = await func(*args, **kwargs)
|
|
||||||
_cache.set(cache_key, result, expire=ttl)
|
|
||||||
logger.debug("Cache set for %s", cache_key)
|
|
||||||
return result
|
|
||||||
return wrapper
|
|
||||||
return decorator
|
|
||||||
|
|
||||||
|
|
||||||
async def send_telegram(text: str) -> bool:
|
|
||||||
"""Stuur bericht via hermes send CLI (snel & robuust)."""
|
|
||||||
try:
|
try:
|
||||||
logger.info("Telegram send: starting via hermes send CLI...")
|
logger.info("Telegram send: starting via hermes send CLI")
|
||||||
result = subprocess.run(
|
result = subprocess.run(
|
||||||
[
|
[
|
||||||
"/usr/local/lib/hermes-agent/venv/bin/hermes", "send",
|
"/usr/local/lib/hermes-agent/venv/bin/hermes",
|
||||||
"--to", TG_TARGET,
|
"send",
|
||||||
|
"--to",
|
||||||
|
TG_TARGET,
|
||||||
"--quiet",
|
"--quiet",
|
||||||
text,
|
text,
|
||||||
],
|
],
|
||||||
capture_output=True,
|
capture_output=True,
|
||||||
text=True,
|
text=True,
|
||||||
timeout=15,
|
timeout=30,
|
||||||
env={**os.environ, "HERMES_HOME": "/root/.hermes"},
|
env={**os.environ, "HERMES_HOME": "/root/.hermes"},
|
||||||
)
|
)
|
||||||
if result.returncode == 0:
|
if result.returncode == 0:
|
||||||
logger.info("Telegram send: success")
|
logger.info("Telegram send: success")
|
||||||
return True
|
return True
|
||||||
else:
|
logger.error("Telegram send failed (rc=%d): %s", result.returncode, result.stderr.strip()[:300])
|
||||||
stderr = result.stderr.strip()
|
|
||||||
# "Skipped" message (cron detection false positive) is not a failure
|
|
||||||
if "skipped" in stderr.lower() or "cron" in stderr.lower():
|
|
||||||
logger.info("Telegram send: skipped by hermes send (non-fatal)")
|
|
||||||
return True
|
|
||||||
logger.error("Telegram send failed: %s", stderr[:200])
|
|
||||||
return False
|
|
||||||
except subprocess.TimeoutExpired:
|
except subprocess.TimeoutExpired:
|
||||||
logger.error("Telegram send: timeout")
|
logger.error("Telegram send: timeout")
|
||||||
return False
|
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
logger.error("Telegram send: hermes binary not found")
|
logger.error("Telegram send: hermes binary not found")
|
||||||
return False
|
except Exception:
|
||||||
except Exception as e:
|
logger.exception("Telegram send failed")
|
||||||
logger.error("Telegram send failed with exception: %s", e)
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
# ── Routes ──────────────────────────────────────────────────────────────
|
async def _deliver_in_background(text: str) -> None:
|
||||||
|
loop = asyncio.get_running_loop()
|
||||||
|
await loop.run_in_executor(_delivery_executor, _send_telegram_sync, text)
|
||||||
|
|
||||||
|
|
||||||
|
def _track_delivery(task: asyncio.Task) -> None:
|
||||||
|
_delivery_tasks.discard(task)
|
||||||
|
try:
|
||||||
|
task.result()
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
logger.warning("Telegram delivery cancelled during shutdown")
|
||||||
|
except Exception:
|
||||||
|
logger.exception("Unexpected Telegram delivery task failure")
|
||||||
|
|
||||||
|
|
||||||
|
def _queue_telegram(text: str) -> None:
|
||||||
|
task = asyncio.create_task(_deliver_in_background(text), name="hermes-relay-telegram")
|
||||||
|
_delivery_tasks.add(task)
|
||||||
|
task.add_done_callback(_track_delivery)
|
||||||
|
|
||||||
|
|
||||||
@app.route("/ask", methods=["POST"])
|
@app.route("/ask", methods=["POST"])
|
||||||
async def ask():
|
async def ask():
|
||||||
"""Main relay endpoint -- retourneert alleen het antwoord."""
|
"""Answer a request; optional Telegram delivery stays outside the HTTP path."""
|
||||||
start = time.time()
|
request_started = time.perf_counter()
|
||||||
|
|
||||||
# Parse input
|
|
||||||
if request.is_json:
|
if request.is_json:
|
||||||
data = await request.get_json(silent=True) or {}
|
data = await request.get_json(silent=True) or {}
|
||||||
prompt = data.get("payload", "")
|
prompt = data.get("payload", "")
|
||||||
@@ -183,98 +129,99 @@ async def ask():
|
|||||||
form = await request.form
|
form = await request.form
|
||||||
prompt = form.get("payload", "")
|
prompt = form.get("payload", "")
|
||||||
|
|
||||||
if not prompt:
|
if not isinstance(prompt, str) or not prompt.strip():
|
||||||
return jsonify({"status": "error", "message": "No payload received"}), 400
|
return jsonify({"status": "error", "message": "No payload received"}), 400
|
||||||
|
if len(prompt) > MAX_PAYLOAD_CHARS:
|
||||||
|
return jsonify({"status": "error", "message": f"Payload exceeds {MAX_PAYLOAD_CHARS} characters"}), 413
|
||||||
|
|
||||||
logger.info("Received: %s...", prompt[:100])
|
logger.info("Received: %s...", prompt[:100])
|
||||||
|
lock = _hermes_lock
|
||||||
|
if lock is None: # Defensive fallback for an early request during startup.
|
||||||
|
return jsonify({"status": "error", "message": "Service is starting; retry shortly"}), 503
|
||||||
|
|
||||||
# Roep Hermes aan (in thread pool omdat Hermes sync is)
|
try:
|
||||||
loop = asyncio.get_event_loop()
|
# One warm agent, therefore one model call at a time. The timeout covers
|
||||||
answer = await loop.run_in_executor(_executor, _hermes_query, prompt)
|
# queue wait plus the call, preventing an indefinitely occupied request.
|
||||||
elapsed = round(time.time() - start, 1)
|
async with asyncio.timeout(TIMEOUT):
|
||||||
|
async with lock:
|
||||||
|
llm_started = time.perf_counter()
|
||||||
|
answer = await asyncio.to_thread(_hermes_query, prompt)
|
||||||
|
llm_elapsed = round(time.perf_counter() - llm_started, 3)
|
||||||
|
except TimeoutError:
|
||||||
|
request_elapsed = round(time.perf_counter() - request_started, 3)
|
||||||
|
logger.warning("Hermes request timed out after %.3fs", request_elapsed)
|
||||||
|
return jsonify({
|
||||||
|
"status": "error",
|
||||||
|
"message": "Hermes request timed out",
|
||||||
|
"request_elapsed_seconds": request_elapsed,
|
||||||
|
}), 504
|
||||||
|
except Exception:
|
||||||
|
logger.exception("Unhandled Hermes request failure")
|
||||||
|
return jsonify({"status": "error", "message": "Hermes request failed"}), 502
|
||||||
|
|
||||||
logger.info("Answer (%.1fs): %s...", elapsed, answer[:200])
|
if not isinstance(answer, str):
|
||||||
|
logger.error("Hermes returned non-string answer: %s", type(answer).__name__)
|
||||||
|
return jsonify({"status": "error", "message": "Hermes returned an invalid response"}), 502
|
||||||
|
|
||||||
# Stuur ook naar Telegram (alleen het antwoord) - in thread pool
|
request_elapsed = round(time.perf_counter() - request_started, 3)
|
||||||
tg_sent = await loop.run_in_executor(_executor, lambda: asyncio.run(send_telegram(answer)))
|
logger.info("Answer (llm=%.3fs, request=%.3fs): %s...", llm_elapsed, request_elapsed, answer[:200])
|
||||||
|
|
||||||
|
if TELEGRAM_DELIVERY_ENABLED:
|
||||||
|
_queue_telegram(answer)
|
||||||
return jsonify({
|
return jsonify({
|
||||||
"status": "ok",
|
"status": "ok",
|
||||||
"answer": answer,
|
"answer": answer,
|
||||||
"elapsed_seconds": elapsed,
|
# Backwards-compatible field: model execution time, not delivery time.
|
||||||
"telegram_sent": tg_sent,
|
"elapsed_seconds": llm_elapsed,
|
||||||
|
"llm_elapsed_seconds": llm_elapsed,
|
||||||
|
"request_elapsed_seconds": request_elapsed,
|
||||||
|
"telegram_queued": TELEGRAM_DELIVERY_ENABLED,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
@app.route("/health", methods=["GET"])
|
@app.route("/health", methods=["GET"])
|
||||||
async def health():
|
async def health():
|
||||||
"""Health check voor Node-RED monitoring.
|
"""Return relay state. `detail=true` checks local agent state, not the LLM."""
|
||||||
|
base = {
|
||||||
Query params:
|
|
||||||
- detail=true: run deep health check (includes LLM query test)
|
|
||||||
"""
|
|
||||||
from hermes_client import health_check
|
|
||||||
|
|
||||||
detail = request.args.get("detail", "false").lower() == "true"
|
|
||||||
|
|
||||||
if detail:
|
|
||||||
# Use cached health check for detail view
|
|
||||||
checks = await _cached_health_check()
|
|
||||||
return jsonify({
|
|
||||||
"status": "ok" if checks["healthy"] else "degraded",
|
|
||||||
"service": "hermes-relay",
|
"service": "hermes-relay",
|
||||||
"version": "3.0",
|
"version": VERSION,
|
||||||
"mode": "async-quart",
|
"mode": "async-quart",
|
||||||
"profile": "voice-assistant",
|
"profile": "voice-assistant",
|
||||||
|
"telegram_delivery_enabled": TELEGRAM_DELIVERY_ENABLED,
|
||||||
|
"pending_telegram_deliveries": len(_delivery_tasks),
|
||||||
|
}
|
||||||
|
if request.args.get("detail", "false").lower() == "true":
|
||||||
|
from hermes_client import health_check
|
||||||
|
checks = await asyncio.to_thread(health_check)
|
||||||
|
return jsonify({
|
||||||
|
**base,
|
||||||
|
"status": "ok" if checks["healthy"] else "degraded",
|
||||||
"checks": checks,
|
"checks": checks,
|
||||||
})
|
})
|
||||||
|
return jsonify({**base, "status": "ok"})
|
||||||
# Quick health check - just return basic status (cached)
|
|
||||||
quick_check = await _cached_quick_health()
|
|
||||||
return jsonify(quick_check)
|
|
||||||
|
|
||||||
|
|
||||||
@cached(ttl=60) # Cache quick health for 60 seconds
|
|
||||||
async def _cached_quick_health():
|
|
||||||
"""Cached quick health check."""
|
|
||||||
return {
|
|
||||||
"status": "ok",
|
|
||||||
"service": "hermes-relay",
|
|
||||||
"version": "3.0",
|
|
||||||
"mode": "async-quart",
|
|
||||||
"profile": "voice-assistant",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@cached(ttl=300) # Cache detailed health for 5 minutes
|
|
||||||
async def _cached_health_check():
|
|
||||||
"""Cached detailed health check."""
|
|
||||||
from hermes_client import health_check
|
|
||||||
checks = health_check()
|
|
||||||
return checks
|
|
||||||
|
|
||||||
|
|
||||||
@app.before_serving
|
@app.before_serving
|
||||||
async def startup():
|
async def startup() -> None:
|
||||||
"""Startup tasks."""
|
global _hermes_lock
|
||||||
# Ensure thread pool is ready
|
_hermes_lock = asyncio.Lock()
|
||||||
# Pre-warm HTTP client
|
logger.info(
|
||||||
await _get_http_client()
|
"Hermes Relay v%s startup complete (one serialized agent, telegram_delivery=%s, delivery_workers=%d, timeout=%ds)",
|
||||||
logger.info("Hermes Relay v3.0 startup complete (workers=%d, http2=enabled)", THREAD_POOL_WORKERS)
|
VERSION, TELEGRAM_DELIVERY_ENABLED, DELIVERY_WORKERS, TIMEOUT,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@app.after_serving
|
@app.after_serving
|
||||||
async def shutdown():
|
async def shutdown() -> None:
|
||||||
"""Cleanup on shutdown."""
|
pending = tuple(_delivery_tasks)
|
||||||
_executor.shutdown(wait=True)
|
if pending:
|
||||||
await _close_http_client()
|
logger.info("Waiting for %d Telegram delivery task(s)", len(pending))
|
||||||
_cache.close()
|
await asyncio.gather(*pending, return_exceptions=True)
|
||||||
logger.info("Hermes Relay v3.0 shutdown complete")
|
_delivery_executor.shutdown(wait=True, cancel_futures=False)
|
||||||
|
logger.info("Hermes Relay v%s shutdown complete", VERSION)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
import asyncio
|
|
||||||
logger.info("Starting Hermes Relay v3.0 (voice-assistant profiel, Quart async)...")
|
|
||||||
# Run with uvicorn for production
|
|
||||||
import uvicorn
|
import uvicorn
|
||||||
|
logger.info("Starting Hermes Relay v%s (voice-assistant profile, Quart async)", VERSION)
|
||||||
uvicorn.run(app, host="0.0.0.0", port=8650, log_level="info")
|
uvicorn.run(app, host="0.0.0.0", port=8650, log_level="info")
|
||||||
+27
-5
@@ -23,14 +23,36 @@ logger = logging.getLogger(__name__)
|
|||||||
HERMES_HOME = os.environ.get("HERMES_RELAY_HERMES_HOME", "/root/.hermes/profiles/voice-assistant")
|
HERMES_HOME = os.environ.get("HERMES_RELAY_HERMES_HOME", "/root/.hermes/profiles/voice-assistant")
|
||||||
HERMES_SITE_PACKAGES = os.environ.get("HERMES_RELAY_SITE_PACKAGES", "/usr/local/lib/hermes-agent/venv/lib/python3.11/site-packages")
|
HERMES_SITE_PACKAGES = os.environ.get("HERMES_RELAY_SITE_PACKAGES", "/usr/local/lib/hermes-agent/venv/lib/python3.11/site-packages")
|
||||||
HERMES_MODEL = os.environ.get("HERMES_RELAY_MODEL", "") # Empty = use profile default
|
HERMES_MODEL = os.environ.get("HERMES_RELAY_MODEL", "") # Empty = use profile default
|
||||||
HERMES_TOOLSETS = os.environ.get("HERMES_RELAY_TOOLSETS", "messaging").split(",")
|
# Telegram delivery runs via `hermes send`, so the relay agent needs no
|
||||||
|
# messaging toolset. Filter empty items to avoid an unknown-toolset warning.
|
||||||
|
HERMES_TOOLSETS = [
|
||||||
|
tool.strip()
|
||||||
|
for tool in os.environ.get("HERMES_RELAY_TOOLSETS", "").split(",")
|
||||||
|
if tool.strip()
|
||||||
|
]
|
||||||
HERMES_MAX_TURNS = int(os.environ.get("HERMES_RELAY_MAX_TURNS", "10"))
|
HERMES_MAX_TURNS = int(os.environ.get("HERMES_RELAY_MAX_TURNS", "10"))
|
||||||
HERMES_TIMEOUT = int(os.environ.get("HERMES_RELAY_TIMEOUT", "120"))
|
HERMES_TIMEOUT = int(os.environ.get("HERMES_RELAY_TIMEOUT", "120"))
|
||||||
LOG_LEVEL = os.environ.get("HERMES_RELAY_LOG_LEVEL", "INFO").upper()
|
LOG_LEVEL = os.environ.get("HERMES_RELAY_LOG_LEVEL", "INFO").upper()
|
||||||
|
|
||||||
# Default paths for auto-detection (used when env vars not set)
|
# Default paths for auto-detection (used when env vars not set). Hermes v0.20
|
||||||
|
# installs from a Git checkout, where modules live at the project root rather
|
||||||
|
# than inside the former venv site-packages directory.
|
||||||
DEFAULT_HERMES_HOME = "/root/.hermes/profiles/voice-assistant"
|
DEFAULT_HERMES_HOME = "/root/.hermes/profiles/voice-assistant"
|
||||||
DEFAULT_SITE_PACKAGES = "/usr/local/lib/hermes-agent/venv/lib/python3.11/site-packages"
|
DEFAULT_SITE_PACKAGES = "/usr/local/lib/hermes-agent"
|
||||||
|
|
||||||
|
|
||||||
|
def _resolve_hermes_import_path() -> str:
|
||||||
|
"""Return the directory that contains the installed hermes_cli package."""
|
||||||
|
configured = HERMES_SITE_PACKAGES or DEFAULT_SITE_PACKAGES
|
||||||
|
candidates = [
|
||||||
|
configured,
|
||||||
|
"/usr/local/lib/hermes-agent",
|
||||||
|
"/usr/local/lib/hermes-agent/venv/lib/python3.11/site-packages",
|
||||||
|
]
|
||||||
|
for candidate in candidates:
|
||||||
|
if os.path.isdir(os.path.join(candidate, "hermes_cli")):
|
||||||
|
return candidate
|
||||||
|
return configured
|
||||||
|
|
||||||
# ── Module-level state (true warm agent) ────────────────────────────────
|
# ── Module-level state (true warm agent) ────────────────────────────────
|
||||||
_HERMES_LOADED = False
|
_HERMES_LOADED = False
|
||||||
@@ -70,8 +92,8 @@ def _ensure_hermes_loaded() -> None:
|
|||||||
# Force voice-assistant profile via HERMES_HOME
|
# Force voice-assistant profile via HERMES_HOME
|
||||||
os.environ["HERMES_HOME"] = HERMES_HOME or DEFAULT_HERMES_HOME
|
os.environ["HERMES_HOME"] = HERMES_HOME or DEFAULT_HERMES_HOME
|
||||||
|
|
||||||
# Ensure Hermes is in Python path
|
# Ensure Hermes is in Python path. v0.20 uses a Git-checkout layout.
|
||||||
site_packages = HERMES_SITE_PACKAGES or DEFAULT_SITE_PACKAGES
|
site_packages = _resolve_hermes_import_path()
|
||||||
if site_packages not in sys.path:
|
if site_packages not in sys.path:
|
||||||
sys.path.insert(0, site_packages)
|
sys.path.insert(0, site_packages)
|
||||||
|
|
||||||
|
|||||||
+3
-13
@@ -1,19 +1,9 @@
|
|||||||
# Core dependencies - pinned versions for reproducible builds
|
# Web service
|
||||||
flask==3.0.3
|
|
||||||
requests==2.32.3
|
|
||||||
|
|
||||||
# Async/Production dependencies
|
|
||||||
quart==0.19.4
|
quart==0.19.4
|
||||||
uvicorn[standard]==0.30.6
|
uvicorn[standard]==0.30.6
|
||||||
gunicorn==22.0.0
|
|
||||||
|
|
||||||
# Performance optimizations
|
# Optional production server
|
||||||
httpx==0.27.2 # HTTP/2 connection pooling for Telegram
|
hypercorn==0.17.3
|
||||||
diskcache==5.6.3 # Semantic caching
|
|
||||||
brotli==1.1.0 # Compression
|
|
||||||
|
|
||||||
# Resilience patterns
|
|
||||||
tenacity==8.5.0 # Retry logic with exponential backoff
|
|
||||||
|
|
||||||
# Type hints support
|
# Type hints support
|
||||||
typing_extensions==4.12.2
|
typing_extensions==4.12.2
|
||||||
Reference in New Issue
Block a user