refactor: telegram + portfolio in-process (drop shared MCP)
Each bot now manages its own notification + portfolio aggregation: * TelegramClient calls the public Bot API directly via httpx, reading CERBERO_BITE_TELEGRAM_BOT_TOKEN / CERBERO_BITE_TELEGRAM_CHAT_ID from env. No credentials → silent disabled mode. * PortfolioClient composes DeribitClient + HyperliquidClient + the new MacroClient.get_asset_price/eur_usd_rate to expose equity (EUR) and per-asset exposure as the bot's own slice (no cross-bot view). * mcp-telegram and mcp-portfolio removed from MCP_SERVICES / McpEndpoints and the cerbero-bite ping CLI; health_check no longer probes portfolio. Docs (02/04/06/07) and docker-compose updated to reflect the new architecture. 353/353 tests pass; ruff clean; mypy src clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,41 +1,115 @@
|
||||
"""Wrapper around ``mcp-telegram`` (notify-only mode).
|
||||
"""Direct Telegram Bot API client (notify-only).
|
||||
|
||||
Cerbero Bite during the testnet phase (and through the soft launch) is
|
||||
fully autonomous: Telegram is used purely to *notify* Adriano of what
|
||||
the engine has done, never to gate execution. As a consequence:
|
||||
Cerbero Bite is fully autonomous: Telegram is used solely to *notify*
|
||||
the operator of what the engine has done — there is no inbound queue
|
||||
and no confirmation logic.
|
||||
|
||||
* No ``send_with_buttons`` and no callback queue.
|
||||
* Confirmation timeouts are handled inside the orchestrator's own
|
||||
state machine, not by waiting on Telegram replies.
|
||||
* All notifications go through one of the typed endpoints
|
||||
(``notify``, ``notify_position_opened``, ``notify_position_closed``,
|
||||
``notify_alert``, ``notify_system_error``) — the formatting lives
|
||||
on the server side.
|
||||
Credentials are read from the environment:
|
||||
|
||||
* ``CERBERO_BITE_TELEGRAM_BOT_TOKEN`` — bot token from BotFather.
|
||||
* ``CERBERO_BITE_TELEGRAM_CHAT_ID`` — destination chat id.
|
||||
|
||||
If either is missing the client runs in **disabled** mode: every
|
||||
``notify_*`` becomes a no-op logged at DEBUG. This keeps unconfigured
|
||||
deployments and the test environment harmless.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import os
|
||||
from decimal import Decimal
|
||||
from typing import Any
|
||||
|
||||
from cerbero_bite.clients._base import HttpToolClient
|
||||
import httpx
|
||||
|
||||
__all__ = ["TelegramClient"]
|
||||
__all__ = [
|
||||
"TELEGRAM_BOT_TOKEN_ENV",
|
||||
"TELEGRAM_CHAT_ID_ENV",
|
||||
"TelegramClient",
|
||||
"TelegramError",
|
||||
"load_telegram_credentials",
|
||||
]
|
||||
|
||||
|
||||
def _to_float(value: Decimal | float) -> float:
|
||||
return float(value) if isinstance(value, Decimal) else value
|
||||
TELEGRAM_BOT_TOKEN_ENV = "CERBERO_BITE_TELEGRAM_BOT_TOKEN"
|
||||
TELEGRAM_CHAT_ID_ENV = "CERBERO_BITE_TELEGRAM_CHAT_ID"
|
||||
|
||||
_log = logging.getLogger("cerbero_bite.clients.telegram")
|
||||
|
||||
|
||||
class TelegramError(RuntimeError):
|
||||
"""Raised when the Telegram Bot API rejects a sendMessage call."""
|
||||
|
||||
|
||||
def _to_float(value: Decimal | float | int) -> float:
|
||||
return float(value)
|
||||
|
||||
|
||||
def load_telegram_credentials(
|
||||
env: dict[str, str] | None = None,
|
||||
) -> tuple[str | None, str | None]:
|
||||
"""Return ``(bot_token, chat_id)`` from env. Empty strings → ``None``."""
|
||||
e = env if env is not None else os.environ
|
||||
token = (e.get(TELEGRAM_BOT_TOKEN_ENV) or "").strip() or None
|
||||
chat = (e.get(TELEGRAM_CHAT_ID_ENV) or "").strip() or None
|
||||
return token, chat
|
||||
|
||||
|
||||
class TelegramClient:
|
||||
SERVICE = "telegram"
|
||||
"""Notify-only client over the public Telegram Bot API."""
|
||||
|
||||
def __init__(self, http: HttpToolClient) -> None:
|
||||
if http.service != self.SERVICE:
|
||||
raise ValueError(
|
||||
f"TelegramClient requires service '{self.SERVICE}', got '{http.service}'"
|
||||
BASE_URL = "https://api.telegram.org"
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
*,
|
||||
bot_token: str | None,
|
||||
chat_id: str | None,
|
||||
http_client: httpx.AsyncClient | None = None,
|
||||
timeout_s: float = 5.0,
|
||||
parse_mode: str = "HTML",
|
||||
) -> None:
|
||||
self._token = (bot_token or "").strip() or None
|
||||
self._chat_id = (str(chat_id).strip() if chat_id is not None else "") or None
|
||||
self._client = http_client
|
||||
self._timeout = timeout_s
|
||||
self._parse_mode = parse_mode
|
||||
|
||||
@property
|
||||
def enabled(self) -> bool:
|
||||
return self._token is not None and self._chat_id is not None
|
||||
|
||||
async def _send(self, text: str) -> None:
|
||||
if not self.enabled:
|
||||
_log.debug("telegram disabled, dropping message: %s", text[:120])
|
||||
return
|
||||
url = f"{self.BASE_URL}/bot{self._token}/sendMessage"
|
||||
payload: dict[str, Any] = {
|
||||
"chat_id": self._chat_id,
|
||||
"text": text,
|
||||
"parse_mode": self._parse_mode,
|
||||
"disable_web_page_preview": True,
|
||||
}
|
||||
client = self._client
|
||||
owns = client is None
|
||||
if client is None:
|
||||
client = httpx.AsyncClient(timeout=self._timeout)
|
||||
try:
|
||||
resp = await client.post(url, json=payload, timeout=self._timeout)
|
||||
finally:
|
||||
if owns:
|
||||
await client.aclose()
|
||||
if resp.status_code != 200:
|
||||
raise TelegramError(
|
||||
f"telegram HTTP {resp.status_code}: {resp.text[:200]}"
|
||||
)
|
||||
self._http = http
|
||||
data = resp.json()
|
||||
if not isinstance(data, dict) or not data.get("ok", False):
|
||||
desc = (
|
||||
data.get("description", "?") if isinstance(data, dict) else str(data)
|
||||
)
|
||||
raise TelegramError(f"telegram api error: {desc}")
|
||||
|
||||
async def notify(
|
||||
self,
|
||||
@@ -44,10 +118,10 @@ class TelegramClient:
|
||||
priority: str = "normal",
|
||||
tag: str | None = None,
|
||||
) -> None:
|
||||
body: dict[str, Any] = {"message": message, "priority": priority}
|
||||
if tag is not None:
|
||||
body["tag"] = tag
|
||||
await self._http.call("notify", body)
|
||||
prefix = f"[{priority.upper()}]"
|
||||
if tag:
|
||||
prefix = f"{prefix}[{tag}]"
|
||||
await self._send(f"{prefix} {message}")
|
||||
|
||||
async def notify_position_opened(
|
||||
self,
|
||||
@@ -59,17 +133,19 @@ class TelegramClient:
|
||||
greeks: dict[str, Decimal | float] | None = None,
|
||||
expected_pnl_usd: Decimal | float | None = None,
|
||||
) -> None:
|
||||
body: dict[str, Any] = {
|
||||
"instrument": instrument,
|
||||
"side": side,
|
||||
"size": float(size),
|
||||
"strategy": strategy,
|
||||
}
|
||||
if greeks is not None:
|
||||
body["greeks"] = {k: _to_float(v) for k, v in greeks.items()}
|
||||
lines = [
|
||||
"<b>POSITION OPENED</b>",
|
||||
f"instrument: <code>{instrument}</code>",
|
||||
f"side: {side} | size: {size} | strategy: {strategy}",
|
||||
]
|
||||
if greeks:
|
||||
joined = ", ".join(
|
||||
f"{k}={_to_float(v):+.4f}" for k, v in greeks.items()
|
||||
)
|
||||
lines.append(f"greeks: {joined}")
|
||||
if expected_pnl_usd is not None:
|
||||
body["expected_pnl"] = _to_float(expected_pnl_usd)
|
||||
await self._http.call("notify_position_opened", body)
|
||||
lines.append(f"expected pnl: ${_to_float(expected_pnl_usd):+.2f}")
|
||||
await self._send("\n".join(lines))
|
||||
|
||||
async def notify_position_closed(
|
||||
self,
|
||||
@@ -78,13 +154,12 @@ class TelegramClient:
|
||||
realized_pnl_usd: Decimal | float,
|
||||
reason: str,
|
||||
) -> None:
|
||||
await self._http.call(
|
||||
"notify_position_closed",
|
||||
{
|
||||
"instrument": instrument,
|
||||
"realized_pnl": _to_float(realized_pnl_usd),
|
||||
"reason": reason,
|
||||
},
|
||||
pnl = _to_float(realized_pnl_usd)
|
||||
await self._send(
|
||||
"<b>POSITION CLOSED</b>\n"
|
||||
f"instrument: <code>{instrument}</code>\n"
|
||||
f"realized pnl: ${pnl:+.2f}\n"
|
||||
f"reason: {reason}"
|
||||
)
|
||||
|
||||
async def notify_alert(
|
||||
@@ -94,9 +169,10 @@ class TelegramClient:
|
||||
message: str,
|
||||
priority: str = "high",
|
||||
) -> None:
|
||||
await self._http.call(
|
||||
"notify_alert",
|
||||
{"source": source, "message": message, "priority": priority},
|
||||
await self._send(
|
||||
f"<b>ALERT [{priority.upper()}]</b>\n"
|
||||
f"source: {source}\n"
|
||||
f"{message}"
|
||||
)
|
||||
|
||||
async def notify_system_error(
|
||||
@@ -106,7 +182,8 @@ class TelegramClient:
|
||||
component: str | None = None,
|
||||
priority: str = "critical",
|
||||
) -> None:
|
||||
body: dict[str, Any] = {"message": message, "priority": priority}
|
||||
if component is not None:
|
||||
body["component"] = component
|
||||
await self._http.call("notify_system_error", body)
|
||||
text = f"<b>SYSTEM ERROR [{priority.upper()}]</b>\n"
|
||||
if component:
|
||||
text += f"component: {component}\n"
|
||||
text += message
|
||||
await self._send(text)
|
||||
|
||||
Reference in New Issue
Block a user