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:
@@ -15,22 +15,108 @@
|
||||
package probod
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
"go.gearno.de/kit/log"
|
||||
"go.opentelemetry.io/otel/trace"
|
||||
"go.probo.inc/probo/pkg/agentsbuild"
|
||||
"go.probo.inc/probo/pkg/cookiebanner"
|
||||
"go.probo.inc/probo/pkg/thirdparty"
|
||||
)
|
||||
|
||||
// buildTrackerAgentsConfig wires the tracker agents (mapping, enrichment,
|
||||
// disambiguation) from the probod config. It delegates to pkg/agentsbuild
|
||||
// so probod and proboctl build the same agent configuration; see that
|
||||
// package for the wiring rationale.
|
||||
func (impl *Implm) buildTrackerAgentsConfig(
|
||||
// buildTrackerAgents wires the three tracker agents from the probod
|
||||
// config, each with its own LLM client and tuning: the tracker-mapping
|
||||
// agent (catalog identification), the common-pattern enrichment agent
|
||||
// (description research), and the third-party disambiguation agent. All
|
||||
// are opt-in: when `llm.tracker-mapping.provider` is empty it returns
|
||||
// zero configs (nil LLM clients) so callers run without agent fallback.
|
||||
//
|
||||
// The enrichment and disambiguation agents fall back to the
|
||||
// tracker-mapping config when their own provider slot is empty, so a
|
||||
// deployment that configures only `tracker-mapping` keeps wiring all
|
||||
// three agents.
|
||||
func (impl *Implm) buildTrackerAgents(
|
||||
l *log.Logger,
|
||||
tp trace.TracerProvider,
|
||||
r prometheus.Registerer,
|
||||
) (cookiebanner.TrackerAgentsConfig, thirdparty.DisambiguationConfig, error) {
|
||||
return agentsbuild.BuildTrackerAgentsConfig(impl.cfg, l, tp, r)
|
||||
) (cookiebanner.TrackerMappingAgentConfig, cookiebanner.TrackerEnrichmentAgentConfig, thirdparty.DisambiguationAgentConfig, error) {
|
||||
if impl.cfg.Agents.TrackerMapping.Provider == "" {
|
||||
return cookiebanner.TrackerMappingAgentConfig{}, cookiebanner.TrackerEnrichmentAgentConfig{}, thirdparty.DisambiguationAgentConfig{}, nil
|
||||
}
|
||||
|
||||
firecrawlAPIKey := impl.cfg.Agents.Tools.FirecrawlAPIKey
|
||||
|
||||
mappingAgentCfg, mappingClient, err := impl.resolveAgentClient(
|
||||
"tracker-mapping",
|
||||
impl.cfg.Agents.TrackerMapping,
|
||||
l,
|
||||
tp,
|
||||
r,
|
||||
)
|
||||
if err != nil {
|
||||
return cookiebanner.TrackerMappingAgentConfig{}, cookiebanner.TrackerEnrichmentAgentConfig{}, thirdparty.DisambiguationAgentConfig{}, fmt.Errorf("cannot resolve tracker mapping agent client: %w", err)
|
||||
}
|
||||
|
||||
mappingCfg := cookiebanner.TrackerMappingAgentConfig{
|
||||
LLMClient: mappingClient,
|
||||
Model: mappingAgentCfg.ModelName,
|
||||
FirecrawlAPIKey: firecrawlAPIKey,
|
||||
MaxTokens: mappingAgentCfg.MaxTokens,
|
||||
Temperature: mappingAgentCfg.Temperature,
|
||||
Timeout: time.Duration(impl.cfg.TrackerMappingWorker.AgentTimeout) * time.Second,
|
||||
MaxTurns: impl.cfg.TrackerMappingWorker.AgentMaxTurns,
|
||||
}
|
||||
|
||||
enrichmentSlot := impl.cfg.Agents.TrackerEnrichment
|
||||
if enrichmentSlot.Provider == "" {
|
||||
enrichmentSlot = impl.cfg.Agents.TrackerMapping
|
||||
}
|
||||
|
||||
enrichmentAgentCfg, enrichmentClient, err := impl.resolveAgentClient(
|
||||
"tracker-enrichment",
|
||||
enrichmentSlot,
|
||||
l,
|
||||
tp,
|
||||
r,
|
||||
)
|
||||
if err != nil {
|
||||
return cookiebanner.TrackerMappingAgentConfig{}, cookiebanner.TrackerEnrichmentAgentConfig{}, thirdparty.DisambiguationAgentConfig{}, fmt.Errorf("cannot resolve tracker enrichment agent client: %w", err)
|
||||
}
|
||||
|
||||
enrichmentCfg := cookiebanner.TrackerEnrichmentAgentConfig{
|
||||
LLMClient: enrichmentClient,
|
||||
Model: enrichmentAgentCfg.ModelName,
|
||||
FirecrawlAPIKey: firecrawlAPIKey,
|
||||
MaxTokens: enrichmentAgentCfg.MaxTokens,
|
||||
Temperature: enrichmentAgentCfg.Temperature,
|
||||
Timeout: time.Duration(impl.cfg.CommonPatternEnrichmentWorker.AgentTimeout) * time.Second,
|
||||
MaxTurns: impl.cfg.CommonPatternEnrichmentWorker.AgentMaxTurns,
|
||||
}
|
||||
|
||||
disambiguationSlot := impl.cfg.Agents.ThirdPartyDisambiguation
|
||||
if disambiguationSlot.Provider == "" {
|
||||
disambiguationSlot = impl.cfg.Agents.TrackerMapping
|
||||
}
|
||||
|
||||
disambiguationAgentCfg, disambiguationClient, err := impl.resolveAgentClient(
|
||||
"third-party-disambiguation",
|
||||
disambiguationSlot,
|
||||
l,
|
||||
tp,
|
||||
r,
|
||||
)
|
||||
if err != nil {
|
||||
return cookiebanner.TrackerMappingAgentConfig{}, cookiebanner.TrackerEnrichmentAgentConfig{}, thirdparty.DisambiguationAgentConfig{}, fmt.Errorf("cannot resolve third party disambiguation agent client: %w", err)
|
||||
}
|
||||
|
||||
disambiguationCfg := thirdparty.DisambiguationAgentConfig{
|
||||
LLMClient: disambiguationClient,
|
||||
Model: disambiguationAgentCfg.ModelName,
|
||||
MaxTokens: disambiguationAgentCfg.MaxTokens,
|
||||
Temperature: disambiguationAgentCfg.Temperature,
|
||||
Timeout: time.Duration(impl.cfg.TrackerMappingWorker.DisambiguationAgentTimeout) * time.Second,
|
||||
}
|
||||
|
||||
return mappingCfg, enrichmentCfg, disambiguationCfg, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user