All checks were successful
shell-lint / shellcheck (pull_request) Successful in 8s
PR build (required check) / changes (pull_request) Successful in 6s
secrets-guard / encrypted (pull_request) Successful in 5s
PR build (required check) / build-frontend (pull_request) Has been skipped
PR build (required check) / validate-observability (pull_request) Has been skipped
PR build (required check) / build-backend (pull_request) Successful in 1m33s
PR build (required check) / gate (pull_request) Successful in 3s
web/app.py started two long-lived background jobs under a leader election: the
Discord gateway bot and an APScheduler. Both are stateful I/O loops -- reconnect,
RESUME, heartbeat, backoff, interval timers -- living inside an async web app
that also has to serve requests. This moves them into a single Go binary.
Go owns ONLY the stateful I/O. It owns no climate or grading logic: anything
needing data calls back into Python over a new internal-only HTTP surface
(/internal/discord/grade, /internal/jobs/warm-cities, /internal/jobs/indexnow).
Grading depends on polars and the parquet cache; reimplementing it in Go would
make the bot's grades drift from the API's, and the slash-command path
deliberately shares one grade builder so the two can never disagree. The grade
route returns gateway-ready JSON -- including the ephemeral-flag drop that
discord_bot.py used to do -- and Go relays those bytes verbatim without parsing
the embed.
Packaging: the binary is built by a golang:1.26 stage in the backend Dockerfile
and shipped in the SAME image, run as a second compose service off the SAME tag.
The daemon and backend share the /internal/* contract, so they must never skew
versions; one image makes that structural rather than a convention. Its
entrypoint bypasses entrypoint.sh -- the backend owns alembic, and two racing
migrators is a real hazard.
replicas: 1 in the Swarm stack is load-bearing. Discord permits exactly one
gateway connection per bot token; the pin replaces core/singleton.claim_leader
for this workload. update_config uses order: stop-first, since start-first would
briefly run two gateways. autoscale.sh targets ${STACK_NAME}_web only, so it
cannot scale this.
Security: the internal routes compare the token with hmac.compare_digest and the
whole router 404s when THERMOGRAPH_INTERNAL_TOKEN is unset -- fail closed, never
default open. Caddy only routes /api/*, /digest and /discord/interactions to the
backend, so /internal/* was never publicly reachable; the token is defence in
depth. The router mounts before the catch-all frontend proxy so /internal/*
cannot fall through to it. The daemon refuses to start without the token.
Behaviour preserved from the Python, with the reasoning carried into the Go
comments: non-privileged intents (no MESSAGE_CONTENT, so no portal review);
fatal close codes 4004/4010-4014 stop rather than loop; the bot-author and
self-author mention-loop guard; allowed_mentions locked to {"parse":[],
"replied_user":true} so a crafted query cannot turn a reply into an @everyone
ping; the first cron tick deferred one full interval rather than firing at boot,
since warm-cities already runs at deploy time; and no overlapping warm-cities
run, which would double-spend the archive-fetch quota.
Two deliberate improvements over the Python. A close intended for RESUME now
uses 4000 rather than 1000 -- Discord invalidates a session closed 1000/1001, so
the Python's default close silently defeated its own resume. And MESSAGE_CREATE
is handled on a bounded worker pool rather than an unbounded thread hand-off, so
a flood of mentions cannot spawn unbounded work against the backend.
A .dockerignore is added because a disposable backend/.venv was being swallowed
by COPY . /app/ and duplicated again by the chown layer, inflating the image to
1.8 GB; it builds at 578 MB.
Tests: 29 Go gateway tests covering every behaviour the deleted
test_discord_bot.py asserted, plus cron/config/apiclient suites; 10 new Python
tests for the internal routes (fail-closed, auth, flag drop, per-job 409 guard).
Full suite 359 passed / 7 skipped; go build, vet and test -race clean.
107 lines
3.9 KiB
Go
107 lines
3.9 KiB
Go
// Package apiclient is the daemon's ONLY channel back into the Python app.
|
|
// The daemon owns long-lived I/O (gateway socket, timers) and nothing else:
|
|
// grading depends on polars + the parquet cache, and the slash-command path
|
|
// deliberately shares one grade builder with the API so the two never drift.
|
|
// Reimplementing any of that here would reintroduce exactly that drift, so
|
|
// everything data-shaped is a POST to the backend's /internal/* routes.
|
|
package apiclient
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// defaultTimeout bounds every callback. Grading does synchronous parquet/DB
|
|
// reads on the Python side (a cold city can take a while), so be generous —
|
|
// but never infinite: a hung backend must not wedge the gateway's event loop.
|
|
const defaultTimeout = 60 * time.Second
|
|
|
|
// errBodyLimit caps how much of an error response we echo into logs; enough
|
|
// to see a traceback's headline without dumping megabytes.
|
|
const errBodyLimit = 512
|
|
|
|
// Client calls the backend's internal-only routes. The token is defence in
|
|
// depth — Caddy never routes /internal/* to the backend in the first place —
|
|
// but it is still required on every request so a misrouted or LAN-local call
|
|
// cannot hit these endpoints unauthenticated.
|
|
type Client struct {
|
|
base string
|
|
token string
|
|
http *http.Client
|
|
}
|
|
|
|
// New returns a Client for the backend at base (e.g. http://web:8137),
|
|
// authenticating with token.
|
|
func New(base, token string) *Client {
|
|
return &Client{
|
|
base: strings.TrimRight(base, "/"),
|
|
token: token,
|
|
http: &http.Client{Timeout: defaultTimeout},
|
|
}
|
|
}
|
|
|
|
// post sends body to path and returns the raw response body on 2xx.
|
|
func (c *Client) post(ctx context.Context, path string, body any) (json.RawMessage, error) {
|
|
payload, err := json.Marshal(body)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("apiclient: encode %s body: %w", path, err)
|
|
}
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.base+path, bytes.NewReader(payload))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("apiclient: build %s request: %w", path, err)
|
|
}
|
|
req.Header.Set("Content-Type", "application/json")
|
|
req.Header.Set("X-Thermograph-Internal-Token", c.token)
|
|
|
|
resp, err := c.http.Do(req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("apiclient: POST %s: %w", path, err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
// Read one byte past the limit so the truncation marker only appears when
|
|
// something was actually cut.
|
|
raw, err := io.ReadAll(io.LimitReader(resp.Body, 1<<20))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("apiclient: POST %s: read body: %w", path, err)
|
|
}
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
snippet := raw
|
|
truncated := ""
|
|
if len(snippet) > errBodyLimit {
|
|
snippet = snippet[:errBodyLimit]
|
|
truncated = "... (truncated)"
|
|
}
|
|
return nil, fmt.Errorf("apiclient: POST %s: status %d: %s%s", path, resp.StatusCode, snippet, truncated)
|
|
}
|
|
return json.RawMessage(raw), nil
|
|
}
|
|
|
|
// Grade asks Python to grade a city query and returns the gateway-ready
|
|
// Discord message JSON VERBATIM. The raw bytes are relayed to Discord without
|
|
// parsing or reshaping — that verbatim relay is what keeps Go out of the
|
|
// grading/embed contract: any change to the message shape lives entirely on
|
|
// the Python side.
|
|
func (c *Client) Grade(ctx context.Context, query string) (json.RawMessage, error) {
|
|
return c.post(ctx, "/internal/discord/grade", map[string]string{"query": query})
|
|
}
|
|
|
|
// WarmCities triggers the warm-cities job (the Python side owns what "warm"
|
|
// means and which cities are curated).
|
|
func (c *Client) WarmCities(ctx context.Context) error {
|
|
_, err := c.post(ctx, "/internal/jobs/warm-cities", map[string]string{})
|
|
return err
|
|
}
|
|
|
|
// IndexNow triggers the IndexNow check-and-submit job; a no-op on the Python
|
|
// side when the indexable URL set has not changed.
|
|
func (c *Client) IndexNow(ctx context.Context) error {
|
|
_, err := c.post(ctx, "/internal/jobs/indexnow", map[string]string{})
|
|
return err
|
|
}
|