Give each tracker agent its own config
The tracker-mapping, common-pattern enrichment, and third-party disambiguation agents were all built from one shared TrackerAgentsConfig fed by a single tracker-mapping config slot. That forced a single AgentTimeout to be reused and patched per worker, and two unrelated max-turns fields to share one struct. Split the in-code config into TrackerMappingAgentConfig, TrackerEnrichmentAgentConfig, and DisambiguationAgentConfig, each with its own timeout and max-turns, and add dedicated tracker-enrichment and third-party-disambiguation provider slots (the latter resolving next to third-party-vetter). Enrichment and disambiguation fall back to the tracker-mapping slot when their own provider is unset, preserving single-config deployments. Drop the shared pkg/agentsbuild package and duplicate its small wiring into probod and proboctl so the two executables stay decoupled. Wire the new env vars, builder test coverage, and Helm values. Signed-off-by: Émile Ré <emile@probo.com>
This commit is contained in:
Émile Ré
@@ -17,12 +17,10 @@ package cmdutil
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
"go.gearno.de/kit/log"
|
||||
"go.gearno.de/kit/pg"
|
||||
"go.opentelemetry.io/otel/trace/noop"
|
||||
"go.probo.inc/probo/pkg/agentsbuild"
|
||||
"go.probo.inc/probo/pkg/cmd/iostreams"
|
||||
"go.probo.inc/probo/pkg/cookiebanner"
|
||||
"go.probo.inc/probo/pkg/proboctl/pgconn"
|
||||
@@ -66,14 +64,23 @@ func (f *Factory) ProbodConfig() (probodconfig.Config, error) {
|
||||
return full.Probod, nil
|
||||
}
|
||||
|
||||
// TrackerAgentsConfig builds the tracker-agents config (LLM client +
|
||||
// Firecrawl key) from the shared probod config for in-process agent
|
||||
// execution, e.g. synchronous common-pattern re-enrichment. It errors
|
||||
// when no LLM provider is configured.
|
||||
func (f *Factory) TrackerAgentsConfig() (cookiebanner.TrackerAgentsConfig, error) {
|
||||
// TrackerAgentsConfig builds the enrichment and mapping agent configs
|
||||
// (LLM clients + Firecrawl key) from the shared probod config for
|
||||
// in-process agent execution, e.g. synchronous common-pattern
|
||||
// re-enrichment. The enricher runs the enrichment agent and reuses the
|
||||
// mapping agent to attribute a vendor first, so both configs are
|
||||
// returned. It errors when no LLM provider is configured.
|
||||
//
|
||||
// This duplicates the small wiring probod does in buildTrackerAgents
|
||||
// rather than sharing a package, keeping the two executables decoupled.
|
||||
func (f *Factory) TrackerAgentsConfig() (cookiebanner.TrackerEnrichmentAgentConfig, cookiebanner.TrackerMappingAgentConfig, error) {
|
||||
cfg, err := f.ProbodConfig()
|
||||
if err != nil {
|
||||
return cookiebanner.TrackerAgentsConfig{}, err
|
||||
return cookiebanner.TrackerEnrichmentAgentConfig{}, cookiebanner.TrackerMappingAgentConfig{}, err
|
||||
}
|
||||
|
||||
if cfg.Agents.TrackerMapping.Provider == "" {
|
||||
return cookiebanner.TrackerEnrichmentAgentConfig{}, cookiebanner.TrackerMappingAgentConfig{}, fmt.Errorf("no LLM provider configured; set llm.tracker-mapping.provider in %q", f.CfgFile)
|
||||
}
|
||||
|
||||
logger := log.NewLogger(
|
||||
@@ -81,19 +88,42 @@ func (f *Factory) TrackerAgentsConfig() (cookiebanner.TrackerAgentsConfig, error
|
||||
log.WithOutput(f.IOStreams.ErrOut),
|
||||
)
|
||||
|
||||
trackerCfg, _, err := agentsbuild.BuildTrackerAgentsConfig(
|
||||
cfg,
|
||||
logger,
|
||||
noop.NewTracerProvider(),
|
||||
prometheus.NewRegistry(),
|
||||
)
|
||||
firecrawlAPIKey := cfg.Agents.Tools.FirecrawlAPIKey
|
||||
|
||||
mappingAgentCfg, mappingClient, err := resolveAgentClient(cfg.Agents, "tracker-mapping", cfg.Agents.TrackerMapping, logger)
|
||||
if err != nil {
|
||||
return cookiebanner.TrackerAgentsConfig{}, fmt.Errorf("cannot build tracker agents config: %w", err)
|
||||
return cookiebanner.TrackerEnrichmentAgentConfig{}, cookiebanner.TrackerMappingAgentConfig{}, fmt.Errorf("cannot build tracker mapping agent: %w", err)
|
||||
}
|
||||
|
||||
if trackerCfg.LLMClient == nil {
|
||||
return cookiebanner.TrackerAgentsConfig{}, fmt.Errorf("no LLM provider configured; set llm.tracker-mapping.provider in %q", f.CfgFile)
|
||||
mappingCfg := cookiebanner.TrackerMappingAgentConfig{
|
||||
LLMClient: mappingClient,
|
||||
Model: mappingAgentCfg.ModelName,
|
||||
FirecrawlAPIKey: firecrawlAPIKey,
|
||||
MaxTokens: mappingAgentCfg.MaxTokens,
|
||||
Temperature: mappingAgentCfg.Temperature,
|
||||
Timeout: time.Duration(cfg.TrackerMappingWorker.AgentTimeout) * time.Second,
|
||||
MaxTurns: cfg.TrackerMappingWorker.AgentMaxTurns,
|
||||
}
|
||||
|
||||
return trackerCfg, nil
|
||||
enrichmentSlot := cfg.Agents.TrackerEnrichment
|
||||
if enrichmentSlot.Provider == "" {
|
||||
enrichmentSlot = cfg.Agents.TrackerMapping
|
||||
}
|
||||
|
||||
enrichmentAgentCfg, enrichmentClient, err := resolveAgentClient(cfg.Agents, "tracker-enrichment", enrichmentSlot, logger)
|
||||
if err != nil {
|
||||
return cookiebanner.TrackerEnrichmentAgentConfig{}, cookiebanner.TrackerMappingAgentConfig{}, fmt.Errorf("cannot build tracker enrichment agent: %w", err)
|
||||
}
|
||||
|
||||
enrichmentCfg := cookiebanner.TrackerEnrichmentAgentConfig{
|
||||
LLMClient: enrichmentClient,
|
||||
Model: enrichmentAgentCfg.ModelName,
|
||||
FirecrawlAPIKey: firecrawlAPIKey,
|
||||
MaxTokens: enrichmentAgentCfg.MaxTokens,
|
||||
Temperature: enrichmentAgentCfg.Temperature,
|
||||
Timeout: time.Duration(cfg.CommonPatternEnrichmentWorker.AgentTimeout) * time.Second,
|
||||
MaxTurns: cfg.CommonPatternEnrichmentWorker.AgentMaxTurns,
|
||||
}
|
||||
|
||||
return enrichmentCfg, mappingCfg, nil
|
||||
}
|
||||
|
||||
97
pkg/proboctl/cmdutil/llm.go
Normal file
97
pkg/proboctl/cmdutil/llm.go
Normal file
@@ -0,0 +1,97 @@
|
||||
// Copyright (c) 2026 Probo Inc <hello@getprobo.com>.
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice appear in all copies.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
// PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
package cmdutil
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
"go.gearno.de/kit/httpclient"
|
||||
"go.gearno.de/kit/log"
|
||||
"go.opentelemetry.io/otel/trace/noop"
|
||||
"go.probo.inc/probo/pkg/llm"
|
||||
llmanthropic "go.probo.inc/probo/pkg/llm/anthropic"
|
||||
llmopenai "go.probo.inc/probo/pkg/llm/openai"
|
||||
"go.probo.inc/probo/pkg/probodconfig"
|
||||
)
|
||||
|
||||
// resolveAgentClient resolves an agent's effective config from defaults
|
||||
// and builds an LLM client for it. The name is used in the logger name
|
||||
// and error messages. proboctl runs synchronously with no tracing or
|
||||
// metrics, so it duplicates probod's wiring with a no-op tracer and a
|
||||
// throwaway registry rather than sharing a package.
|
||||
func resolveAgentClient(
|
||||
agents probodconfig.AgentsConfig,
|
||||
name string,
|
||||
agent probodconfig.LLMAgentConfig,
|
||||
l *log.Logger,
|
||||
) (probodconfig.LLMAgentConfig, *llm.Client, error) {
|
||||
resolved := agents.ResolveAgent(agent)
|
||||
|
||||
providerCfg, ok := agents.Providers[resolved.Provider]
|
||||
if !ok {
|
||||
return probodconfig.LLMAgentConfig{}, nil, fmt.Errorf("unknown LLM provider %q for %s agent", resolved.Provider, name)
|
||||
}
|
||||
|
||||
client, err := buildLLMClient(providerCfg, l.Named("llm."+name))
|
||||
if err != nil {
|
||||
return probodconfig.LLMAgentConfig{}, nil, fmt.Errorf("cannot create %s LLM client: %w", name, err)
|
||||
}
|
||||
|
||||
return resolved, client, nil
|
||||
}
|
||||
|
||||
// buildLLMClient creates an LLM client for the given provider config.
|
||||
func buildLLMClient(cfg probodconfig.LLMProviderConfig, l *log.Logger) (*llm.Client, error) {
|
||||
providerType := cfg.Type
|
||||
if providerType == "" {
|
||||
providerType = "openai"
|
||||
}
|
||||
|
||||
httpClient := httpclient.DefaultPooledClient(
|
||||
httpclient.WithLogger(l),
|
||||
httpclient.WithTracerProvider(noop.NewTracerProvider()),
|
||||
httpclient.WithRegisterer(prometheus.NewRegistry()),
|
||||
)
|
||||
|
||||
switch providerType {
|
||||
case "openai":
|
||||
p := llmopenai.NewProvider(
|
||||
cfg.APIKey,
|
||||
llmopenai.WithHTTPClient(httpClient),
|
||||
)
|
||||
|
||||
return llm.NewClient(
|
||||
p,
|
||||
"openai",
|
||||
llm.WithLogger(l),
|
||||
), nil
|
||||
case "anthropic":
|
||||
p := llmanthropic.NewProvider(
|
||||
cfg.APIKey,
|
||||
llmanthropic.WithHTTPClient(httpClient),
|
||||
)
|
||||
|
||||
return llm.NewClient(
|
||||
p,
|
||||
"anthropic",
|
||||
llm.WithLogger(l),
|
||||
), nil
|
||||
case "bedrock":
|
||||
return nil, fmt.Errorf("bedrock provider not yet wired; requires aws.Config")
|
||||
default:
|
||||
return nil, fmt.Errorf("unsupported LLM provider type: %q", providerType)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user