mirror of
https://github.com/netbirdio/netbird.git
synced 2026-09-27 00:59:07 +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.
111 lines
3.6 KiB
Go
111 lines
3.6 KiB
Go
package llm_response_parser
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"strings"
|
|
|
|
"github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream"
|
|
|
|
"github.com/netbirdio/netbird/proxy/internal/llm"
|
|
)
|
|
|
|
// bedrockEventTypeHeader names each AWS event-stream frame's event type.
|
|
const bedrockEventTypeHeader = ":event-type"
|
|
|
|
// accumulateBedrockStream decodes the AWS binary event-stream returned by
|
|
// Bedrock's streaming endpoints and folds it into running usage/completion.
|
|
// Two framings are handled:
|
|
// - InvokeModel (invoke-with-response-stream): each "chunk" frame's payload is
|
|
// {"bytes":"<base64>"} wrapping a vendor-native (Anthropic) stream event.
|
|
// - Converse (converse-stream): native frames (contentBlockDelta, metadata, …)
|
|
// whose payload JSON carries text deltas and a final usage block.
|
|
//
|
|
// A truncated stream (cut at the capture cap) decodes best-effort: frames up to
|
|
// the cut are applied and the partial usage is returned.
|
|
func accumulateBedrockStream(body []byte) (llm.Usage, string) {
|
|
var (
|
|
usage llm.Usage
|
|
completion strings.Builder
|
|
)
|
|
dec := eventstream.NewDecoder()
|
|
r := bytes.NewReader(body)
|
|
for {
|
|
msg, err := dec.Decode(r, nil)
|
|
if err != nil {
|
|
break // EOF or a partial trailing frame — return what we have.
|
|
}
|
|
eventType := ""
|
|
if v := msg.Headers.Get(bedrockEventTypeHeader); v != nil {
|
|
eventType = v.String()
|
|
}
|
|
if eventType == "chunk" {
|
|
applyBedrockInvokeChunk(msg.Payload, &usage, &completion)
|
|
continue
|
|
}
|
|
applyConverseStreamEvent(eventType, msg.Payload, &usage, &completion)
|
|
}
|
|
if usage.TotalTokens == 0 && (usage.InputTokens > 0 || usage.OutputTokens > 0) {
|
|
usage.TotalTokens = usage.InputTokens + usage.OutputTokens + usage.CachedInputTokens + usage.CacheCreationTokens
|
|
}
|
|
return usage, completion.String()
|
|
}
|
|
|
|
// applyBedrockInvokeChunk decodes an InvokeModel stream "chunk" frame
|
|
// ({"bytes":"<base64 anthropic event>"}) and folds the wrapped Anthropic event
|
|
// into usage/completion via the shared accumulator.
|
|
func applyBedrockInvokeChunk(payload []byte, usage *llm.Usage, completion *strings.Builder) {
|
|
var wrap struct {
|
|
Bytes []byte `json:"bytes"` // base64 string — encoding/json decodes it
|
|
}
|
|
if err := json.Unmarshal(payload, &wrap); err != nil || len(wrap.Bytes) == 0 {
|
|
return
|
|
}
|
|
var ev anthropicStreamEvent
|
|
if err := json.Unmarshal(wrap.Bytes, &ev); err != nil {
|
|
return
|
|
}
|
|
applyAnthropicStreamEvent(ev.Type, ev, usage, completion)
|
|
}
|
|
|
|
// converseStreamEvent captures the Converse stream frames carrying completion
|
|
// text (contentBlockDelta) and the final token usage (metadata).
|
|
type converseStreamEvent struct {
|
|
Delta *struct {
|
|
Text string `json:"text"`
|
|
} `json:"delta"`
|
|
Usage *struct {
|
|
InputTokens int64 `json:"inputTokens"`
|
|
OutputTokens int64 `json:"outputTokens"`
|
|
TotalTokens int64 `json:"totalTokens"`
|
|
} `json:"usage"`
|
|
}
|
|
|
|
// applyConverseStreamEvent folds one native Converse stream frame into the
|
|
// running usage/completion: contentBlockDelta carries assistant text, and the
|
|
// trailing metadata frame carries the final usage block.
|
|
func applyConverseStreamEvent(eventType string, payload []byte, usage *llm.Usage, completion *strings.Builder) {
|
|
var ev converseStreamEvent
|
|
if err := json.Unmarshal(payload, &ev); err != nil {
|
|
return
|
|
}
|
|
switch eventType {
|
|
case "contentBlockDelta":
|
|
if ev.Delta != nil {
|
|
completion.WriteString(ev.Delta.Text)
|
|
}
|
|
case "metadata":
|
|
if ev.Usage != nil {
|
|
if ev.Usage.InputTokens > 0 {
|
|
usage.InputTokens = ev.Usage.InputTokens
|
|
}
|
|
if ev.Usage.OutputTokens > 0 {
|
|
usage.OutputTokens = ev.Usage.OutputTokens
|
|
}
|
|
if ev.Usage.TotalTokens > 0 {
|
|
usage.TotalTokens = ev.Usage.TotalTokens
|
|
}
|
|
}
|
|
}
|
|
}
|