mirror of
https://github.com/netbirdio/netbird.git
synced 2026-07-17 20:19:55 +00:00
* [management,proxy] Agent network: per-account LLM gateway (policy, metering, multi-provider) (#6555) * [agent-network] Shared proto, OpenAPI schema, and generated types * [agent-network] Management: store, manager, synthesizer, policy engine, provider catalog, HTTP/gRPC API Adds the account-scoped agent-network module: provider/policy/budget CRUD and store, the reverse-proxy service synthesizer, policy selection + limit enforcement, the provider catalog (incl. Vertex AI and AWS Bedrock entries), and the management HTTP + proxy gRPC surfaces. * [management] Fix agent-network proxy-peer fan-out on affected-peer recompute The affected-peers resolver loaded only persisted reverse-proxy services, but agent-network services are synthesized on demand and never persisted. As a result the embedded proxy peer was never folded into the affected set when a client's group changed, so the proxy received no network-map update for a newly authorised client and rejected its handshake until a full resync (restart). loadProxyServices now merges the synthesized agent-network services (injected via a registration hook to avoid an import cycle), so proxy peers learn newly authorised clients immediately. * [proxy] Reverse-proxy middleware framework, chain, and request plumbing The per-target middleware chain (slots, dispatcher, mutation gate, metadata merger), body capture, access-log terminal sink, and the proxy wiring that builds + runs chains for synthesized agent-network services. * [proxy] LLM parsers, pricing, and builtin middlewares (OpenAI, Anthropic, Vertex AI, AWS Bedrock) Request/response parsers and SSE/event-stream metering, the embedded pricing table, and the builtin middleware set: request parser, router, policy limit-check/record, cost meter, guardrail, identity inject, response parser. Includes the path-routed providers — Google Vertex AI (keyfile:: service-account OAuth minting) and AWS Bedrock (bearer auth, invoke/converse/streaming, optional /bedrock prefix) — plus the Models allowlist and unmeterable-publisher deny. * [proxy] IPv6 in-place apply and TCP accept-loop hardening on netstack listeners * [agent-network] End-to-end test suite, module docs, and deployment preset * [agent-network] Fix codespell typos and exclude false positives - labelgen word pool: vermillion -> vermilion, racoon -> raccoon. - codespell ignore list: add flate (Go compress/flate package), recordin (a test-local identifier), and unparseable (a valid alternative spelling used consistently across identifiers + a metadata-value constant). * [management] Set LastSeen on injected proxy peer in realstack test (MySQL strict-mode) The injected embedded proxy peer had a PeerStatus with a zero LastSeen, which serializes to '0000-00-00' and is rejected by MySQL in strict mode (SQLite tolerates it). Set LastSeen to a valid time so SaveAccount succeeds on both engines. * [agent-network] Remove e2e shell-script suite from this branch The end-to-end shell scripts under scripts/e2e/ are maintained in a separate testing suite and are not part of this change set. * [agent-network] Polish module docs: remove internal review scaffolding, fix links, verify diagrams Strip PR-review framing, commit references, absolute paths, and stale internal references from the agent-network module docs; fix broken relative links; verify all diagrams against the current architecture. Remove the internal AI-reviewer prompt file. * [management] Refine session expiration handling to support 3-state encoding for SSO deadlines * [agent-network] Relocate agentnetwork package to internals/modules Move management/server/agentnetwork (and its catalog/, labelgen/, types/ subpackages) to management/internals/modules/agentnetwork, alongside the reverse-proxy module, and rewrite all importers. Pure relocation: package names, the synthesizer + affectedpeers registration hook, and store access (shared store.Store) are unchanged, so no import cycle is introduced (affectedpeers still depends only on the agentnetwork/types leaf). * [agent-network] Co-locate HTTP handlers in the module (RegisterEndpoints) Move the agent-network HTTP handlers from server/http/handlers/agentnetwork into the module at internals/modules/agentnetwork/handlers (package handlers) and rename the entrypoint AddEndpoints -> RegisterEndpoints, matching the reverse-proxy module convention. Wiring in http/handler.go updated accordingly. * Update getting started to point to rc when agent network enabled * Add a reference to a commercial license * Fix docs localhost link * Fix docs localhost link * Add private services domain note * [management] Add agent-network telemetry metrics (#6561) Surface agent-network adoption and usage in the self-hosted metrics worker: distinct accounts, providers, policies, budget rules, accounts with log collection enabled, and aggregated input/output tokens plus cost. Tokens and cost are summed from agent_network_request_usage (the always-written per-request ledger) so the figures are accurate regardless of the log-collection toggle and carry no double-counting. All values come from a handful of indexed aggregate queries run only on the worker's periodic tick. Adds store.AgentNetworkMetrics with GetAgentNetworkMetrics on the Store interface, the SqlStore implementation, and a zero-valued FileStore stub. * Update NetBird server and proxy image versions to 0.74.0-rc.2 * [management,proxy] Reduce agent-network cognitive complexity (#6566) Address the SonarCloud quality-gate findings in new agent-network code by extracting focused helpers. No behavior change. - synthesizer.go: split buildIdentityInjectConfigJSON into per-shape rule builders; extract mergeGuardrail from mergeGuardrails to cut nesting depth. - llm_identity_inject: extract injectionEmitsAnything validation predicate from New. - llm_response_parser/streaming.go: extract applyOpenAIStreamUsage and applyAnthropicStreamUsage (via a named anthropicStreamUsage type) and simplify the OpenAI scanner loop. - reverseproxy.go: decompose ServeHTTP into serveRouteError, buildTargetContext, serveDirect, serveWithChain, captureRequestForChain, serveDeny, newResponseWriter, observeResponse, and forwardUpstream, preserving the defer ordering so response observation still reads the captured writer before it is released. * [management] Move agent-network access-log ingest into the agentnetwork module (#6568) The agent-network access-log ingest path (metaKey wire contract, flatten, usage derivation, and the dual-write of the usage ledger + settings-gated full row) lived in the reverseproxy accesslogs manager, even though the agentnetwork module already owns the rest of that domain — types, read (ListAccessLogs / GetUsageOverview), the budget-counter writes, and retention cleanup. Move it next to the rest: a stateless agentnetwork.IngestAccessLog(ctx, store, entry) that the reverseproxy SaveAccessLog delegates to when the entry is agent-network. Removes the agentNetworkTypes import from the reverseproxy manager. No behavior change; the write/read table separation is unchanged. Adds real-store coverage for the disable->enable log-collection toggle (usage ledger always written, full row gated) plus the metadata parse and group-dedup helpers, which previously had no dedicated tests. * Add session view support in the access log * [management,proxy] Container-based agent-network e2e harness (#6577) * [e2e] Add container-based agent-network e2e harness (Pillar 1) Introduce a self-contained, OIDC-free e2e harness that stands up NetBird in containers, so suites no longer depend on the hand-maintained Tilt stack or a real IdP. - harness brings up the combined server (management + signal + relay + STUN + embedded IdP) in a single container built from combined/Dockerfile.multistage, and mints an admin PAT through the unauthenticated /api/setup bootstrap (NB_SETUP_PAT_ENABLED). API access goes through the existing shared/management/client/rest typed client. - the image is built via the docker CLI (BuildKit) so the Dockerfile's cache mounts are honored; testcontainers then runs the tagged image. - everything is behind the `e2e` build tag so normal builds and unit tests never pull in testcontainers. Adds BuildKit cache mounts to combined/Dockerfile.multistage so source changes recompile incrementally rather than from scratch. Pillar 1 proven by TestCombinedBootstrap: server builds, boots, mints a PAT, and the PAT authenticates a real management API call. * [e2e] Add management-side agent-network scenarios (Pillar 2) Port the API-driven agent-network scenarios from the bash suites to Go, sharing one combined server per package run (TestMain) with each test owning its resource cleanup. Drives the /api/agent-network/* endpoints through the shared REST client's NewRequest primitive with the generated api types. Scenarios: - provider lifecycle (create/get/list/delete + 404 after delete) - provider validation (missing api_key, unknown catalog id → 4xx) - settings collection-toggle round-trip with cluster/subdomain immutability - policy window floor (reject <60s enabled limit, accept at 60s) - consumption read endpoint returns an array All deterministic and dependency-free (dummy provider keys; no upstream calls), so they run headless in CI. * [e2e] Add live chat-through-proxy scenario (Pillar 3) Stand up the full agent-network data path in containers and drive a real chat-completion through the gateway: - harness: a shared docker network (combined server reachable by alias), a proxy container built from the published reverse-proxy image (NB_PROXY_PRIVATE, NB_PROXY_ALLOW_INSECURE, NB_RELAY_TRANSPORT=ws to match the combined server's WS-multiplexed relay) with a generated self-signed wildcard cert, and a netbird client container that joins via a setup key. - the combined image, proxy image, and client image default to the published rc.2 releases (overridable via NB_E2E_*_IMAGE; a bare local tag is built from source instead). Geolocation download is disabled so the server starts without external fetches. - one shared domain is used for the management exposed address, the proxy domain, and the agent-network cluster; the proxy token is minted via the server CLI (global) to match the manual install. TestChatCompletionThroughProxy provisions provider+policy+group+setup key, runs proxy+client, drives an OpenAI chat-completion through the tunnel, and asserts a 200 plus the ingested access-log row. Requires OPENAI_TOKEN (skips otherwise). The provider must be created with enabled=true explicitly — the create default is false despite the API doc. * [e2e] Run the live chat scenario across a provider matrix Replace the single-provider chat test with a data-driven matrix that runs the same scenario through every provider whose credentials are present in the environment (keys/URLs sourced from ~/.llm-keys locally, Actions secrets in CI): - OpenAI (chat), Anthropic (messages), Vercel, OpenRouter, Cloudflare (OpenAI-compatible gateways), and Bedrock (path-routed, bearer, via the messages shape) — covering both wire shapes and the gateway routing. - all providers are created enabled with a unique model string so the proxy's connect-time snapshot carries them all and model->provider routing is unambiguous (provider toggles after connect don't reconcile to a connected proxy). - the client supports both wire shapes (/v1/chat/completions and /v1/messages); Cloudflare gets the openai provider segment appended to its gateway URL. Each provider must return 200 through the tunnel and produce an ingested access-log row. Vertex is intentionally excluded from the uniform matrix: it needs a bespoke rawPredict request shape rather than the shared chat/messages path, so it warrants a dedicated scenario. * [ci] Add manual workflow for the agent-network e2e suite The e2e suite (build tag `e2e`) stands up the combined server + proxy + client in Docker and drives live chat-completions, so it is slow and needs provider credentials. Gate it out of normal CI (it already is, via the build tag) and run it on demand via workflow_dispatch. Provider scenarios skip when their secret is unset, so it degrades gracefully. * [e2e] Add Vertex to the provider matrix; run e2e on ubuntu-latest Vertex (Anthropic-on-Vertex) doesn't share the chat/messages wire shapes: the model travels in a rawPredict path and the proxy mints the service account's OAuth token. Add a Vertex client method that posts /v1/projects/<project>/locations/<region>/publishers/anthropic/models/<model>:rawPredict with the Vertex anthropic_version body, and wire it into the matrix as a path-routed provider (created without a models array). It is keyed off GOOGLE_VERTEX_SA_BASE64 + GOOGLE_VERTEX_PROJECT (region defaults to "global", model to a pinned claude snapshot, both overridable). Also bump the e2e workflow runner to ubuntu-latest and add the Vertex secrets. * Add docker/docker and docker/go-connections as direct dependencies in go.mod * [ci] Trigger agent-network e2e workflow on push to main and pull requests * [e2e] Fix proxy cert permission denied on Linux CI runners The proxy bind-mounts a temp dir of self-signed certs. MkdirTemp creates it 0700 and the key was 0600, which Docker Desktop on macOS ignores but a non-root proxy container on Linux runners cannot traverse/read, so the cert watcher failed with "open /certs/tls.crt: permission denied" and the container exited. Widen the cert dir to 0755 and write the throwaway key 0644 so the proxy uid can read the bind-mounted material. * [e2e] Build images from source by default instead of pulling rc.2 The agent-network code under test lives in this branch, so the e2e should exercise it rather than a frozen published release. Flip the harness default: combined/proxy/client are now built from their in-repo Dockerfiles (combined/Dockerfile.multistage, proxy/Dockerfile.multistage, e2e/harness/Dockerfile.client) under local tags. Pulling a published image stays available by setting NB_E2E_*_IMAGE to a registry reference. Builds now go through buildx --load so the Dockerfile cache mounts are honored and the result is loaded for testcontainers. The CI workflow adds a container-driver builder and a local layer cache (NB_E2E_BUILDX_CACHE) persisted via actions/cache, which caches the base/apt/dep-download layers across runs. The Go compile still re-runs each time, as BuildKit mount caches cannot be exported to the GitHub cache. * [e2e] Cover real providers in lifecycle + assert real consumption metering - TestProviderLifecycle now runs per available real provider (create → get → list → delete → 404) instead of a single dummy provider, exercising each catalog's create and field round-trip. Create is offline, so it stays fast and burns no provider quota; falls back to a synthetic OpenAI provider when no keys are set. - TestProvidersMatrix attaches a token limit (high caps, 60s window) to its policy, which switches on usage metering, and asserts consumption rows are recorded with positive token counts after the live traffic. Consumption is account-scoped (keyed by source group / user and window, not per provider), so the assertion is aggregate. - TestProviderValidation gains invalid-upstream and blank-name cases. Create validation is uniform across catalogs (no per-provider required-field rules), so per-provider rejection cases would be redundant. * [e2e] Assert session id propagates per provider Each matrix request now sends a unique session id as the universal x-session-id header and asserts it round-trips into that provider's access-log row. This guards the session-grouping contract end to end for every provider (header extraction runs in llm_request_parser ahead of the parser-specific body extraction, so it is provider-agnostic). * [e2e] Drop accidentally committed sync-phases dashboard netbird-sync-phases.json was swept into the Pillar 1 commit by a broad git add; it belongs to the unrelated sync-phases metrics work, not this e2e harness. Remove it from the branch so the PR diff is scoped to the e2e changes. * [e2e] Revert accidentally committed sync-phase ingest spec The netbird_sync_phase measurement spec in metrics ingest was swept into the Pillar 1 commit; it belongs to the unrelated sync-phases metrics work, not this e2e harness. Its emission side never landed here, so the spec was orphaned anyway. Restore ingest/main.go to its origin/main state. * Fix golint issues * Fix sonar * Add access log session test * Fix access log tests --------- Co-authored-by: braginini <bangvalo@gmail.com> Co-authored-by: Zoltan Papp <zoltan.pmail@gmail.com>
450 lines
14 KiB
Go
450 lines
14 KiB
Go
// Package pricing implements the embedded-default + override pricing table
|
|
// shared by middleware that converts LLM token usage into a USD cost
|
|
// estimate. The table is hot-reloadable from a basename under the proxy
|
|
// data directory; missing override files keep the embedded defaults so
|
|
// cost annotation works without operator action.
|
|
package pricing
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
_ "embed"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"io/fs"
|
|
"math"
|
|
"path/filepath"
|
|
"regexp"
|
|
"strings"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"go.opentelemetry.io/otel/attribute"
|
|
"go.opentelemetry.io/otel/metric"
|
|
"gopkg.in/yaml.v3"
|
|
)
|
|
|
|
//go:embed defaults_pricing.yaml
|
|
var defaultPricingYAML []byte
|
|
|
|
var (
|
|
defaultTableOnce sync.Once
|
|
defaultTablePtr *Table
|
|
)
|
|
|
|
// DefaultTable returns the pricing table embedded in the binary. The result
|
|
// is parsed once and shared; callers must not mutate the returned value.
|
|
// Cost annotation works without any operator action because every loader
|
|
// starts with this table.
|
|
func DefaultTable() *Table {
|
|
defaultTableOnce.Do(func() {
|
|
t, err := parsePricingBytes(defaultPricingYAML)
|
|
if err != nil {
|
|
panic(fmt.Sprintf("llmobs: embedded default pricing failed to parse: %v", err))
|
|
}
|
|
defaultTablePtr = t
|
|
})
|
|
return defaultTablePtr
|
|
}
|
|
|
|
// mergeOver returns a new Table containing every entry from base, with any
|
|
// matching entry from overlay replacing the base value. Either argument may
|
|
// be nil. Result is a fresh allocation so callers can mutate / Store safely.
|
|
func mergeOver(base, overlay *Table) *Table {
|
|
if overlay == nil || len(overlay.entries) == 0 {
|
|
return base
|
|
}
|
|
if base == nil || len(base.entries) == 0 {
|
|
return overlay
|
|
}
|
|
out := make(map[string]map[string]Entry, len(base.entries))
|
|
for provider, models := range base.entries {
|
|
inner := make(map[string]Entry, len(models))
|
|
for model, e := range models {
|
|
inner[model] = e
|
|
}
|
|
out[provider] = inner
|
|
}
|
|
for provider, models := range overlay.entries {
|
|
inner, ok := out[provider]
|
|
if !ok {
|
|
inner = make(map[string]Entry, len(models))
|
|
out[provider] = inner
|
|
}
|
|
for model, e := range models {
|
|
inner[model] = e
|
|
}
|
|
}
|
|
return &Table{entries: out}
|
|
}
|
|
|
|
// Entry is a single model's input and output pricing, expressed in USD per
|
|
// 1000 tokens.
|
|
//
|
|
// CachedInputPer1K applies to OpenAI's cached prompt tokens, which are a
|
|
// subset of input_tokens — when set, the cached portion is billed at this
|
|
// rate and the non-cached remainder at InputPer1K. Zero means "no discount
|
|
// configured", and cached tokens are billed at InputPer1K (matches current
|
|
// behaviour where cached counts weren't extracted at all).
|
|
//
|
|
// CacheReadPer1K and CacheCreationPer1K apply to Anthropic's two prompt-
|
|
// cache fields, which are additive to input_tokens: cache_read is the
|
|
// cheaper read-from-cache rate, cache_creation is the more expensive
|
|
// write-to-cache rate. Zero means "no rate configured" and the
|
|
// corresponding token bucket is billed at InputPer1K. This is more
|
|
// accurate than today's behaviour, where Anthropic's cache tokens are
|
|
// ignored and not charged at all.
|
|
type Entry struct {
|
|
InputPer1K float64
|
|
OutputPer1K float64
|
|
CachedInputPer1K float64
|
|
CacheReadPer1K float64
|
|
CacheCreationPer1K float64
|
|
}
|
|
|
|
// Table is a provider-to-model pricing lookup. Instances are immutable once
|
|
// built and are swapped atomically by Loader.
|
|
type Table struct {
|
|
entries map[string]map[string]Entry
|
|
}
|
|
|
|
// Cost returns the estimated USD cost for the given token counts. ok is
|
|
// false when the provider or model is not present in the table; the caller
|
|
// can still emit token metrics with a model=unknown label.
|
|
//
|
|
// Provider-shape semantics for cached / cache-creation counts:
|
|
//
|
|
// - OpenAI: cachedInput is a SUBSET of inTokens. The cached portion is
|
|
// billed at CachedInputPer1K (or InputPer1K when no override), and the
|
|
// non-cached remainder of inTokens at InputPer1K. cacheCreation is
|
|
// ignored (OpenAI has no analogue).
|
|
// - Anthropic: cachedInput (cache_read) and cacheCreation are ADDITIVE to
|
|
// inTokens. The three buckets are billed at CacheReadPer1K,
|
|
// CacheCreationPer1K, and InputPer1K respectively, each falling back
|
|
// to InputPer1K when the corresponding rate is zero.
|
|
// - Other providers: cached and cacheCreation are ignored; cost is
|
|
// inTokens*InputPer1K + outTokens*OutputPer1K.
|
|
func (t *Table) Cost(provider, model string, inTokens, outTokens, cachedInput, cacheCreation int64) (float64, bool) {
|
|
// Clamp negatives to zero before any pricing math so a malformed
|
|
// upstream count can never produce a negative cost.
|
|
if inTokens < 0 {
|
|
inTokens = 0
|
|
}
|
|
if outTokens < 0 {
|
|
outTokens = 0
|
|
}
|
|
if cachedInput < 0 {
|
|
cachedInput = 0
|
|
}
|
|
if cacheCreation < 0 {
|
|
cacheCreation = 0
|
|
}
|
|
if t == nil {
|
|
return 0, false
|
|
}
|
|
byModel, ok := t.entries[provider]
|
|
if !ok {
|
|
return 0, false
|
|
}
|
|
entry, ok := byModel[model]
|
|
if !ok {
|
|
return 0, false
|
|
}
|
|
output := (float64(outTokens) / 1000.0) * entry.OutputPer1K
|
|
switch provider {
|
|
case "openai":
|
|
// cachedInput is a subset of inTokens; clamp so a malformed
|
|
// upstream (cached > total) can't produce a negative remainder.
|
|
clamped := cachedInput
|
|
if clamped > inTokens {
|
|
clamped = inTokens
|
|
}
|
|
cachedRate := entry.CachedInputPer1K
|
|
if cachedRate <= 0 {
|
|
cachedRate = entry.InputPer1K
|
|
}
|
|
nonCached := float64(inTokens-clamped) / 1000.0 * entry.InputPer1K
|
|
cached := float64(clamped) / 1000.0 * cachedRate
|
|
return nonCached + cached + output, true
|
|
case "anthropic", "bedrock":
|
|
// Bedrock-Anthropic returns the same additive cache buckets as
|
|
// first-party Anthropic; non-Anthropic Bedrock models simply report
|
|
// zero cache tokens, so this formula degrades to input + output.
|
|
readRate := entry.CacheReadPer1K
|
|
if readRate <= 0 {
|
|
readRate = entry.InputPer1K
|
|
}
|
|
createRate := entry.CacheCreationPer1K
|
|
if createRate <= 0 {
|
|
createRate = entry.InputPer1K
|
|
}
|
|
input := float64(inTokens) / 1000.0 * entry.InputPer1K
|
|
read := float64(cachedInput) / 1000.0 * readRate
|
|
create := float64(cacheCreation) / 1000.0 * createRate
|
|
return input + read + create + output, true
|
|
default:
|
|
input := float64(inTokens) / 1000.0 * entry.InputPer1K
|
|
return input + output, true
|
|
}
|
|
}
|
|
|
|
// Has reports whether the provider/model pair is present in the table.
|
|
func (t *Table) Has(provider, model string) bool {
|
|
if t == nil {
|
|
return false
|
|
}
|
|
byModel, ok := t.entries[provider]
|
|
if !ok {
|
|
return false
|
|
}
|
|
_, ok = byModel[model]
|
|
return ok
|
|
}
|
|
|
|
// pricingFile mirrors the on-disk YAML schema. Keys are provider names; the
|
|
// nested map keys are model names.
|
|
type pricingFile map[string]map[string]struct {
|
|
InputPer1K float64 `yaml:"input_per_1k"`
|
|
OutputPer1K float64 `yaml:"output_per_1k"`
|
|
CachedInputPer1K float64 `yaml:"cached_input_per_1k"`
|
|
CacheReadPer1K float64 `yaml:"cache_read_per_1k"`
|
|
CacheCreationPer1K float64 `yaml:"cache_creation_per_1k"`
|
|
}
|
|
|
|
const (
|
|
// ReloadInterval is the mtime-poll cadence for the background reloader.
|
|
ReloadInterval = 30 * time.Second
|
|
|
|
// errorBackoff bounds how often the loader logs a repeated parse error.
|
|
errorBackoff = 5 * time.Minute
|
|
)
|
|
|
|
var basenameRegex = regexp.MustCompile(`^[a-zA-Z0-9._-]+$`)
|
|
|
|
// Loader is a confined, hot-reloadable pricing table reader. Construction
|
|
// must succeed against the target file; subsequent reload failures keep the
|
|
// previously-loaded table so callers never observe a blank price list.
|
|
type Loader struct {
|
|
baseDir string
|
|
fullPath string
|
|
pluginID string
|
|
table atomic.Pointer[Table]
|
|
mtime atomic.Int64
|
|
failures metric.Int64Counter
|
|
interval time.Duration
|
|
}
|
|
|
|
// NewLoader returns a pricing loader that overlays an optional file-based
|
|
// table on top of the embedded defaults. Missing override file, baseDir, or
|
|
// relPath is not an error: the loader keeps the embedded defaults so cost
|
|
// metadata is still emitted for known models.
|
|
//
|
|
// Errors:
|
|
// - bad basename, traversal segment, or absolute relPath are rejected so a
|
|
// misconfigured target surfaces immediately.
|
|
// - permission errors and YAML parse errors keep the defaults but log a
|
|
// warning; cost annotation does not silently break.
|
|
//
|
|
// failures is optional; pass nil in tests that do not care about
|
|
// reload-failure telemetry.
|
|
func NewLoader(baseDir, relPath, pluginID string, failures metric.Int64Counter) (*Loader, error) {
|
|
defaults := DefaultTable()
|
|
l := &Loader{
|
|
baseDir: baseDir,
|
|
pluginID: pluginID,
|
|
failures: failures,
|
|
}
|
|
l.table.Store(defaults)
|
|
|
|
if strings.TrimSpace(baseDir) == "" || strings.TrimSpace(relPath) == "" {
|
|
return l, nil
|
|
}
|
|
|
|
full, err := resolveMiddlewareDataPath(baseDir, relPath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
l.fullPath = full
|
|
|
|
overlay, mtime, err := loadPricing(full)
|
|
if err != nil {
|
|
if errors.Is(err, fs.ErrNotExist) {
|
|
// Override file is optional. Defaults already stored.
|
|
return l, nil
|
|
}
|
|
// Symlink rejection, oversize file, parse failure, permission errors
|
|
// — surface so a misconfigured operator sees the problem instead of
|
|
// silently running with stale defaults.
|
|
return nil, fmt.Errorf("load pricing %s: %w", full, err)
|
|
}
|
|
l.table.Store(mergeOver(defaults, overlay))
|
|
l.mtime.Store(mtime.UnixNano())
|
|
return l, nil
|
|
}
|
|
|
|
// Get returns the current pricing table. The returned pointer is immutable;
|
|
// callers must not mutate its contents.
|
|
func (l *Loader) Get() *Table {
|
|
if l == nil {
|
|
return nil
|
|
}
|
|
return l.table.Load()
|
|
}
|
|
|
|
// WatchesFile reports whether this loader is bound to an override file on
|
|
// disk. False for defaults-only loaders (no operator override given).
|
|
// Callers use this to decide whether to spawn the mtime-poll goroutine.
|
|
func (l *Loader) WatchesFile() bool {
|
|
if l == nil {
|
|
return false
|
|
}
|
|
return l.fullPath != ""
|
|
}
|
|
|
|
// SetReloadInterval overrides the mtime-poll cadence used by Reload. Calls
|
|
// after Reload has started have no effect on the running loop. Intended for
|
|
// tests; production code uses the default ReloadInterval.
|
|
func (l *Loader) SetReloadInterval(d time.Duration) {
|
|
if l == nil || d <= 0 {
|
|
return
|
|
}
|
|
l.interval = d
|
|
}
|
|
|
|
// Reload runs a polling loop that checks the pricing file mtime every
|
|
// ReloadInterval (or the value passed to SetReloadInterval). Returns when
|
|
// ctx is cancelled.
|
|
func (l *Loader) Reload(ctx context.Context) {
|
|
if l == nil {
|
|
return
|
|
}
|
|
interval := l.interval
|
|
if interval <= 0 {
|
|
interval = ReloadInterval
|
|
}
|
|
t := time.NewTicker(interval)
|
|
defer t.Stop()
|
|
|
|
var lastErrAt time.Time
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
return
|
|
case <-t.C:
|
|
if err := l.reload(); err != nil {
|
|
if l.failures != nil {
|
|
l.failures.Add(ctx, 1, metric.WithAttributes(
|
|
attribute.String("plugin", l.pluginID),
|
|
))
|
|
}
|
|
now := time.Now()
|
|
if now.Sub(lastErrAt) >= errorBackoff {
|
|
log.Warnf("llmobs: pricing reload failed for %s: %v", l.fullPath, err)
|
|
lastErrAt = now
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// reload performs a single-shot mtime check and reload. The reloaded
|
|
// override file is merged on top of the embedded defaults; missing override
|
|
// (e.g. operator deleted the file) is not an error and reverts to defaults.
|
|
func (l *Loader) reload() error {
|
|
if l.fullPath == "" {
|
|
// Defaults-only loader; nothing on disk to reload.
|
|
return nil
|
|
}
|
|
mtime, err := statMtime(l.fullPath)
|
|
if err != nil {
|
|
if errors.Is(err, fs.ErrNotExist) {
|
|
// File was removed since startup. Drop back to defaults and
|
|
// reset mtime so a future re-creation triggers a reload.
|
|
l.table.Store(DefaultTable())
|
|
l.mtime.Store(0)
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
if mtime.UnixNano() == l.mtime.Load() {
|
|
return nil
|
|
}
|
|
|
|
overlay, newMtime, err := loadPricing(l.fullPath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
l.table.Store(mergeOver(DefaultTable(), overlay))
|
|
l.mtime.Store(newMtime.UnixNano())
|
|
return nil
|
|
}
|
|
|
|
// resolveMiddlewareDataPath validates relPath is a safe basename and resolves
|
|
// it under baseDir. An additional cleaned-prefix check guards against
|
|
// CVE-style edge cases where Join is used with trailing path segments.
|
|
func resolveMiddlewareDataPath(baseDir, relPath string) (string, error) {
|
|
if strings.TrimSpace(baseDir) == "" {
|
|
return "", errors.New("middleware-data-dir is not configured")
|
|
}
|
|
if relPath == "" {
|
|
return "", errors.New("pricing path is empty")
|
|
}
|
|
if !basenameRegex.MatchString(relPath) {
|
|
return "", fmt.Errorf("pricing path %q is not a safe basename", relPath)
|
|
}
|
|
if filepath.IsAbs(relPath) {
|
|
return "", fmt.Errorf("pricing path %q must be a basename, not absolute", relPath)
|
|
}
|
|
|
|
cleanBase, err := filepath.Abs(filepath.Clean(baseDir))
|
|
if err != nil {
|
|
return "", fmt.Errorf("resolve middleware-data-dir: %w", err)
|
|
}
|
|
full := filepath.Join(cleanBase, relPath)
|
|
cleanedFull := filepath.Clean(full)
|
|
if !strings.HasPrefix(cleanedFull, cleanBase+string(filepath.Separator)) && cleanedFull != cleanBase {
|
|
return "", fmt.Errorf("pricing path %q escapes middleware-data-dir", relPath)
|
|
}
|
|
return cleanedFull, nil
|
|
}
|
|
|
|
func parsePricingBytes(data []byte) (*Table, error) {
|
|
dec := yaml.NewDecoder(bytes.NewReader(data))
|
|
dec.KnownFields(true)
|
|
|
|
var raw pricingFile
|
|
if err := dec.Decode(&raw); err != nil && !errors.Is(err, io.EOF) {
|
|
return nil, fmt.Errorf("decode pricing yaml: %w", err)
|
|
}
|
|
|
|
out := make(map[string]map[string]Entry, len(raw))
|
|
for provider, models := range raw {
|
|
inner := make(map[string]Entry, len(models))
|
|
for model, entry := range models {
|
|
for field, v := range map[string]float64{
|
|
"input_per_1k": entry.InputPer1K,
|
|
"output_per_1k": entry.OutputPer1K,
|
|
"cached_input_per_1k": entry.CachedInputPer1K,
|
|
"cache_read_per_1k": entry.CacheReadPer1K,
|
|
"cache_creation_per_1k": entry.CacheCreationPer1K,
|
|
} {
|
|
if v < 0 || math.IsNaN(v) || math.IsInf(v, 0) {
|
|
return nil, fmt.Errorf("pricing %s/%s: %s must be a finite, non-negative rate, got %v", provider, model, field, v)
|
|
}
|
|
}
|
|
inner[model] = Entry{
|
|
InputPer1K: entry.InputPer1K,
|
|
OutputPer1K: entry.OutputPer1K,
|
|
CachedInputPer1K: entry.CachedInputPer1K,
|
|
CacheReadPer1K: entry.CacheReadPer1K,
|
|
CacheCreationPer1K: entry.CacheCreationPer1K,
|
|
}
|
|
}
|
|
out[provider] = inner
|
|
}
|
|
return &Table{entries: out}, nil
|
|
}
|