0f5ac03e70
The tracker-mapping worker materialized a per-org ThirdParty for every categorized tracker, linking or creating one through heuristic and disambiguation-agent matching. Concurrent mapping of two patterns for the same common third party raced the load-then-create check and left duplicate org third parties with the same name. Reduce the worker to catalog resolution only: it resolves the shared common_tracker_pattern_id / common_third_party_id link and leaves third_party_id untouched, preserving any link set elsewhere. Org third parties will instead be created through an explicit per-vendor import action added in a later commit. Remove resolveOrgThirdParty, prepareOrgThirdParty, the sibling direct-link signal, and the disambiguation-agent wiring (including its constructor parameter and buildTrackerAgents return), and update the worker tests to assert the catalog link is resolved while third_party_id is preserved. Signed-off-by: Émile Ré <emile@probo.com>
97 lines
3.6 KiB
Go
97 lines
3.6 KiB
Go
// Copyright (c) 2026 Probo Inc <hello@probo.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 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/cookiebanner"
|
|
)
|
|
|
|
// buildTrackerAgents wires the two tracker agents from the probod
|
|
// config, each with its own LLM client and tuning: the tracker-mapping
|
|
// agent (catalog identification) and the common-pattern enrichment agent
|
|
// (description research). Both 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 agent falls back to the tracker-mapping config when its
|
|
// own provider slot is empty, so a deployment that configures only
|
|
// `tracker-mapping` keeps wiring both agents.
|
|
func (impl *Implm) buildTrackerAgents(
|
|
l *log.Logger,
|
|
tp trace.TracerProvider,
|
|
r prometheus.Registerer,
|
|
) (cookiebanner.TrackerMappingAgentConfig, cookiebanner.TrackerEnrichmentAgentConfig, error) {
|
|
if impl.cfg.Agents.TrackerMapping.Provider == "" {
|
|
return cookiebanner.TrackerMappingAgentConfig{}, cookiebanner.TrackerEnrichmentAgentConfig{}, 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{}, 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{}, 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,
|
|
}
|
|
|
|
return mappingCfg, enrichmentCfg, nil
|
|
}
|