mirror of
https://github.com/turnstonelabs/turnstone.git
synced 2026-08-12 23:12:23 -06:00
Patrick Buckley
2bb55590bf
Delete the entire turnstone/mq/ package (broker, bridge, protocol, client) and turnstone/sim/ package. Remove Redis as a dependency. Channel gateway and console now communicate with server nodes via direct HTTP (httpx + httpx-sse) instead of Redis pub/sub and queues. Single-node deployments work with zero infrastructure beyond the database. Key changes: - Channel adapters use httpx POST for create/send/approve/close and httpx-sse for per-workstream event streaming - Console collector discovers nodes via services table instead of Redis SCAN - Console scheduler dispatches tasks via HTTP POST with DB-based leader election - Server registers in services table with 30s heartbeat - Server accepts optional ws_id in create request (for Phase 2 console-generated routing) - SDK events gain IntentVerdictEvent and OutputWarningEvent types - All docs, examples, bootstrap wizard updated 63 files changed, -5968 net lines (Redis transport fully removed)
256 lines
8.8 KiB
Python
256 lines
8.8 KiB
Python
"""Unified channel gateway entry point.
|
|
|
|
Launches one or more channel adapters (Discord, Slack, etc.) connected to
|
|
the turnstone server via HTTP. An HTTP server runs alongside for inbound
|
|
notification delivery from the server.
|
|
|
|
Run as: ``turnstone-channel --discord-token $TURNSTONE_DISCORD_TOKEN``
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import socket
|
|
import sys
|
|
|
|
|
|
def main() -> None:
|
|
"""Parse arguments, initialize storage, and run adapters."""
|
|
import argparse
|
|
|
|
parser = argparse.ArgumentParser(
|
|
description="turnstone channel gateway — bridges messaging platforms to the turnstone cluster"
|
|
)
|
|
|
|
# -- Server connection ---------------------------------------------------
|
|
parser.add_argument(
|
|
"--server-url",
|
|
default=os.environ.get("TURNSTONE_SERVER_URL", "http://localhost:8080"),
|
|
help="Turnstone server URL (default: $TURNSTONE_SERVER_URL or http://localhost:8080)",
|
|
)
|
|
|
|
# -- Discord -------------------------------------------------------------
|
|
parser.add_argument(
|
|
"--discord-token",
|
|
default=os.environ.get("TURNSTONE_DISCORD_TOKEN", ""),
|
|
help="Discord bot token (default: $TURNSTONE_DISCORD_TOKEN)",
|
|
)
|
|
parser.add_argument(
|
|
"--discord-guild",
|
|
type=int,
|
|
default=0,
|
|
help="Restrict to a single Discord guild (0 = all, default: %(default)s)",
|
|
)
|
|
parser.add_argument(
|
|
"--discord-channels",
|
|
default="",
|
|
help="Comma-separated list of allowed Discord channel IDs (default: all)",
|
|
)
|
|
|
|
# -- HTTP server ---------------------------------------------------------
|
|
parser.add_argument(
|
|
"--http-host",
|
|
default="127.0.0.1",
|
|
help="HTTP server bind address (default: %(default)s)",
|
|
)
|
|
parser.add_argument(
|
|
"--http-port",
|
|
type=int,
|
|
default=int(os.environ.get("TURNSTONE_CHANNEL_PORT", "8091")),
|
|
help="HTTP server port (default: $TURNSTONE_CHANNEL_PORT or 8091)",
|
|
)
|
|
|
|
# -- TLS -----------------------------------------------------------------
|
|
parser.add_argument("--ssl-certfile", default=None, help="SSL certificate file for HTTPS")
|
|
parser.add_argument("--ssl-keyfile", default=None, help="SSL private key file")
|
|
parser.add_argument("--ssl-ca-certs", default=None, help="SSL CA certs for client verification")
|
|
|
|
# -- Auth ----------------------------------------------------------------
|
|
parser.add_argument(
|
|
"--auth-token",
|
|
default=os.environ.get("TURNSTONE_CHANNEL_AUTH_TOKEN", ""),
|
|
help="Static auth token for /v1/api/notify (default: $TURNSTONE_CHANNEL_AUTH_TOKEN)",
|
|
)
|
|
|
|
# -- Workstream defaults -------------------------------------------------
|
|
parser.add_argument(
|
|
"--model",
|
|
default="",
|
|
help="Default model for new workstreams (default: server default)",
|
|
)
|
|
parser.add_argument(
|
|
"--auto-approve",
|
|
action="store_true",
|
|
help="Auto-approve all tool calls",
|
|
)
|
|
|
|
# -- Logging -------------------------------------------------------------
|
|
from turnstone.core.log import add_log_args
|
|
|
|
add_log_args(parser)
|
|
|
|
args = parser.parse_args()
|
|
|
|
# -- Logging setup -------------------------------------------------------
|
|
from turnstone.core.log import configure_logging_from_args
|
|
|
|
configure_logging_from_args(args, "channel")
|
|
|
|
from turnstone.core.log import get_logger
|
|
|
|
log = get_logger(__name__)
|
|
|
|
# -- Storage -------------------------------------------------------------
|
|
from turnstone.core.storage._registry import init_storage
|
|
|
|
db_backend = os.environ.get("TURNSTONE_DB_BACKEND", "sqlite")
|
|
db_url = os.environ.get("TURNSTONE_DB_URL", "")
|
|
db_path = os.environ.get("TURNSTONE_DB_PATH", "")
|
|
|
|
init_storage(
|
|
backend=db_backend,
|
|
url=db_url,
|
|
path=db_path,
|
|
)
|
|
|
|
# -- Auth config ---------------------------------------------------------
|
|
auth_token = args.auth_token
|
|
jwt_secret = os.environ.get("TURNSTONE_JWT_SECRET", "").strip()
|
|
|
|
server_url: str = args.server_url
|
|
|
|
# -- Adapter selection ---------------------------------------------------
|
|
adapters_configured = False
|
|
|
|
if args.discord_token:
|
|
adapters_configured = True
|
|
|
|
if not adapters_configured:
|
|
print(
|
|
"Error: no channel adapters configured. "
|
|
"Set --discord-token or $TURNSTONE_DISCORD_TOKEN.",
|
|
file=sys.stderr,
|
|
)
|
|
sys.exit(1)
|
|
|
|
# -- Run -----------------------------------------------------------------
|
|
if args.discord_token:
|
|
import asyncio
|
|
|
|
from turnstone.channels._http import _get_service_id, create_channel_app
|
|
from turnstone.channels.discord.bot import TurnstoneBot
|
|
from turnstone.channels.discord.config import DiscordConfig
|
|
from turnstone.core.storage._registry import get_storage
|
|
|
|
allowed_channels: list[int] = []
|
|
if args.discord_channels:
|
|
allowed_channels = [
|
|
int(c.strip()) for c in args.discord_channels.split(",") if c.strip()
|
|
]
|
|
|
|
config = DiscordConfig(
|
|
server_url=server_url,
|
|
model=args.model,
|
|
auto_approve=args.auto_approve,
|
|
bot_token=args.discord_token,
|
|
guild_id=args.discord_guild,
|
|
allowed_channels=allowed_channels,
|
|
)
|
|
|
|
storage = get_storage()
|
|
bot = TurnstoneBot(config, server_url, storage, api_token=auth_token)
|
|
adapters = {"discord": bot}
|
|
|
|
# Create HTTP app for notification delivery
|
|
channel_app = create_channel_app(
|
|
adapters, # type: ignore[arg-type]
|
|
storage,
|
|
auth_token=auth_token,
|
|
jwt_secret=jwt_secret,
|
|
)
|
|
|
|
log.info(
|
|
"channel.starting",
|
|
adapter="discord",
|
|
guild_id=config.guild_id,
|
|
http_port=args.http_port,
|
|
server_url=server_url,
|
|
)
|
|
|
|
async def _run_all() -> None:
|
|
"""Run Discord bot + HTTP server + service heartbeat concurrently."""
|
|
import uvicorn
|
|
|
|
service_id = _get_service_id()
|
|
|
|
# Resolve advertise URL — env override for Docker/K8s,
|
|
# otherwise derive from bind address.
|
|
advertise_url = os.environ.get("TURNSTONE_CHANNEL_ADVERTISE_URL", "").strip()
|
|
if not advertise_url:
|
|
if args.http_host in ("0.0.0.0", "::"):
|
|
advertise_host = socket.gethostname()
|
|
else:
|
|
advertise_host = args.http_host
|
|
scheme = "https" if args.ssl_certfile else "http"
|
|
advertise_url = f"{scheme}://{advertise_host}:{args.http_port}"
|
|
service_url = advertise_url
|
|
|
|
# Register in service registry
|
|
storage.register_service("channel", service_id, service_url)
|
|
log.info(
|
|
"channel.service_registered",
|
|
service_id=service_id,
|
|
url=service_url,
|
|
)
|
|
|
|
async def _heartbeat_loop() -> None:
|
|
"""Periodically update service heartbeat."""
|
|
while True:
|
|
await asyncio.sleep(30)
|
|
try:
|
|
await asyncio.to_thread(storage.heartbeat_service, "channel", service_id)
|
|
except Exception:
|
|
log.exception("channel.heartbeat_failed")
|
|
|
|
# TLS: use cert files if available (from bootstrap or TLSClient)
|
|
ssl_certfile = getattr(args, "ssl_certfile", None)
|
|
ssl_keyfile = getattr(args, "ssl_keyfile", None)
|
|
ssl_ca_certs = getattr(args, "ssl_ca_certs", None)
|
|
if bool(ssl_certfile) != bool(ssl_keyfile):
|
|
print(
|
|
"Both --ssl-certfile and --ssl-keyfile are required for TLS",
|
|
file=sys.stderr,
|
|
)
|
|
sys.exit(1)
|
|
|
|
uv_config = uvicorn.Config(
|
|
channel_app,
|
|
host=args.http_host,
|
|
port=args.http_port,
|
|
log_level="warning",
|
|
ssl_certfile=ssl_certfile,
|
|
ssl_keyfile=ssl_keyfile,
|
|
ssl_ca_certs=ssl_ca_certs,
|
|
)
|
|
server = uvicorn.Server(uv_config)
|
|
|
|
heartbeat_task = asyncio.create_task(_heartbeat_loop())
|
|
try:
|
|
await asyncio.gather(
|
|
bot.start(),
|
|
server.serve(),
|
|
)
|
|
finally:
|
|
heartbeat_task.cancel()
|
|
await asyncio.to_thread(storage.deregister_service, "channel", service_id)
|
|
log.info("channel.service_deregistered", service_id=service_id)
|
|
|
|
import contextlib
|
|
|
|
with contextlib.suppress(KeyboardInterrupt):
|
|
asyncio.run(_run_all())
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|