mirror of
https://github.com/netbirdio/netbird.git
synced 2026-09-26 08:39:06 +02:00
* [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.
89 lines
2.6 KiB
Go
89 lines
2.6 KiB
Go
package cost_meter
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/netbirdio/netbird/proxy/internal/llm/pricing"
|
|
"github.com/netbirdio/netbird/proxy/internal/middleware"
|
|
"github.com/netbirdio/netbird/proxy/internal/middleware/builtin"
|
|
)
|
|
|
|
// defaultPricingFilename is the basename probed inside the proxy data
|
|
// directory when no override is configured.
|
|
const defaultPricingFilename = "pricing.yaml"
|
|
|
|
// Config is the on-wire configuration for the middleware.
|
|
type Config struct {
|
|
// PricingPath optionally overrides the basename of the pricing
|
|
// file probed inside the proxy data directory. When empty the
|
|
// loader falls back to "pricing.yaml".
|
|
PricingPath string `json:"pricing_path"`
|
|
}
|
|
|
|
// Factory builds cost_meter instances from raw config bytes.
|
|
type Factory struct{}
|
|
|
|
// ID returns the registry identifier.
|
|
func (Factory) ID() string { return ID }
|
|
|
|
// New constructs a middleware instance. Empty, null, and {} configs
|
|
// are accepted; non-empty rawConfig that fails to unmarshal is
|
|
// rejected so misconfigurations surface at chain build time. The
|
|
// pricing loader is built once per instance and reused across
|
|
// invocations.
|
|
func (Factory) New(rawConfig []byte) (middleware.Middleware, error) {
|
|
cfg, err := decodeConfig(rawConfig)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
fctx := builtin.Context()
|
|
pricingPath := cfg.PricingPath
|
|
if pricingPath == "" {
|
|
pricingPath = defaultPricingFilename
|
|
}
|
|
|
|
loader, err := pricing.NewLoader(fctx.DataDir, pricingPath, ID, nil)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("init pricing loader: %w", err)
|
|
}
|
|
|
|
cancel := startReloader(fctx.Context, loader)
|
|
|
|
return newMiddleware(loader, cancel), nil
|
|
}
|
|
|
|
// startReloader binds the loader's mtime-poll goroutine to a context
|
|
// derived from the proxy-lifetime context and returns its cancel func so
|
|
// the owning middleware can stop the goroutine on teardown. Returns nil
|
|
// when there's nothing to watch (nil context or defaults-only loader), in
|
|
// which case the middleware's Close is a no-op.
|
|
func startReloader(ctx context.Context, loader *pricing.Loader) context.CancelFunc {
|
|
if ctx == nil || !loader.WatchesFile() {
|
|
return nil
|
|
}
|
|
cctx, cancel := context.WithCancel(ctx)
|
|
go loader.Reload(cctx)
|
|
return cancel
|
|
}
|
|
|
|
// decodeConfig accepts empty, null, and {} configs, returning a
|
|
// zero-value Config. Non-empty payloads must parse cleanly.
|
|
func decodeConfig(rawConfig []byte) (Config, error) {
|
|
var cfg Config
|
|
if len(bytes.TrimSpace(rawConfig)) == 0 {
|
|
return cfg, nil
|
|
}
|
|
if err := json.Unmarshal(rawConfig, &cfg); err != nil {
|
|
return cfg, fmt.Errorf("decode config: %w", err)
|
|
}
|
|
return cfg, nil
|
|
}
|
|
|
|
func init() {
|
|
builtin.Register(Factory{})
|
|
}
|