mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
Danny Kopping
affb359d13
## Why PR #26797 was accidentally merged into the stale `graphite-base/26797` branch instead of `main` (Graphite picked the wrong base), so its changes never landed on `main`. This PR re-lands that work as a clean cherry-pick onto the current `main`. ## What Adds a `WatchAIProviders` streaming RPC to the `ProviderConfigurator` service so a running standalone AI Gateway refetches its provider set when the provider configuration changes. The server subscribes to `AIProvidersChangedChannel` (published by the provider CRUD endpoints) and forwards each event as a payload-free signal, plus one signal on subscribe; the gateway calls `GetAIProviders` on each signal to rebuild its pool. The aibridged API is bumped to v1.2. Env-seeded providers don't need a signal: seeding finishes before coderd serves the gateway connection, so the gateway's initial fetch already reflects the seeded set. ## For reviewers The change is split into two commits to make review easy: 1. **`feat: synchronise provider changes with WatchAIProviders`** is a faithful cherry-pick of #26797, identical to the originally reviewed PR. It is committed without pre-commit hooks because it does not build against current `main` on its own. 2. **`fix: resolve cherry-pick conflicts against main`** contains only the deltas needed to re-land on current `main`, and passes the full pre-commit suite: - `coderd/aibridged/proto/aibridged.pb.go` regenerated via the proto make target (the cherry-picked copy was generated against the older proto). - `enterprise/cli/aigatewaystart.go` import block unioned; `main` added `os` and `strings` while the PR added `sync`. - Three `aibridgedserver.NewServer` test call sites that landed on `main` after the original branch diverged now pass the new `pubsub` argument. Refs https://linear.app/codercom/issue/AIGOV-465 *This PR was produced by opencode (agent) using the `anthropic/claude-opus-4-8` model, under human direction and review.*
74 lines
2.5 KiB
Go
74 lines
2.5 KiB
Go
//go:build !slim
|
|
|
|
// Package aibridgedtest provides helpers for starting an in-process
|
|
// aibridged daemon in tests.
|
|
package aibridgedtest
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
"go.opentelemetry.io/otel"
|
|
|
|
"cdr.dev/slog/v3"
|
|
"github.com/coder/coder/v2/cli"
|
|
"github.com/coder/coder/v2/coderd"
|
|
"github.com/coder/coder/v2/coderd/aibridged"
|
|
)
|
|
|
|
// StartTestAIBridgeDaemon wires an in-process aibridged daemon onto the
|
|
// supplied API, mirroring what cli/server.go does in production. Tests that
|
|
// create AI provider rows with BaseURL pointing at fake upstream HTTP servers
|
|
// (e.g. chattest.NewOpenAI) will have their requests proxied through the real
|
|
// aibridged stack as they would in production.
|
|
//
|
|
// The daemon starts with an empty pool and fetches providers from coderd over
|
|
// the in-memory DRPC, then refreshes on ai_providers change events, exactly
|
|
// like cli.newAIBridgeDaemon.
|
|
//
|
|
// metrics is the registry the daemon reports provider reload events to.
|
|
// The caller owns the metrics instance and can assert on it after the daemon
|
|
// runs. Use [aibridged.NewMetrics] to create one, or nil for a throwaway.
|
|
func StartTestAIBridgeDaemon(
|
|
ctx context.Context,
|
|
t testing.TB,
|
|
api *coderd.API,
|
|
metrics *aibridged.Metrics,
|
|
) {
|
|
t.Helper()
|
|
|
|
logger := api.Logger.Named("aibridged").Leveled(slog.LevelDebug)
|
|
cfg := api.DeploymentValues.AI.BridgeConfig
|
|
tracer := otel.Tracer("aibridge-test")
|
|
|
|
if metrics == nil {
|
|
metrics = aibridged.NewMetrics(prometheus.NewRegistry())
|
|
}
|
|
|
|
pool, err := aibridged.NewCachedBridgePool(aibridged.DefaultPoolOptions, nil, logger.Named("pool"), nil, tracer)
|
|
if err != nil {
|
|
t.Fatalf("create bridge pool: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = pool.Shutdown(context.Background()) })
|
|
|
|
srv, err := aibridged.New(ctx, pool, func(dialCtx context.Context) (aibridged.DRPCClient, error) {
|
|
return api.CreateInMemoryAIBridgeServer(dialCtx)
|
|
}, logger, tracer)
|
|
if err != nil {
|
|
t.Fatalf("create aibridged server: %v", err)
|
|
}
|
|
t.Cleanup(func() { _ = srv.Close() })
|
|
|
|
// The reloader fetches providers from coderd over srv's DRPC client; the
|
|
// subscription drives an initial load and refreshes on change events.
|
|
reloader := cli.NewPoolRPCReloader(pool, srv.ClientContext, cfg, logger.Named("reloader"), nil, metrics)
|
|
unsubscribe, err := aibridged.SubscribeProviderReload(ctx, api.Pubsub, reloader, logger.Named("subscriber"))
|
|
if err != nil {
|
|
t.Fatalf("subscribe provider reload: %v", err)
|
|
}
|
|
t.Cleanup(unsubscribe)
|
|
|
|
api.RegisterInMemoryAIBridgedHTTPHandler(srv)
|
|
}
|